summaryrefslogtreecommitdiff
path: root/usb-i2c-sl018/tuer-rfid.c
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-02-06 02:47:46 +0000
committerChristian Pointner <equinox@spreadspace.org>2013-02-06 02:47:46 +0000
commit0d53478381fe1297d6fd56e05f4a43a2179d2505 (patch)
tree21ae3643f15d6e9af3b264d971d4288cc95dbe36 /usb-i2c-sl018/tuer-rfid.c
parentcleanup (diff)
added first version for ledmatrix driver
git-svn-id: https://svn.spreadspace.org/avr/trunk@125 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'usb-i2c-sl018/tuer-rfid.c')
-rw-r--r--usb-i2c-sl018/tuer-rfid.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index 5182aa1..3b6b0da 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -34,6 +34,7 @@
#include "heartbeat.h"
#include "stepper.h"
+#include "ledmatrix.h"
#include "LUFA/Drivers/Peripheral/TWI.h"
#include "LUFA/Drivers/Peripheral/Serial.h"
@@ -320,7 +321,7 @@ void handle_stdio(uint8_t cmd)
case 'r':
reset2bootloader();
break;
- case '0':
+ case 'R':
if(!sl018_reset())
fprintf(stdio, "ok\n\r");
break;
@@ -330,14 +331,6 @@ void handle_stdio(uint8_t cmd)
fprintf(stdio, "%s\n\r",twi_recv_msg->data);
}
break;
- case '4': //turn cardreader led off
- if(!sl018_cmd(SL018_CMD_ComRedLedOff))
- fprintf(stdio, "ok\n\r");
- break;
- case '5': //turn cardreader led on
- if(!sl018_cmd(SL018_CMD_ComRedLedOn))
- fprintf(stdio, "ok\n\r");
- break;
case 'e': //flash eeprom
flash_keystore_from_stdio();
break;
@@ -356,6 +349,15 @@ void handle_stdio(uint8_t cmd)
else
fprintf(stdio, "error: already in progress\n\r");
break;
+ case '0': ledmatrix(off); break;
+ case '1': ledmatrix(red); break;
+ case '2': ledmatrix(red_moving); break;
+ case '3': ledmatrix(red_blink); break;
+ case '4': ledmatrix(green); break;
+ case '5': ledmatrix(green_moving); break;
+ case '6': ledmatrix(green_blink); break;
+ case '7': ledmatrix(rg_moving); break;
+ case '8': ledmatrix(rg_blink); break;
default: fprintf(stdio, "error, unknown command %02X '%c'\n\r",cmd, cmd); return;
}
}
@@ -453,6 +455,7 @@ int main(void)
init_heartbeat();
init_stepper();
+ init_ledmatrix();
sl018_reset();