X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fcommands.c;h=879297abae5b3cb4b683123a947acc48396ee206;hp=26060d6a2a11e5261075a3bb9901135447479f9f;hb=4e7801883ed4076cb14b63a0571467747894c0f8;hpb=e0908eab4d4b00cf19083f91a9921b3e8d0cae63

diff --git a/projects/microb2010/mainboard/commands.c b/projects/microb2010/mainboard/commands.c
index 26060d6..879297a 100644
--- a/projects/microb2010/mainboard/commands.c
+++ b/projects/microb2010/mainboard/commands.c
@@ -70,33 +70,24 @@ extern parse_pgm_inst_t cmd_interact;
 extern parse_pgm_inst_t cmd_color;
 extern parse_pgm_inst_t cmd_rs;
 extern parse_pgm_inst_t cmd_i2cdebug;
-extern parse_pgm_inst_t cmd_mechboard_show;
-extern parse_pgm_inst_t cmd_mechboard_setmode1;
-extern parse_pgm_inst_t cmd_mechboard_setmode2;
-extern parse_pgm_inst_t cmd_mechboard_setmode3;
-extern parse_pgm_inst_t cmd_mechboard_setmode4;
-extern parse_pgm_inst_t cmd_mechboard_setmode5;
-extern parse_pgm_inst_t cmd_pickup_wheels;
+extern parse_pgm_inst_t cmd_cobboard_show;
+extern parse_pgm_inst_t cmd_cobboard_setmode1;
+extern parse_pgm_inst_t cmd_cobboard_setmode2;
+extern parse_pgm_inst_t cmd_cobboard_setmode3;
+extern parse_pgm_inst_t cmd_ballboard_show;
+extern parse_pgm_inst_t cmd_ballboard_setmode1;
+extern parse_pgm_inst_t cmd_ballboard_setmode2;
+extern parse_pgm_inst_t cmd_ballboard_setmode3;
 extern parse_pgm_inst_t cmd_beacon_start;
-extern parse_pgm_inst_t cmd_pump_current;
-extern parse_pgm_inst_t cmd_build_test;
-extern parse_pgm_inst_t cmd_column_test;
-extern parse_pgm_inst_t cmd_column_test2;
-extern parse_pgm_inst_t cmd_lintel_test;
-extern parse_pgm_inst_t cmd_pickup_test;
-extern parse_pgm_inst_t cmd_scan_test;
-extern parse_pgm_inst_t cmd_scan_test2;
-extern parse_pgm_inst_t cmd_time_monitor;
-extern parse_pgm_inst_t cmd_scanner;
-extern parse_pgm_inst_t cmd_build_z1;
-#ifdef TEST_BEACON
-extern parse_pgm_inst_t cmd_beacon_opp_dump;
-#endif
+extern parse_pgm_inst_t cmd_servo_balls;
+extern parse_pgm_inst_t cmd_clitoid;
 extern parse_pgm_inst_t cmd_test;
 
 /* commands_traj.c */
 extern parse_pgm_inst_t cmd_traj_speed;
 extern parse_pgm_inst_t cmd_traj_speed_show;
+extern parse_pgm_inst_t cmd_traj_acc;
+extern parse_pgm_inst_t cmd_traj_acc_show;
 extern parse_pgm_inst_t cmd_trajectory;
 extern parse_pgm_inst_t cmd_trajectory_show;
 extern parse_pgm_inst_t cmd_circle_coef;
@@ -114,7 +105,7 @@ extern parse_pgm_inst_t cmd_goto2;
 extern parse_pgm_inst_t cmd_goto3;
 extern parse_pgm_inst_t cmd_position;
 extern parse_pgm_inst_t cmd_position_set;
-extern parse_pgm_inst_t cmd_strat_infos;
+extern parse_pgm_inst_t cmd_strat_db;
 extern parse_pgm_inst_t cmd_strat_conf;
 extern parse_pgm_inst_t cmd_strat_conf2;
 extern parse_pgm_inst_t cmd_strat_conf3;
@@ -170,33 +161,23 @@ parse_pgm_ctx_t main_ctx[] = {
 	(parse_pgm_inst_t *)&cmd_color,
 	(parse_pgm_inst_t *)&cmd_rs,
 	(parse_pgm_inst_t *)&cmd_i2cdebug,
-	(parse_pgm_inst_t *)&cmd_mechboard_show,
-	(parse_pgm_inst_t *)&cmd_mechboard_setmode1,
-	(parse_pgm_inst_t *)&cmd_mechboard_setmode2,
-	(parse_pgm_inst_t *)&cmd_mechboard_setmode3,
-	(parse_pgm_inst_t *)&cmd_mechboard_setmode4,
-	(parse_pgm_inst_t *)&cmd_mechboard_setmode5,
-	(parse_pgm_inst_t *)&cmd_pickup_wheels,
-	(parse_pgm_inst_t *)&cmd_beacon_start,
-	(parse_pgm_inst_t *)&cmd_pump_current,
-	(parse_pgm_inst_t *)&cmd_build_test,
-	(parse_pgm_inst_t *)&cmd_column_test,
-	(parse_pgm_inst_t *)&cmd_column_test2,
-	(parse_pgm_inst_t *)&cmd_lintel_test,
-	(parse_pgm_inst_t *)&cmd_pickup_test,
-	(parse_pgm_inst_t *)&cmd_scan_test,
-	(parse_pgm_inst_t *)&cmd_scan_test2,
-	(parse_pgm_inst_t *)&cmd_time_monitor,
-	(parse_pgm_inst_t *)&cmd_scanner,
-	(parse_pgm_inst_t *)&cmd_build_z1,
-#ifdef TEST_BEACON
-	(parse_pgm_inst_t *)&cmd_beacon_opp_dump,
-#endif
+	(parse_pgm_inst_t *)&cmd_cobboard_show,
+	(parse_pgm_inst_t *)&cmd_cobboard_setmode1,
+	(parse_pgm_inst_t *)&cmd_cobboard_setmode2,
+	(parse_pgm_inst_t *)&cmd_cobboard_setmode3,
+	(parse_pgm_inst_t *)&cmd_ballboard_show,
+	(parse_pgm_inst_t *)&cmd_ballboard_setmode1,
+	(parse_pgm_inst_t *)&cmd_ballboard_setmode2,
+	(parse_pgm_inst_t *)&cmd_ballboard_setmode3,
+	(parse_pgm_inst_t *)&cmd_servo_balls,
+	(parse_pgm_inst_t *)&cmd_clitoid,
 	(parse_pgm_inst_t *)&cmd_test,
 
 	/* commands_traj.c */
 	(parse_pgm_inst_t *)&cmd_traj_speed,
 	(parse_pgm_inst_t *)&cmd_traj_speed_show,
+	(parse_pgm_inst_t *)&cmd_traj_acc,
+	(parse_pgm_inst_t *)&cmd_traj_acc_show,
 	(parse_pgm_inst_t *)&cmd_trajectory,
 	(parse_pgm_inst_t *)&cmd_trajectory_show,
 	(parse_pgm_inst_t *)&cmd_circle_coef,
@@ -213,11 +194,10 @@ parse_pgm_ctx_t main_ctx[] = {
 	(parse_pgm_inst_t *)&cmd_goto2,
 	(parse_pgm_inst_t *)&cmd_position,
 	(parse_pgm_inst_t *)&cmd_position_set,
-	(parse_pgm_inst_t *)&cmd_strat_infos,
+	(parse_pgm_inst_t *)&cmd_strat_db,
 	(parse_pgm_inst_t *)&cmd_strat_conf,
 	(parse_pgm_inst_t *)&cmd_strat_conf2,
 	(parse_pgm_inst_t *)&cmd_strat_conf3,
-	(parse_pgm_inst_t *)&cmd_strat_conf4,
 	(parse_pgm_inst_t *)&cmd_subtraj,
 	NULL,
 };