Skip to content
Snippets Groups Projects
Commit 1d5bb0ca authored by ferranmafe's avatar ferranmafe
Browse files

Added the enable and disable power functions for the second dynamixel bus.

parent 52a03466
No related branches found
No related tags found
2 merge requests!5Dynamixel manager,!2Smart charger fw
This commit is part of merge request !5. Comments created here will be created in the context of that merge request.
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "darwin_time.h" #include "darwin_time.h"
#include "darwin_dyn_slave.h" #include "darwin_dyn_slave.h"
#include "darwin_dyn_master.h" #include "darwin_dyn_master.h"
#include "darwin_dyn_master_v2.h"
#include "motion_manager.h" #include "motion_manager.h"
#include "action.h" #include "action.h"
#include "action_id.h" #include "action_id.h"
......
...@@ -83,6 +83,7 @@ void darwin_dyn_master_v2_init(void) ...@@ -83,6 +83,7 @@ void darwin_dyn_master_v2_init(void)
/* configure dynamixel master module */ /* configure dynamixel master module */
dyn_master_set_rx_timeout(&darwin_dyn_master_v2,50); dyn_master_set_rx_timeout(&darwin_dyn_master_v2,50);
dyn_master_set_return_level(&darwin_dyn_master_v2,return_all); dyn_master_set_return_level(&darwin_dyn_master_v2,return_all);
darwin_dyn_master_v2_disable_power();
} }
inline void darwin_dyn_master_v2_enable_power(void) inline void darwin_dyn_master_v2_enable_power(void)
......
...@@ -365,6 +365,7 @@ void manager_init(uint16_t period_us) ...@@ -365,6 +365,7 @@ void manager_init(uint16_t period_us)
darwin_dyn_master_disable_power(); darwin_dyn_master_disable_power();
darwin_dyn_master_v2_enable_power();
// detect the servos connected on the v2 bus // detect the servos connected on the v2 bus
dyn_master_scan(&darwin_dyn_master_v2,&num,servo_ids); dyn_master_scan(&darwin_dyn_master_v2,&num,servo_ids);
ram_data[DARWIN_MM_NUM_SERVOS]+=num; ram_data[DARWIN_MM_NUM_SERVOS]+=num;
...@@ -425,7 +426,8 @@ void manager_init(uint16_t period_us) ...@@ -425,7 +426,8 @@ void manager_init(uint16_t period_us)
default: break; default: break;
} }
} }
darwin_dyn_master_v2_disable_power();
ram_data[DARWIN_MM_PRESENT_SERVOS1]=(present_servos&0x000000FF); ram_data[DARWIN_MM_PRESENT_SERVOS1]=(present_servos&0x000000FF);
ram_data[DARWIN_MM_PRESENT_SERVOS2]=((present_servos&0x0000FF00)>>8); ram_data[DARWIN_MM_PRESENT_SERVOS2]=((present_servos&0x0000FF00)>>8);
......
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