summaryrefslogtreecommitdiff
path: root/digital/asserv/src/asserv/test_motor_model.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/asserv/src/asserv/test_motor_model.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/asserv/src/asserv/test_motor_model.c')
-rw-r--r--digital/asserv/src/asserv/test_motor_model.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/digital/asserv/src/asserv/test_motor_model.c b/digital/asserv/src/asserv/test_motor_model.c
index 706aa31b..044bab2e 100644
--- a/digital/asserv/src/asserv/test_motor_model.c
+++ b/digital/asserv/src/asserv/test_motor_model.c
@@ -84,3 +84,9 @@ simu_sensor_update_marcel (void)
{
}
+int
+simu_table_test_robospierre (double p_x, double p_y)
+{
+ return 0;
+}
+