sousenw 2 місяців тому
батько
коміт
4b0f2474f9
26 змінених файлів з 8 додано та 10 видалено
  1. 0 0
      src/interface/CMakeLists.txt
  2. 0 0
      src/interface/msg/Empty.msg
  3. 0 0
      src/interface/package.xml
  4. 0 0
      src/interface/srv/SceneControls.srv
  5. 0 0
      src/wheelchair_state_machine/CMakeLists.txt
  6. 0 0
      src/wheelchair_state_machine/LICENSE
  7. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/battery_manager.hpp
  8. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/error_code.hpp
  9. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/event_input.hpp
  10. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/ipad_manager.hpp
  11. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/lidascan_ctrl.hpp
  12. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/recharge_tool.hpp
  13. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/report.hpp
  14. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/rotation_manager.hpp
  15. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/wheelchair_types.hpp
  16. 0 0
      src/wheelchair_state_machine/include/wheelchair_state_machine/workflow.hpp
  17. 0 0
      src/wheelchair_state_machine/package.xml
  18. 0 0
      src/wheelchair_state_machine/src/battery_manager.cpp
  19. 0 0
      src/wheelchair_state_machine/src/event_input.cpp
  20. 8 10
      src/wheelchair_state_machine/src/ipad_manager.cpp
  21. 0 0
      src/wheelchair_state_machine/src/lidascan_ctrl.cpp
  22. 0 0
      src/wheelchair_state_machine/src/main.cpp
  23. 0 0
      src/wheelchair_state_machine/src/recharge_tool.cpp
  24. 0 0
      src/wheelchair_state_machine/src/report.cpp
  25. 0 0
      src/wheelchair_state_machine/src/rotation_manager.cpp
  26. 0 0
      src/wheelchair_state_machine/src/workflow.cpp

+ 0 - 0
src3/interface/CMakeLists.txt → src/interface/CMakeLists.txt


+ 0 - 0
src3/interface/msg/Empty.msg → src/interface/msg/Empty.msg


+ 0 - 0
src3/interface/package.xml → src/interface/package.xml


+ 0 - 0
src3/interface/srv/SceneControls.srv → src/interface/srv/SceneControls.srv


+ 0 - 0
src3/wheelchair_state_machine/CMakeLists.txt → src/wheelchair_state_machine/CMakeLists.txt


+ 0 - 0
src3/wheelchair_state_machine/LICENSE → src/wheelchair_state_machine/LICENSE


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/battery_manager.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/battery_manager.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/error_code.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/error_code.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/event_input.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/event_input.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/ipad_manager.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/ipad_manager.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/lidascan_ctrl.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/lidascan_ctrl.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/recharge_tool.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/recharge_tool.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/report.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/report.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/rotation_manager.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/rotation_manager.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/wheelchair_types.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/wheelchair_types.hpp


+ 0 - 0
src3/wheelchair_state_machine/include/wheelchair_state_machine/workflow.hpp → src/wheelchair_state_machine/include/wheelchair_state_machine/workflow.hpp


+ 0 - 0
src3/wheelchair_state_machine/package.xml → src/wheelchair_state_machine/package.xml


+ 0 - 0
src3/wheelchair_state_machine/src/battery_manager.cpp → src/wheelchair_state_machine/src/battery_manager.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/event_input.cpp → src/wheelchair_state_machine/src/event_input.cpp


+ 8 - 10
src3/wheelchair_state_machine/src/ipad_manager.cpp → src/wheelchair_state_machine/src/ipad_manager.cpp

@@ -4,10 +4,8 @@
 
 using namespace std::chrono_literals;
 
-IpadManager::IpadManager(rclcpp::Node* node)
-    : node_(node)
-    , recharge_active_(false)
-    , cmd_enable_(false)
+IpadManager::IpadManager(rclcpp::Node *node)
+    : node_(node), recharge_active_(false), cmd_enable_(false)
 {
     logInfo("iPad管理器初始化完成");
 }
@@ -16,15 +14,15 @@ void IpadManager::onCmdEnable(const std_msgs::msg::Bool::SharedPtr msg)
 {
     bool new_enable = msg->data;
     logInfo("收到命令使能: " + std::to_string(new_enable));
-    
+
     // 状态变化检查
-    if (!cmd_enable_ && new_enable)
+    if (!cmd_enable_ && !new_enable)
     {
         // 命令使能从false变为true - 启动回充
         cmd_enable_ = true;
         startRecharge();
     }
-    else if (cmd_enable_ && !new_enable)
+    else if (cmd_enable_ && new_enable)
     {
         // 命令使能从true变为false - 取消回充
         cmd_enable_ = false;
@@ -43,7 +41,7 @@ void IpadManager::startRecharge()
     {
         recharge_active_ = true;
         logInfo("启动回充功能");
-        
+
         if (recharge_start_callback_)
         {
             recharge_start_callback_();
@@ -65,7 +63,7 @@ void IpadManager::cancelRecharge()
     {
         recharge_active_ = false;
         logInfo("取消回充功能");
-        
+
         if (recharge_cancel_callback_)
         {
             recharge_cancel_callback_();
@@ -93,7 +91,7 @@ void IpadManager::setRechargeCancelCallback(RechargeCancelCallback callback)
     logInfo("已设置回充取消回调");
 }
 
-void IpadManager::logInfo(const std::string& message)
+void IpadManager::logInfo(const std::string &message)
 {
     if (node_)
     {

+ 0 - 0
src3/wheelchair_state_machine/src/lidascan_ctrl.cpp → src/wheelchair_state_machine/src/lidascan_ctrl.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/main.cpp → src/wheelchair_state_machine/src/main.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/recharge_tool.cpp → src/wheelchair_state_machine/src/recharge_tool.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/report.cpp → src/wheelchair_state_machine/src/report.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/rotation_manager.cpp → src/wheelchair_state_machine/src/rotation_manager.cpp


+ 0 - 0
src3/wheelchair_state_machine/src/workflow.cpp → src/wheelchair_state_machine/src/workflow.cpp