From: zer0 <zer0@platinum>
Date: Wed, 20 Jan 2010 23:48:40 +0000 (+0100)
Subject: unfortunately, we cannot use time.h, there is a conflict name with std headers
X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=commitdiff_plain;h=1f7500374129db3830592c4e931a5c9297c9dc1c

unfortunately, we cannot use time.h, there is a conflict name with std headers
---

diff --git a/projects/microb2010/tests/hostsim/.config b/projects/microb2010/tests/hostsim/.config
index a5d281a..149a604 100644
--- a/projects/microb2010/tests/hostsim/.config
+++ b/projects/microb2010/tests/hostsim/.config
@@ -86,8 +86,8 @@ CONFIG_MODULE_SCHEDULER_CREATE_CONFIG=y
 # CONFIG_MODULE_SCHEDULER_USE_TIMERS is not set
 # CONFIG_MODULE_SCHEDULER_TIMER0 is not set
 CONFIG_MODULE_SCHEDULER_MANUAL=y
-CONFIG_MODULE_TIME=y
-CONFIG_MODULE_TIME_CREATE_CONFIG=y
+# CONFIG_MODULE_TIME is not set
+# CONFIG_MODULE_TIME_CREATE_CONFIG is not set
 # CONFIG_MODULE_TIME_EXT is not set
 # CONFIG_MODULE_TIME_EXT_CREATE_CONFIG is not set
 
diff --git a/projects/microb2010/tests/hostsim/main.c b/projects/microb2010/tests/hostsim/main.c
index ec70479..fe884e7 100644
--- a/projects/microb2010/tests/hostsim/main.c
+++ b/projects/microb2010/tests/hostsim/main.c
@@ -71,7 +71,6 @@ int main(void)
 	hostsim_init();
 	robotsim_init();
 #endif
-	time_init(TIME_PRIO);
 
 
 	microb_cs_init();
@@ -83,9 +82,9 @@ int main(void)
 		DO_POS | DO_POWER | DO_BD | DO_CS;
 
 	trajectory_d_rel(&mainboard.traj, 1000);
-	time_wait_ms(2000);
+	wait_ms(2000);
 	trajectory_goto_xy_abs(&mainboard.traj, 1500, 2000);
-	time_wait_ms(2000);
+	wait_ms(2000);
 	return 0;
 }
 
diff --git a/projects/microb2010/tests/hostsim/robotsim.c b/projects/microb2010/tests/hostsim/robotsim.c
index 7ed49f4..713b7f7 100644
--- a/projects/microb2010/tests/hostsim/robotsim.c
+++ b/projects/microb2010/tests/hostsim/robotsim.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <fcntl.h>
 
 #include <aversive.h>