X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcommon%2Fi2c_commands.h;h=4b8aea5bc1310d3acce79e34fa735fdaaf8e4526;hp=d08e58023a7940fdf62fca7d1caf4cf05f888718;hb=b022f257a5ee568737e1a684a83d0154397fffcb;hpb=c5092ef0e45256f7e5ff2ceea8e1aa1cb33027db

diff --git a/projects/microb2010/common/i2c_commands.h b/projects/microb2010/common/i2c_commands.h
index d08e580..4b8aea5 100644
--- a/projects/microb2010/common/i2c_commands.h
+++ b/projects/microb2010/common/i2c_commands.h
@@ -52,7 +52,7 @@ struct i2c_cmd_hdr {
 struct i2c_cmd_led_control {
 	struct i2c_cmd_hdr hdr;
 	uint8_t led_num:7;
-	uint8_t state:1;	
+	uint8_t state:1;
 };
 
 /****/
@@ -68,6 +68,7 @@ struct i2c_cmd_generic_color {
 
 #define I2C_CMD_COBBOARD_SET_MODE 0x02
 
+/* XXX disabled, use memory sync instead */
 struct i2c_cmd_cobboard_set_mode {
 	struct i2c_cmd_hdr hdr;
 
@@ -77,7 +78,7 @@ struct i2c_cmd_cobboard_set_mode {
 #define I2C_COBBOARD_MODE_R_HARVEST    0x08 /* auto harvest withe cobs */
 #define I2C_COBBOARD_MODE_EJECT        0x10 /* eject cobs */
 #define I2C_COBBOARD_MODE_INIT         0x20 /* init state machine */
-	uint8_t mode;
+	//uint8_t mode;
 };
 
 #define I2C_CMD_BALLBOARD_SET_MODE 0x10
@@ -85,13 +86,14 @@ struct i2c_cmd_cobboard_set_mode {
 struct i2c_cmd_ballboard_set_mode {
 	struct i2c_cmd_hdr hdr;
 
-#define I2C_BALLBOARD_MODE_OFF         0x00
-#define I2C_BALLBOARD_MODE_HARVEST     0x01
-#define I2C_BALLBOARD_MODE_EJECT       0x02
-#define I2C_BALLBOARD_MODE_PREP_L_FORK 0x03
-#define I2C_BALLBOARD_MODE_TAKE_L_FORK 0x04
-#define I2C_BALLBOARD_MODE_PREP_R_FORK 0x05
-#define I2C_BALLBOARD_MODE_TAKE_R_FORK 0x06
+#define I2C_BALLBOARD_MODE_INIT        0x00
+#define I2C_BALLBOARD_MODE_OFF         0x01
+#define I2C_BALLBOARD_MODE_HARVEST     0x02
+#define I2C_BALLBOARD_MODE_EJECT       0x03
+#define I2C_BALLBOARD_MODE_PREP_L_FORK 0x04
+#define I2C_BALLBOARD_MODE_TAKE_L_FORK 0x05
+#define I2C_BALLBOARD_MODE_PREP_R_FORK 0x06
+#define I2C_BALLBOARD_MODE_TAKE_R_FORK 0x07
 	uint8_t mode;
 };
 
@@ -104,7 +106,7 @@ struct i2c_cmd_ballboard_set_mode {
 
 struct i2c_req_cobboard_status {
 	struct i2c_cmd_hdr hdr;
-	int16_t sickle_left1_current;
+	uint8_t mode;
 };
 
 #define I2C_ANS_COBBOARD_STATUS 0x81
@@ -114,9 +116,10 @@ struct i2c_ans_cobboard_status {
 	/* mode type are defined above: I2C_COBBOARD_MODE_xxx */
 	uint8_t mode;
 
-#define I2C_COBBOARD_STATUS_F_READY         0x00
-#define I2C_COBBOARD_STATUS_F_BUSY          0x01
-#define I2C_COBBOARD_STATUS_F_EXCPT         0x02
+#define I2C_COBBOARD_STATUS_READY         0x00
+#define I2C_COBBOARD_STATUS_LBUSY         0x01
+#define I2C_COBBOARD_STATUS_RBUSY         0x02
+#define I2C_COBBOARD_STATUS_EJECT         0x03
 	uint8_t status;
 
 	uint8_t cob_count;
@@ -136,6 +139,7 @@ struct i2c_req_ballboard_status {
 struct i2c_ans_ballboard_status {
 	struct i2c_cmd_hdr hdr;
 
+	uint8_t mode;
 
 #define I2C_BALLBOARD_STATUS_F_READY         0x00
 #define I2C_BALLBOARD_STATUS_F_BUSY          0x01