X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Frobotsim.c;h=7c5283576c21d25343d53360e5fde1ed7867b150;hp=a0fa5a0eba8baf1f6654b8b0ed559c64050943bc;hb=092caa88280f71fb58e5938114304fe2e94d6855;hpb=b022f257a5ee568737e1a684a83d0154397fffcb

diff --git a/projects/microb2010/mainboard/robotsim.c b/projects/microb2010/mainboard/robotsim.c
index a0fa5a0..7c52835 100644
--- a/projects/microb2010/mainboard/robotsim.c
+++ b/projects/microb2010/mainboard/robotsim.c
@@ -57,9 +57,23 @@ static int32_t l_pwm, r_pwm;
 static int32_t l_enc, r_enc;
 
 static int fdr, fdw;
+/*
+ * Debug with GDB:
+ *
+ * (gdb) handle SIGUSR1 pass
+ * Signal        Stop	Print	Pass to program	Description
+ * SIGUSR1       Yes	Yes	Yes		User defined signal 1
+ * (gdb) handle SIGUSR2 pass
+ * Signal        Stop	Print	Pass to program	Description
+ * SIGUSR2       Yes	Yes	Yes		User defined signal 2
+ * (gdb) handle SIGUSR1 noprint
+ * Signal        Stop	Print	Pass to program	Description
+ * SIGUSR1       No	No	Yes		User defined signal 1
+ * (gdb) handle SIGUSR2 noprint
+ */
 
 /* */
-#define FILTER  97
+#define FILTER  98
 #define FILTER2 (100-FILTER)
 #define SHIFT   4
 
@@ -67,11 +81,16 @@ void robotsim_dump(void)
 {
 	char buf[BUFSIZ];
 	int len;
+	int16_t x, y, a;
+
+	x = position_get_x_s16(&mainboard.pos);
+	y = position_get_y_s16(&mainboard.pos);
+	a = position_get_a_deg_s16(&mainboard.pos);
+/* 	y = COLOR_Y(y); */
+/* 	a = COLOR_A(a); */
 
 	len = snprintf(buf, sizeof(buf), "pos=%d,%d,%d\n",
-		      position_get_x_s16(&mainboard.pos),
-		      position_get_y_s16(&mainboard.pos),
-		      position_get_a_deg_s16(&mainboard.pos));
+		       x, y, a);
 	hostsim_lock();
 	write(fdw, buf, len);
 	hostsim_unlock();
@@ -92,16 +111,25 @@ robotsim_i2c_ballboard_set_mode(struct i2c_cmd_ballboard_set_mode *cmd)
 }
 
 int8_t
-robotsim_i2c_cobboard_set_mode(uint8_t mode)
+robotsim_i2c_cobboard_set_spickles(uint8_t side, uint8_t flags)
 {
 	char buf[BUFSIZ];
 	int len;
 
-	if (cobboard.mode == mode)
-		return 0;
+	if (side == I2C_LEFT_SIDE) {
+		if (cobboard.lspickle == flags)
+			return 0;
+		else
+			cobboard.lspickle = flags;
+	}
+	if (side == I2C_RIGHT_SIDE) {
+		if (cobboard.rspickle == flags)
+			return 0;
+		else
+			cobboard.rspickle = flags;
+	}
 
-	cobboard.mode = mode;
-	len = snprintf(buf, sizeof(buf), "cobboard=%d\n", mode);
+	len = snprintf(buf, sizeof(buf), "cobboard=%d,%d\n", side, flags);
 	hostsim_lock();
 	write(fdw, buf, len);
 	hostsim_unlock();
@@ -199,8 +227,8 @@ void robotsim_update(void)
 		((local_r_pwm * 1000 * FILTER2)/1000);
 
 	/* basic collision detection */
-	a2 = atan2(ROBOT_WIDTH/2, ROBOT_HALF_LENGTH_REAR);
-	d = norm(ROBOT_WIDTH/2, ROBOT_HALF_LENGTH_REAR);
+	a2 = atan2(ROBOT_WIDTH/2, ROBOT_HALF_LENGTH_FRONT);
+	d = norm(ROBOT_WIDTH/2, ROBOT_HALF_LENGTH_FRONT);
 
 	xfl = x + cos(a+a2) * d;
 	yfl = y + sin(a+a2) * d;