Revision 150
Fixed several bugs:
warn state no longer allows red button to kill tool while it is spinning
keypresses are flushed by the server before a request so we don't get the one-swipe-behind bug
Changes:
red light stays on on toolboxes while powered
added more blink-error codes to the cardbox
main.c | ||
---|---|---|
40 | 40 |
#define OFF 0x00 |
41 | 41 |
|
42 | 42 |
/***** change ADDR ****/ |
43 |
#define ADDR 14
|
|
43 |
#define ADDR 18
|
|
44 | 44 |
#define DELIM '^' |
45 | 45 |
#define SERVER 1 |
46 | 46 |
#define TURNON 'O' |
... | ... | |
163 | 163 |
|
164 | 164 |
switch (state) { |
165 | 165 |
case sd: |
166 |
toggle_led(LED_RED, OFF);
|
|
166 |
toggle_led(LED_RED, ON);
|
|
167 | 167 |
toggle_led(LED_YELLOW, OFF); |
168 | 168 |
toggle_led(LED_GREEN, OFF); |
169 | 169 |
toggle_relay(OFF); |
... | ... | |
308 | 308 |
toggle_led(LED_YELLOW, OFF); |
309 | 309 |
} |
310 | 310 |
|
311 |
if (read_button(BUT_RED)) { |
|
311 |
if (read_button(BUT_RED) && read_vac() == OFF) {
|
|
312 | 312 |
toggle_relay(OFF); |
313 | 313 |
state = off; |
314 | 314 |
} else if (read_button(BUT_BLACK)) { |
... | ... | |
329 | 329 |
toggle_led(LED_GREEN, OFF); |
330 | 330 |
toggle_led(LED_YELLOW, OFF); |
331 | 331 |
toggle_led(LED_RED, ON); |
332 |
_delay_ms(2000); |
|
333 |
toggle_led(LED_RED, OFF); |
|
334 | 332 |
state = sd; |
335 | 333 |
break; |
336 | 334 |
default: state = sd; |
Also available in: Unified diff