X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Ftests%2Fhostsim%2Fmain.c;h=0182943d760bea331ff991c7baab91d09219bc3f;hp=ec7047986921e113d702da82cec7420c1c10fb54;hb=6a52faca525c864950204424e699c15b23137a51;hpb=145b19e73ce5751b365bc53769189addeecee81b

diff --git a/projects/microb2010/tests/hostsim/main.c b/projects/microb2010/tests/hostsim/main.c
index ec70479..0182943 100644
--- a/projects/microb2010/tests/hostsim/main.c
+++ b/projects/microb2010/tests/hostsim/main.c
@@ -28,7 +28,6 @@
 
 #include <timer.h>
 #include <scheduler.h>
-#include <time.h>
 
 #include <pid.h>
 #include <quadramp.h>
@@ -42,6 +41,7 @@
 #include <rdline.h>
 
 #include <uart.h>
+#include <clock_time.h>
 //#include <timer.h>
 #include <hostsim.h>
 
@@ -53,26 +53,13 @@ struct mainboard mainboard;
 
 int main(void)
 {
-#ifndef HOST_VERSION
-	uart_init();
-	fdevopen(uart0_dev_send, uart0_dev_recv);
-	sei();
-#else
-	int i;
-#endif
-
-#ifdef CONFIG_MODULE_TIMER
-	timer_init();
-#endif
-	scheduler_init();
 	printf("init\n");
 
-#ifdef HOST_VERSION
-	hostsim_init();
-	robotsim_init();
-#endif
+	scheduler_init();
 	time_init(TIME_PRIO);
 
+	hostsim_init();
+	robotsim_init();
 
 	microb_cs_init();
 
@@ -82,8 +69,11 @@ int main(void)
 	mainboard.flags = DO_ENCODERS | DO_RS |
 		DO_POS | DO_POWER | DO_BD | DO_CS;
 
+	time_wait_ms(1000);
+	printf("init\n");
 	trajectory_d_rel(&mainboard.traj, 1000);
 	time_wait_ms(2000);
+	printf("init\n");
 	trajectory_goto_xy_abs(&mainboard.traj, 1500, 2000);
 	time_wait_ms(2000);
 	return 0;