Fix motor off by one errors.

[uccvend-snackrom.git] / ROM2 / motors.c

diff --git a/ROM2/motors.c b/ROM2/motors.c
index a114490..64158ae 100644 (file)
--- a/ROM2/motors.c
+++ b/ROM2/motors.c
@@ -55,13 +55,13 @@ void motor_on(u8 slot) {
                        break;
                default: /* < 8 */
                        motor_shift_send(1 << col); /* cols from 0..7 */
+                       bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_COL_DISABLE);
        }
 
        motor_shift_send(1 << (row-1)); /* rows from 1..8 here */
 
        bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
        bclr_changer_output(A3000_MOTOR_ROW_DISABLE);
-       bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_COL_DISABLE);
 }
 
 void motors_off() {
@@ -97,7 +97,7 @@ bool is_motor(u8 slot) {
 bool left_home(u8 slot) {
        u8 i, r = slot%10;
        if (r >= 5) r--; 
-       r = 1 << r;
+       r = 1 << (r-1);
 
        for (i = 0; i < 5; i++)
                if ((home_sensors & r) == 0) return 1;
@@ -109,7 +109,7 @@ bool left_home(u8 slot) {
 bool back_home(u8 slot) {
        u8 i, r = slot%10;
        if (r >= 5) r--; 
-       r = 1 << r;
+       r = 1 << (r-1);
 
        for (i = 0; i < 5; i++) {
                if (home_sensors & r) return 1;
@@ -136,9 +136,7 @@ u8 dispense_motor(u8 slot) {
        //if (!is_motor(slot)) return MOTOR_NOSLOT;
 
        motor_on(slot);
-       delay(1000);
-       motors_off();
-       return MOTOR_SUCCESS;
+       delay(100);
        
        if (!left_home(slot)) {
                motors_off();