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

Chnaged the baudrate of all examples to 1000000bps.

Added the current step to the action interface.
parent f4640f8d
No related branches found
No related tags found
No related merge requests found
SET(DARWIN_FW_PATH /home/shernand/humanoids/darwin_stm32_fw) SET(DARWIN_FW_PATH ~/humanoids/darwin_stm32_fw)
ADD_SUBDIRECTORY(xml) ADD_SUBDIRECTORY(xml)
IF(HAVE_XSD) IF(HAVE_XSD)
...@@ -56,6 +56,8 @@ INSTALL(TARGETS darwin_robot ...@@ -56,6 +56,8 @@ INSTALL(TARGETS darwin_robot
LIBRARY DESTINATION lib/iridrivers LIBRARY DESTINATION lib/iridrivers
ARCHIVE DESTINATION lib/iridrivers) ARCHIVE DESTINATION lib/iridrivers)
INSTALL(FILES ${robot_headers} DESTINATION include/iridrivers) INSTALL(FILES ${robot_headers} DESTINATION include/iridrivers)
INSTALL(FILES ${DARWIN_FW_PATH}/include/darwin_registers.h DESTINATION include/iridrivers)
INSTALL(FILES ${DARWIN_FW_PATH}/include/action_id.h DESTINATION include/iridrivers)
IF(KDL_FOUND) IF(KDL_FOUND)
INSTALL(FILES ${kin_heders} DESTINATION include/iridrivers) INSTALL(FILES ${kin_heders} DESTINATION include/iridrivers)
INSTALL(TARGETS darwin_arm_kinematics INSTALL(TARGETS darwin_arm_kinematics
......
...@@ -855,6 +855,20 @@ unsigned char CDarwinRobot::action_get_current_page(void) ...@@ -855,6 +855,20 @@ unsigned char CDarwinRobot::action_get_current_page(void)
throw CDarwinRobotException(_HERE_,"Invalid robot device"); throw CDarwinRobotException(_HERE_,"Invalid robot device");
} }
unsigned char CDarwinRobot::action_get_current_step(void)
{
unsigned char step_id;
if(this->robot_device!=NULL)
{
this->robot_device->read_byte_register(DARWIN_ACTION_CNTRL,&step_id);
return (step_id>>5);
}
else
throw CDarwinRobotException(_HERE_,"Invalid robot device");
}
void CDarwinRobot::action_start(void) void CDarwinRobot::action_start(void)
{ {
if(this->robot_device!=NULL) if(this->robot_device!=NULL)
......
...@@ -109,6 +109,7 @@ class CDarwinRobot ...@@ -109,6 +109,7 @@ class CDarwinRobot
// motion action interface // motion action interface
void action_load_page(unsigned char page_id); void action_load_page(unsigned char page_id);
unsigned char action_get_current_page(void); unsigned char action_get_current_page(void);
unsigned char action_get_current_step(void);
void action_start(void); void action_start(void);
void action_stop(void); void action_stop(void);
bool action_is_page_running(void); bool action_is_page_running(void);
......
...@@ -12,7 +12,7 @@ int main(int argc, char *argv[]) ...@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
int i=0,num_servos; int i=0,num_servos;
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
num_servos=darwin.mm_get_num_servos(); num_servos=darwin.mm_get_num_servos();
std::cout << "Found " << num_servos << " servos " << std::endl; std::cout << "Found " << num_servos << " servos " << std::endl;
......
...@@ -11,7 +11,7 @@ int main(int argc, char *argv[]) ...@@ -11,7 +11,7 @@ int main(int argc, char *argv[])
int i=0; int i=0;
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
std::cout << "found darwin controller" << std::endl; std::cout << "found darwin controller" << std::endl;
darwin.adc_start(); darwin.adc_start();
for(i=0;i<50;i++) for(i=0;i<50;i++)
......
...@@ -9,7 +9,7 @@ std::string robot_device="A4008atn"; ...@@ -9,7 +9,7 @@ std::string robot_device="A4008atn";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
std::cout << "found darwin controller" << std::endl; std::cout << "found darwin controller" << std::endl;
darwin.gpio_blink_led(LED_TX,1000); darwin.gpio_blink_led(LED_TX,1000);
darwin.gpio_blink_led(LED_RX,2000); darwin.gpio_blink_led(LED_RX,2000);
......
...@@ -12,7 +12,7 @@ int main(int argc, char *argv[]) ...@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
double accel_x,accel_y,accel_z; double accel_x,accel_y,accel_z;
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
std::cout << "found darwin controller" << std::endl; std::cout << "found darwin controller" << std::endl;
std::cout << "Number of calibration samples: " << darwin.imu_get_cal_samples() << std::endl; std::cout << "Number of calibration samples: " << darwin.imu_get_cal_samples() << std::endl;
darwin.imu_start(); darwin.imu_start();
......
...@@ -14,7 +14,7 @@ int main(int argc, char *argv[]) ...@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
std::vector<double> angles,speeds,accels,offsets; std::vector<double> angles,speeds,accels,offsets;
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
darwin.mm_load_config(config_file); darwin.mm_load_config(config_file);
num_servos=darwin.mm_get_num_servos(); num_servos=darwin.mm_get_num_servos();
std::cout << "Found " << num_servos << " servos" << std::endl; std::cout << "Found " << num_servos << " servos" << std::endl;
......
...@@ -13,7 +13,7 @@ int main(int argc, char *argv[]) ...@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
std::vector<double> angles; std::vector<double> angles;
try{ try{
CDarwinRobot darwin("Darwin",robot_device,926100,0x02); CDarwinRobot darwin("Darwin",robot_device,1000000,0x02);
num_servos=darwin.mm_get_num_servos(); num_servos=darwin.mm_get_num_servos();
std::cout << "Found " << num_servos << " servos" << std::endl; std::cout << "Found " << num_servos << " servos" << std::endl;
// enable all servos and assign them to the action module // enable all servos and assign them to the action module
......
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