Skip to content
Snippets Groups Projects
Commit 07579cd8 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Checked the operation of the emergency stop.

parent 1d508a0e
No related branches found
No related tags found
1 merge request!1Sergi
...@@ -20,7 +20,7 @@ class CModelCarActuators: public CModelCarDriverBase ...@@ -20,7 +20,7 @@ class CModelCarActuators: public CModelCarDriverBase
public: public:
CModelCarActuators(std::string name); CModelCarActuators(std::string name);
void send_command(double speed,double steering); void send_command(double speed,double steering);
void emergency_stop(void); void emergency_stop(bool active);
void enable_ultrasounds(void); void enable_ultrasounds(void);
void disable_ultrasounds(void); void disable_ultrasounds(void);
~CModelCarActuators(void); ~CModelCarActuators(void);
......
...@@ -34,28 +34,7 @@ int main(int argc, char *argv[]) ...@@ -34,28 +34,7 @@ int main(int argc, char *argv[])
act_driver->send_command(vx,steer); act_driver->send_command(vx,steer);
} }
act_driver->send_command(0.0,0.0); act_driver->send_command(0.0,0.0);
/*
if(test_watchdog)
{
std::cout << "model_car_actuators_test::main: sending watchdog" << std::endl;
act_driver->send_watchdog();
}
if(test_emergency_stop)
{
std::cout << "model_car_actuators_test::main: sending emergency stop" << std::endl;
act_driver->send_emergency_stop();
}
if(test_enable_disable_uss)
{
std::cout << "model_car_actuators_test::main: sending enable uss" << std::endl;
act_driver->send_enable_uss();
std::cout << "model_car_actuators_test::main: sending disable uss" << std::endl;
act_driver->send_disable_uss();
}
*/
act_driver->close(); act_driver->close();
delete act_driver; delete act_driver;
} }
......
...@@ -43,9 +43,14 @@ void CModelCarActuators::send_command(double speed,double steering) ...@@ -43,9 +43,14 @@ void CModelCarActuators::send_command(double speed,double steering)
this->send_request(ID_ARD_ACT_STEER_SERVO,1, &cmd); this->send_request(ID_ARD_ACT_STEER_SERVO,1, &cmd);
} }
void CModelCarActuators::emergency_stop(void) void CModelCarActuators::emergency_stop(bool active)
{ {
uint8_t cmd=1; uint8_t cmd;
if(active)
cmd=1;
else
cmd=0;
this->send_request(ID_ARD_ACT_EMERGENCY_STOP,1,&cmd); this->send_request(ID_ARD_ACT_EMERGENCY_STOP,1,&cmd);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment