allow to harvest in nomove mode
authorzer0 <zer0@carbon.local>
Mon, 3 May 2010 15:24:54 +0000 (17:24 +0200)
committerzer0 <zer0@carbon.local>
Mon, 3 May 2010 15:24:54 +0000 (17:24 +0200)
projects/microb2010/cobboard/state.c

index e315da0..cbbc829 100644 (file)
@@ -338,12 +338,10 @@ void state_machine(void)
                /* harvest */
                if (cob_count < 5) {
                        if (state_spicklemode_deployed(I2C_LEFT_SIDE) &&
                /* harvest */
                if (cob_count < 5) {
                        if (state_spicklemode_deployed(I2C_LEFT_SIDE) &&
-                           state_spicklemode_autoharvest(I2C_LEFT_SIDE) &&
-                           !state_spicklemode_nomove(I2C_LEFT_SIDE))
+                           state_spicklemode_autoharvest(I2C_LEFT_SIDE))
                                state_do_harvest(I2C_LEFT_SIDE);
                        if (state_spicklemode_deployed(I2C_RIGHT_SIDE) &&
                                state_do_harvest(I2C_LEFT_SIDE);
                        if (state_spicklemode_deployed(I2C_RIGHT_SIDE) &&
-                           state_spicklemode_autoharvest(I2C_RIGHT_SIDE) &&
-                           !state_spicklemode_nomove(I2C_RIGHT_SIDE))
+                           state_spicklemode_autoharvest(I2C_RIGHT_SIDE))
                                state_do_harvest(I2C_RIGHT_SIDE);
                }
 
                                state_do_harvest(I2C_RIGHT_SIDE);
                }