git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change colors
[aversive.git]
/
projects
/
microb2010
/
tests
/
hostsim
/
strat.c
diff --git
a/projects/microb2010/tests/hostsim/strat.c
b/projects/microb2010/tests/hostsim/strat.c
index
4cc17fb
..
dc6d865
100644
(file)
--- a/
projects/microb2010/tests/hostsim/strat.c
+++ b/
projects/microb2010/tests/hostsim/strat.c
@@
-183,11
+183,11
@@
struct strat_infos strat_infos = {
/* lintel dispensers */
.l1 = {
/* lintel dispensers */
.l1 = {
- .x = 912, /* XXX for
red
only */
+ .x = 912, /* XXX for
yellow
only */
.name = "lin_disp1",
},
.l2 = {
.name = "lin_disp1",
},
.l2 = {
- .x = 1312, /* XXX for
red
only */
+ .x = 1312, /* XXX for
yellow
only */
.name = "lin_disp2",
},
.name = "lin_disp2",
},
@@
-244,7
+244,7
@@
struct strat_infos strat_infos = {
void strat_set_bounding_box(void)
{
void strat_set_bounding_box(void)
{
- if (get_color() == I2C_COLOR_
RED
) {
+ if (get_color() == I2C_COLOR_
YELLOW
) {
strat_infos.area_bbox.x1 = 300;
strat_infos.area_bbox.y1 = 200;
strat_infos.area_bbox.x2 = 2720; /* needed for c1 */
strat_infos.area_bbox.x1 = 300;
strat_infos.area_bbox.y1 = 200;
strat_infos.area_bbox.x2 = 2720; /* needed for c1 */
@@
-273,7
+273,7
@@
void strat_preinit(void)
#ifndef HOST_VERSION
i2c_mechboard_mode_init();
#ifndef HOST_VERSION
i2c_mechboard_mode_init();
- if (get_color() == I2C_COLOR_
RED
)
+ if (get_color() == I2C_COLOR_
YELLOW
)
i2c_mechboard_mode_prepare_pickup(I2C_LEFT_SIDE);
else
i2c_mechboard_mode_prepare_pickup(I2C_RIGHT_SIDE);
i2c_mechboard_mode_prepare_pickup(I2C_LEFT_SIDE);
else
i2c_mechboard_mode_prepare_pickup(I2C_RIGHT_SIDE);
@@
-537,7
+537,7
@@
void strat_reset_infos(void)
strat_set_bounding_box();
/* set lintel position, depending on color */
strat_set_bounding_box();
/* set lintel position, depending on color */
- if (mainboard.our_color == I2C_COLOR_
RED
) {
+ if (mainboard.our_color == I2C_COLOR_
YELLOW
) {
strat_infos.l1.x = 912;
strat_infos.l2.x = 1312;
}
strat_infos.l1.x = 912;
strat_infos.l2.x = 1312;
}