X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fcs.c;h=070046955e7d2dbcbbf6860a549ca905ee209cd3;hp=516f00b0e27c6266e0c7da03d7d2539d0c773926;hb=HEAD;hpb=78150017ab8c5615af414df706a0525fe7c262ae

diff --git a/projects/microb2010/mainboard/cs.c b/projects/microb2010/mainboard/cs.c
index 516f00b..0700469 100644
--- a/projects/microb2010/mainboard/cs.c
+++ b/projects/microb2010/mainboard/cs.c
@@ -133,11 +133,11 @@ static void do_cs(void *dummy)
 		bd_manage_from_cs(&mainboard.left_cobroller.bd, &mainboard.left_cobroller.cs);
 		bd_manage_from_cs(&mainboard.right_cobroller.bd, &mainboard.right_cobroller.cs);
 		if (mainboard.flags & DO_ERRBLOCKING) {
-			if (bd_get(&mainboard.left_cobroller.bd) ||
-			    bd_get(&mainboard.left_cobroller.bd)) {
-				printf_P(PSTR("MOTOR BLOCKED STOP ALL\r\n"));
-				mainboard.flags &= ~(DO_POWER | DO_ERRBLOCKING);
-			}
+/* 			if (bd_get(&mainboard.left_cobroller.bd) || */
+/* 			    bd_get(&mainboard.left_cobroller.bd)) { */
+/* 				printf_P(PSTR("MOTOR BLOCKED STOP ALL\r\n")); */
+/* 				mainboard.flags &= ~(DO_POWER | DO_ERRBLOCKING); */
+/* 			} */
 		}
 #endif
 	}
@@ -165,7 +165,6 @@ static void do_cs(void *dummy)
 
 #ifdef HOST_VERSION
 	if ((cpt & 7) == 0) {
-		//		dump_cs("dist", &mainboard.distance.cs);
 		robotsim_dump();
 	}
 #endif
@@ -240,8 +239,8 @@ void microb_cs_init(void)
 	/* ---- CS angle */
 	/* PID */
 	pid_init(&mainboard.angle.pid);
-	pid_set_gains(&mainboard.angle.pid, 500, 10, 7000);
-	pid_set_maximums(&mainboard.angle.pid, 0, 20000, 4095);
+	pid_set_gains(&mainboard.angle.pid, 850, 30, 15000);
+	pid_set_maximums(&mainboard.angle.pid, 0, 10000, 4095);
 	pid_set_out_shift(&mainboard.angle.pid, 10);
 	pid_set_derivate_filter(&mainboard.angle.pid, 4);
 
@@ -266,8 +265,8 @@ void microb_cs_init(void)
 	/* ---- CS distance */
 	/* PID */
 	pid_init(&mainboard.distance.pid);
-	pid_set_gains(&mainboard.distance.pid, 500, 10, 7000);
-	pid_set_maximums(&mainboard.distance.pid, 0, 2000, 4095);
+	pid_set_gains(&mainboard.distance.pid, 850, 30, 15000);
+	pid_set_maximums(&mainboard.distance.pid, 0, 10000, 4095);
 	pid_set_out_shift(&mainboard.distance.pid, 10);
 	pid_set_derivate_filter(&mainboard.distance.pid, 6);
 
@@ -337,8 +336,8 @@ void microb_cs_init(void)
 	mainboard.left_cobroller.on = 1;
 	mainboard.right_cobroller.on = 1;
 
-
 	scheduler_add_periodical_event_priority(do_cs, NULL,
 						5000L / SCHEDULER_UNIT,
 						CS_PRIO);
+
 }