X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Ftests%2Fhostsim%2Fcommands_mainboard.c;fp=projects%2Fmicrob2010%2Ftests%2Fhostsim%2Fcommands_mainboard.c;h=782eac096231a69ffc5835d0cb89097c7587ab14;hp=ca84489a004813a9073acdedf8db65890268d951;hb=31bb619b1046f561cff432cb116735b1423a8d89;hpb=82d59983ef31ce70582b602600b4ee221f5bed03

diff --git a/projects/microb2010/tests/hostsim/commands_mainboard.c b/projects/microb2010/tests/hostsim/commands_mainboard.c
index ca84489..782eac0 100644
--- a/projects/microb2010/tests/hostsim/commands_mainboard.c
+++ b/projects/microb2010/tests/hostsim/commands_mainboard.c
@@ -296,15 +296,15 @@ static void cmd_start_parsed(void *parsed_result, void *data)
 		gen.log_level = 0;
 	}
 
-	if (!strcmp_P(res->color, PSTR("red"))) {
-		mainboard.our_color = I2C_COLOR_RED;
-		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_RED);
-		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_RED);
+	if (!strcmp_P(res->color, PSTR("yellow"))) {
+		mainboard.our_color = I2C_COLOR_YELLOW;
+		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_YELLOW);
+		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_YELLOW);
 	}
-	else if (!strcmp_P(res->color, PSTR("green"))) {
-		mainboard.our_color = I2C_COLOR_GREEN;
-		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_GREEN);
-		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_GREEN);
+	else if (!strcmp_P(res->color, PSTR("blue"))) {
+		mainboard.our_color = I2C_COLOR_BLUE;
+		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_BLUE);
+		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_BLUE);
 	}
 
 	printf_P(PSTR("Check that lintel is loaded\r\n"));
@@ -324,7 +324,7 @@ static void cmd_start_parsed(void *parsed_result, void *data)
 
 prog_char str_start_arg0[] = "start";
 parse_pgm_token_string_t cmd_start_arg0 = TOKEN_STRING_INITIALIZER(struct cmd_start_result, arg0, str_start_arg0);
-prog_char str_start_color[] = "green#red";
+prog_char str_start_color[] = "blue#yellow";
 parse_pgm_token_string_t cmd_start_color = TOKEN_STRING_INITIALIZER(struct cmd_start_result, color, str_start_color);
 prog_char str_start_debug[] = "debug#match";
 parse_pgm_token_string_t cmd_start_debug = TOKEN_STRING_INITIALIZER(struct cmd_start_result, debug, str_start_debug);
@@ -560,15 +560,15 @@ static void cmd_color_parsed(void *parsed_result, void *data)
 	printf("not implemented\n");
 #else
 	struct cmd_color_result *res = (struct cmd_color_result *) parsed_result;
-	if (!strcmp_P(res->color, PSTR("red"))) {
-		mainboard.our_color = I2C_COLOR_RED;
-		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_RED);
-		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_RED);
+	if (!strcmp_P(res->color, PSTR("yellow"))) {
+		mainboard.our_color = I2C_COLOR_YELLOW;
+		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_YELLOW);
+		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_YELLOW);
 	}
-	else if (!strcmp_P(res->color, PSTR("green"))) {
-		mainboard.our_color = I2C_COLOR_GREEN;
-		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_GREEN);
-		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_GREEN);
+	else if (!strcmp_P(res->color, PSTR("blue"))) {
+		mainboard.our_color = I2C_COLOR_BLUE;
+		i2c_set_color(I2C_MECHBOARD_ADDR, I2C_COLOR_BLUE);
+		i2c_set_color(I2C_SENSORBOARD_ADDR, I2C_COLOR_BLUE);
 	}
 	printf_P(PSTR("Done\r\n"));
 #endif
@@ -576,7 +576,7 @@ static void cmd_color_parsed(void *parsed_result, void *data)
 
 prog_char str_color_arg0[] = "color";
 parse_pgm_token_string_t cmd_color_arg0 = TOKEN_STRING_INITIALIZER(struct cmd_color_result, arg0, str_color_arg0);
-prog_char str_color_color[] = "green#red";
+prog_char str_color_color[] = "blue#yellow";
 parse_pgm_token_string_t cmd_color_color = TOKEN_STRING_INITIALIZER(struct cmd_color_result, color, str_color_color);
 
 prog_char help_color[] = "Set our color";
@@ -1427,7 +1427,7 @@ struct cmd_pickup_test_result {
 	int16_t dist;
 };
 
-/* return red or green sensor */
+/* return yellow or blue sensor */
 #define COLOR_IR_SENSOR()						\
 	({								\
 		uint8_t __ret = 0;					\