diff --git a/include/ugv_sdk/details/interface/robot_common_interface.hpp b/include/ugv_sdk/details/interface/robot_common_interface.hpp index fc4a1f7..a9d0d42 100644 --- a/include/ugv_sdk/details/interface/robot_common_interface.hpp +++ b/include/ugv_sdk/details/interface/robot_common_interface.hpp @@ -43,14 +43,11 @@ class RobotCommonInterface { // functions to be implemented by each robot class virtual void Connect(std::string can_name) = 0; - // functions to be implemented by each robot class - virtual void Connect(std::string uart_name, uint32_t baudrate){ - // use derived version - }; + virtual void ResetRobotState() = 0; virtual void DisableLightControl() { - // use derived version + // do nothing if no light on robot } virtual ProtocolVersion GetProtocolVersion() = 0; diff --git a/include/ugv_sdk/details/interface/scout_interface.hpp b/include/ugv_sdk/details/interface/scout_interface.hpp index 35d08e3..9e2bac2 100644 --- a/include/ugv_sdk/details/interface/scout_interface.hpp +++ b/include/ugv_sdk/details/interface/scout_interface.hpp @@ -34,6 +34,10 @@ struct ScoutActuatorState { struct ScoutInterface { virtual ~ScoutInterface() = default; + virtual void Connect(std::string uart_name, uint32_t baudrate){ + // use derived version + }; + virtual void SetMotionCommand(double linear_vel, double angular_vel) = 0; virtual void SetLightCommand(LightMode f_mode, uint8_t f_value, LightMode r_mode, uint8_t r_value) = 0; diff --git a/include/ugv_sdk/details/interface/tracer_interface.hpp b/include/ugv_sdk/details/interface/tracer_interface.hpp index 8edfdb4..4fc4a68 100644 --- a/include/ugv_sdk/details/interface/tracer_interface.hpp +++ b/include/ugv_sdk/details/interface/tracer_interface.hpp @@ -31,6 +31,10 @@ struct TracerActuatorState { struct TracerInterface { virtual ~TracerInterface() = default; + virtual void Connect(std::string uart_name, uint32_t baudrate){ + // use derived version + }; + virtual void SetMotionCommand(double linear_vel, double angular_vel) = 0; virtual void SetLightCommand(LightMode f_mode, uint8_t f_value) = 0; diff --git a/src/mobile_robot/scout_robot.cpp b/src/mobile_robot/scout_robot.cpp index 854040a..b3664c4 100644 --- a/src/mobile_robot/scout_robot.cpp +++ b/src/mobile_robot/scout_robot.cpp @@ -36,7 +36,7 @@ void ScoutRobot::EnableCommandedMode() { robot_->EnableCommandedMode(); } void ScoutRobot::Connect(std::string can_name) { robot_->Connect(can_name); } void ScoutRobot::Connect(std::string uart_name, uint32_t baudrate) { - robot_->Connect(uart_name, baudrate); +// robot_->Connect(uart_name, baudrate); } void ScoutRobot::ResetRobotState() { robot_->ResetRobotState(); }