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 a5d281ab43a1bc339adc1360c2dd4fe55013c583..149a6048283e8564478d00a0f306e58b2110437b 100644 (file)
--- 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_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
 
 # 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 ec7047986921e113d702da82cec7420c1c10fb54..fe884e79a9aaa5c5939bbba5c5800fddec3d50eb 100644 (file)
--- a/projects/microb2010/tests/hostsim/main.c
+++ b/projects/microb2010/tests/hostsim/main.c
@@ -71,7 +71,6 @@ int main(void)
        hostsim_init();\r
        robotsim_init();\r
 #endif\r
        hostsim_init();\r
        robotsim_init();\r
 #endif\r

-       time_init(TIME_PRIO);\r

 \r
 \r
        microb_cs_init();\r
 \r
 \r
        microb_cs_init();\r


@@ -83,9 +82,9 @@ int main(void)
                DO_POS | DO_POWER | DO_BD | DO_CS;\r
 \r
        trajectory_d_rel(&mainboard.traj, 1000);\r
                DO_POS | DO_POWER | DO_BD | DO_CS;\r
 \r
        trajectory_d_rel(&mainboard.traj, 1000);\r

-       time_wait_ms(2000);\r
+       wait_ms(2000);\r

        trajectory_goto_xy_abs(&mainboard.traj, 1500, 2000);\r
        trajectory_goto_xy_abs(&mainboard.traj, 1500, 2000);\r

-       time_wait_ms(2000);\r
+       wait_ms(2000);\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

diff --git a/projects/microb2010/tests/hostsim/robotsim.c b/projects/microb2010/tests/hostsim/robotsim.c
index 7ed49f48a8cb7d5507dd03878885b5c9fd4c51bf..713b7f71ff18224e368151d346ecaa8a55837fc2 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #include <stdint.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

+#include <sys/types.h>

 #include <fcntl.h>
 
 #include <aversive.h>
 #include <fcntl.h>
 
 #include <aversive.h>