git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unfortunately, we cannot use time.h, there is a conflict name with std headers
[aversive.git]
/
projects
/
microb2010
/
tests
/
hostsim
/
main.c
diff --git
a/projects/microb2010/tests/hostsim/main.c
b/projects/microb2010/tests/hostsim/main.c
index
ec70479
..
fe884e7
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