git.ucc.asn.au
/
uccvend-snackrom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enough wacky little fixes to get motors turning and keypad functional.
[uccvend-snackrom.git]
/
ROM2
/
motors.c
diff --git
a/ROM2/motors.c
b/ROM2/motors.c
index
b0e4ee3
..
a114490
100644
(file)
--- a/
ROM2/motors.c
+++ b/
ROM2/motors.c
@@
-24,9
+24,13
@@
void motor_shift_send(u8 data) {
else
bclr_misc_output(A3800_MOTOR_DATA);
else
bclr_misc_output(A3800_MOTOR_DATA);
+ delay(1);
+
/* clock pulse */
bset((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
/* clock pulse */
bset((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
+ delay(1);
bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
+ delay(1);
data = data << 1;
}
data = data << 1;
}
@@
-57,6
+61,7
@@
void motor_on(u8 slot) {
bclr((void*)&_io_ports[M6811_PORTA], PORTA_MOTOR_CLOCK);
bclr_changer_output(A3000_MOTOR_ROW_DISABLE);
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() {
}
void motors_off() {
@@
-128,9
+133,12
@@
bool motor_overcurrent() {
}
u8 dispense_motor(u8 slot) {
}
u8 dispense_motor(u8 slot) {
- if (!is_motor(slot)) return MOTOR_NOSLOT;
+
//
if (!is_motor(slot)) return MOTOR_NOSLOT;
motor_on(slot);
motor_on(slot);
+ delay(1000);
+ motors_off();
+ return MOTOR_SUCCESS;
if (!left_home(slot)) {
motors_off();
if (!left_home(slot)) {
motors_off();
UCC
git Repository :: git.ucc.asn.au