summaryrefslogtreecommitdiff
path: root/digital/io/src/main.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /digital/io/src/main.c
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/io/src/main.c')
-rw-r--r--digital/io/src/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/digital/io/src/main.c b/digital/io/src/main.c
index 22964ddd..5aa35fb7 100644
--- a/digital/io/src/main.c
+++ b/digital/io/src/main.c
@@ -28,6 +28,8 @@
#include "modules/proto/proto.h"
#include "modules/utils/utils.h"
#include "modules/path/path.h"
+#include "modules/devices/usdist/usdist.h"
+#include "modules/devices/servo/servo_pos.h"
#include "modules/flash/flash.h"
#include "modules/trace/trace.h"
#include "events.h"
@@ -50,8 +52,6 @@
#include "fsm.h"
#include "fsm_queue.h"
#include "bot.h"
-#include "servo_pos.h"
-#include "usdist.h"
#include "radar.h"
#include "chrono.h" /* chrono_end_match */
#include "pwm.h"
@@ -408,7 +408,7 @@ proto_callback (uint8_t cmd, uint8_t size, uint8_t *args)
* - 1b: servo id number;
* - 1b: pwm high time value (position).
*/
- servo_set_high_time (args[0], args[1]);
+ servo_set_position (args[0], args[1]);
break;
case c ('S', 0):