moved serial connect to scout and tracer interface only

This commit is contained in:
Ruixiang Du
2021-07-14 23:43:36 +08:00
parent 7c3e96313d
commit 541ec08514
4 changed files with 11 additions and 6 deletions

View File

@@ -43,14 +43,11 @@ class RobotCommonInterface {
// functions to be implemented by each robot class // functions to be implemented by each robot class
virtual void Connect(std::string can_name) = 0; 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 ResetRobotState() = 0;
virtual void DisableLightControl() { virtual void DisableLightControl() {
// use derived version // do nothing if no light on robot
} }
virtual ProtocolVersion GetProtocolVersion() = 0; virtual ProtocolVersion GetProtocolVersion() = 0;

View File

@@ -34,6 +34,10 @@ struct ScoutActuatorState {
struct ScoutInterface { struct ScoutInterface {
virtual ~ScoutInterface() = default; 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 SetMotionCommand(double linear_vel, double angular_vel) = 0;
virtual void SetLightCommand(LightMode f_mode, uint8_t f_value, virtual void SetLightCommand(LightMode f_mode, uint8_t f_value,
LightMode r_mode, uint8_t r_value) = 0; LightMode r_mode, uint8_t r_value) = 0;

View File

@@ -31,6 +31,10 @@ struct TracerActuatorState {
struct TracerInterface { struct TracerInterface {
virtual ~TracerInterface() = default; 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 SetMotionCommand(double linear_vel, double angular_vel) = 0;
virtual void SetLightCommand(LightMode f_mode, uint8_t f_value) = 0; virtual void SetLightCommand(LightMode f_mode, uint8_t f_value) = 0;

View File

@@ -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 can_name) { robot_->Connect(can_name); }
void ScoutRobot::Connect(std::string uart_name, uint32_t baudrate) { 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(); } void ScoutRobot::ResetRobotState() { robot_->ResetRobotState(); }