From 3672b6c195adefef8963f6274d2cf8f8aee0ac3b Mon Sep 17 00:00:00 2001 From: Othmar Gsenger Date: Wed, 6 Feb 2013 20:19:59 +0000 Subject: moved sl018 code to seperate file git-svn-id: https://svn.spreadspace.org/avr/trunk@133 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- usb-i2c-sl018/Makefile | 2 +- usb-i2c-sl018/sl018.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++ usb-i2c-sl018/sl018.h | 40 ++++++++ usb-i2c-sl018/tuer-rfid.c | 226 +++++-------------------------------------- 4 files changed, 305 insertions(+), 205 deletions(-) create mode 100644 usb-i2c-sl018/sl018.c create mode 100644 usb-i2c-sl018/sl018.h (limited to 'usb-i2c-sl018') diff --git a/usb-i2c-sl018/Makefile b/usb-i2c-sl018/Makefile index 4248309..2bf0924 100644 --- a/usb-i2c-sl018/Makefile +++ b/usb-i2c-sl018/Makefile @@ -23,7 +23,7 @@ NAME := tuer-rfid BOARD_TYPE := teensy2 -OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o +OBJ := $(NAME).o heartbeat.o stepper.o ledmatrix.o sl018.o LIBS := util led lufa-descriptor-usbserial EXTERNAL_LIBS := lufa diff --git a/usb-i2c-sl018/sl018.c b/usb-i2c-sl018/sl018.c new file mode 100644 index 0000000..7127f12 --- /dev/null +++ b/usb-i2c-sl018/sl018.c @@ -0,0 +1,242 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * This file is part of spreadspace avr utils. + * + * spreadspace avr utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * spreadspace avr utils is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with spreadspace avr utils. If not, see . + */ +#include "sl018.h" +#include "LUFA/Drivers/Peripheral/TWI.h" + +#define SL018_TWI_ADDR 0xA0 +#define SL018_TAG_STA_PIN PIND +#define SL018_TAG_STA_BIT 7 +#define CARD_PRESENT (!((SL018_TAG_STA_PIN >> SL018_TAG_STA_BIT) & 1)) +#define MAX_UID_LEN 7 + + +const char* SL018_cmd_tostring(const uint8_t cmd) +{ + switch(cmd) { + case 0x01: return "Select Mifare card"; + case 0x02: return "Login to a sector"; + case 0x03: return "Read a data block"; + case 0x04: return "Write a data block"; + case 0x05: return "Read a value block"; + case 0x06: return "Initialize a value block"; + case 0x07: return "Write master key"; + case 0x08: return "Increment value"; + case 0x09: return "Decrement value"; + case 0x0A: return "Copy value"; + case 0x10: return "Read a data page"; + case 0x11: return "Write a data page"; + case 0x40: return "Control the red led"; + case 0xF0: return "Get firmware version"; + case 0xFF: return "Reset"; + default: return "unknown"; + } +} + +const char* SL018_status_tostring(const uint8_t status) +{ + switch(status) { + case 0x0: return "Operation succeed"; + case 0x1: return "No tag"; + case 0x2: return "Login succeed"; + case 0x3: return "Login fail"; + case 0x4: return "Read fail"; + case 0x5: return "Write fail"; + case 0x6: return "Unable to read after write"; + case 0xA: return "Collision occur"; + case 0xC: return "Load key fail"; + case 0xD: return "Not authenticate"; + case 0xE: return "Not a value block"; + default: return "unknown"; + } +} + +const char* SL018_tagtype_tostring(const uint8_t type) +{ + switch(type) { + case 0x1: return "Mifare 1k, 4 byte UID"; + case 0x2: return "Mifare 1k, 7 byte UID"; + case 0x3: return "Mifare Ultralight or NATG203, 7 byte UID"; + case 0x4: return "Mifare 4k, 4 byte UID"; + case 0x5: return "Mifare 4k, 7 byte UID"; + case 0x6: return "Mifare DesFire, 7 byte UID"; + default: return "unknown"; + } +} + +uint8_t SL018_tagtype_to_uidlen(const uint8_t type) +{ + switch(type) { + case 0x1: + case 0x4: return 4; + case 0x2: + case 0x3: + case 0x5: + case 0x6: return 7; + default: return 0; + } +} + +const uint8_t SL018_CMD_ComSelectCard[] = {1,0x01}; +const uint8_t SL018_CMD_ComRedLedOn[] = {2,0x40,1}; +const uint8_t SL018_CMD_ComRedLedOff[] = {2,0x40,0}; +const uint8_t SL018_CMD_ComGetFirmwareVersion[] = {1,0xF0}; +const uint8_t SL018_CMD_ComReset[] = {1,0xFF}; + +uint8_t twi_recv_buf[256]; +typedef struct __attribute__((__packed__)) +{ + uint8_t len; + uint8_t command; + uint8_t status; + uint8_t data[sizeof(twi_recv_buf)-3]; +} sl018_message_t; + +sl018_message_t* twi_recv_msg = (sl018_message_t *)&twi_recv_buf; + + +uint8_t sl018_cmd_raw(const uint8_t* twi_send_buf, bool wait_for_answer) +{ + uint8_t pos = 0; + + if (TWI_StartTransmission(SL018_TWI_ADDR | TWI_ADDRESS_WRITE,10) == TWI_ERROR_NoError) { + for(pos=0; pos<=twi_send_buf[0]; pos++) { + if( ! TWI_SendByte(twi_send_buf[pos])) { + TWI_StopTransmission(); + return 1; + } + } + TWI_StopTransmission(); + } else + return 1; + + if(!wait_for_answer) return 0; + + memset(twi_recv_buf, 0, sizeof(twi_recv_buf)); + _delay_ms(50); + + if (TWI_StartTransmission(SL018_TWI_ADDR | TWI_ADDRESS_READ,10) == TWI_ERROR_NoError) { + TWI_ReceiveByte(twi_recv_buf, 0); + for(pos=1; pos<=twi_recv_buf[0]; pos++) { + if (! TWI_ReceiveByte(&twi_recv_buf[pos], (pos == twi_recv_buf[0]) ? 1:0 ) ) { + TWI_StopTransmission(); + return 1; + } + } + TWI_StopTransmission(); + } else + return 1; + + return 0; +} + +uint8_t sl018_reset(FILE * stdio) +{ + if(sl018_cmd_raw(SL018_CMD_ComReset, 0)) { + fprintf(stdio, "I2C error\n\r"); + return 1; + } + return 0; +} + +uint8_t sl018_cmd(const uint8_t* twi_send_buf, FILE * stdio) +{ + if(sl018_cmd_raw(twi_send_buf, 1)) { + fprintf(stdio, "I2C error\n\r"); + return 1; + } else { + if(twi_recv_msg->len < 2) { + fprintf(stdio,"SL018 Cmd,Error: short message received\n\r"); + return 1; + } + if(twi_recv_msg->status) { + fprintf(stdio,"SL018 Cmd,Error: '%s','%s'\n\r",SL018_cmd_tostring(twi_recv_msg->command),SL018_status_tostring(twi_recv_msg->status)); + return 1; + } + sl018_message_t * twi_send_msg = (sl018_message_t *)twi_send_buf; + if(twi_send_msg->command != twi_recv_msg->command) { + fprintf(stdio,"SL018 Cmd,Error: mismatch of sent and received command code: %02X,%02X\n\r",twi_send_msg->command,twi_recv_msg->command); + } + } + return 0; +} + +void sl018_read_card_uid(uid_t * uid, FILE * stdio) +{ + uid->length=0; + uid->buffer=NULL; + fprintf(stdio, "CARD IN: "); + if(!sl018_cmd(SL018_CMD_ComSelectCard,stdio)) + { + uint8_t uid_len = twi_recv_msg->len - sizeof(twi_recv_msg->command) - sizeof(twi_recv_msg->status) - 1; + if(uid_len == 255 || uid_len > MAX_UID_LEN) { + fprintf(stdio," received UID length (%d) is to big for keystore \n\r", uid_len); + return; + } + uint8_t type = twi_recv_msg->data[uid_len]; + uint8_t expected_uid_len = SL018_tagtype_to_uidlen(type); + if(expected_uid_len != uid_len) { + fprintf(stdio," Invalid uid length (%d) for tag type: %s\n\r", uid_len, SL018_tagtype_tostring(type)); + return; + } + + for (uint8_t pos=0; posdata[uid_len-pos-1]); + fprintf(stdio, ", %s\n\r", SL018_tagtype_tostring(type)); + + if (0 < type && type < 7) { + uid->length= uid_len; + uid->buffer=twi_recv_msg->data; + } else { + fprintf(stdio,"Ignoring unknown card type %02x\n\r",type); + } + } +} + +void sl018_set_led(uint8_t on,FILE * stdio) +{ + if(on) + sl018_cmd(SL018_CMD_ComRedLedOn,stdio); + else + sl018_cmd(SL018_CMD_ComRedLedOff,stdio); +} + +uint8_t sl018_check_for_new_card(FILE * stdio) +{ + static uint8_t card_status = 0; + if(CARD_PRESENT != card_status) { + card_status = CARD_PRESENT; + if(card_status) + return 1; + } + return 0; +} + +unsigned char * sl018_get_firmware_version(FILE * stdio) +{ + if(!sl018_cmd(SL018_CMD_ComGetFirmwareVersion,stdio)) { + twi_recv_msg->data[sizeof(twi_recv_msg->data) - 1] = 0; + return twi_recv_msg->data; + } else { + return NULL; + } +} diff --git a/usb-i2c-sl018/sl018.h b/usb-i2c-sl018/sl018.h new file mode 100644 index 0000000..a82bcc0 --- /dev/null +++ b/usb-i2c-sl018/sl018.h @@ -0,0 +1,40 @@ +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * Othmar Gsenger + * + * This file is part of spreadspace avr utils. + * + * spreadspace avr utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * spreadspace avr utils is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with spreadspace avr utils. If not, see . + */ + +#ifndef R3TUER_sl018_h_INCLUDED +#define R3TUER_sl018_h_INCLUDED +#include + +typedef struct { + uint8_t length; + unsigned char * buffer; + } uid_t; + + +void sl018_set_led(uint8_t on,FILE * stdio); +uint8_t sl018_check_for_new_card(FILE * stdio); +void sl018_read_card_uid(uid_t * uid, FILE * stdio); +uint8_t sl018_reset(FILE * stdio); +unsigned char * sl018_get_firmware_version(FILE * stdio); + +#endif diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c index 92dc97d..7beccb0 100644 --- a/usb-i2c-sl018/tuer-rfid.c +++ b/usb-i2c-sl018/tuer-rfid.c @@ -35,6 +35,7 @@ #include "heartbeat.h" #include "stepper.h" #include "ledmatrix.h" +#include "sl018.h" #include "LUFA/Drivers/Peripheral/TWI.h" #include "LUFA/Drivers/Peripheral/Serial.h" @@ -45,98 +46,6 @@ typedef uint8_t keyslot_t[8]; keyslot_t EEMEM keystore[EEPROM_SIZE/sizeof(keyslot_t)]; - -const char* SL018_cmd_tostring(const uint8_t cmd) -{ - switch(cmd) { - case 0x01: return "Select Mifare card"; - case 0x02: return "Login to a sector"; - case 0x03: return "Read a data block"; - case 0x04: return "Write a data block"; - case 0x05: return "Read a value block"; - case 0x06: return "Initialize a value block"; - case 0x07: return "Write master key"; - case 0x08: return "Increment value"; - case 0x09: return "Decrement value"; - case 0x0A: return "Copy value"; - case 0x10: return "Read a data page"; - case 0x11: return "Write a data page"; - case 0x40: return "Control the red led"; - case 0xF0: return "Get firmware version"; - case 0xFF: return "Reset"; - default: return "unknown"; - } -} - -const char* SL018_status_tostring(const uint8_t status) -{ - switch(status) { - case 0x0: return "Operation succeed"; - case 0x1: return "No tag"; - case 0x2: return "Login succeed"; - case 0x3: return "Login fail"; - case 0x4: return "Read fail"; - case 0x5: return "Write fail"; - case 0x6: return "Unable to read after write"; - case 0xA: return "Collision occur"; - case 0xC: return "Load key fail"; - case 0xD: return "Not authenticate"; - case 0xE: return "Not a value block"; - default: return "unknown"; - } -} - -const char* SL018_tagtype_tostring(const uint8_t type) -{ - switch(type) { - case 0x1: return "Mifare 1k, 4 byte UID"; - case 0x2: return "Mifare 1k, 7 byte UID"; - case 0x3: return "Mifare Ultralight or NATG203, 7 byte UID"; - case 0x4: return "Mifare 4k, 4 byte UID"; - case 0x5: return "Mifare 4k, 7 byte UID"; - case 0x6: return "Mifare DesFire, 7 byte UID"; - default: return "unknown"; - } -} - -uint8_t SL018_tagtype_to_uidlen(const uint8_t type) -{ - switch(type) { - case 0x1: - case 0x4: return 4; - case 0x2: - case 0x3: - case 0x5: - case 0x6: return 7; - default: return 0; - } -} - -const uint8_t SL018_CMD_ComSelectCard[] = {1,0x01}; -const uint8_t SL018_CMD_ComRedLedOn[] = {2,0x40,1}; -const uint8_t SL018_CMD_ComRedLedOff[] = {2,0x40,0}; -const uint8_t SL018_CMD_ComGetFirmwareVersion[] = {1,0xF0}; -const uint8_t SL018_CMD_ComReset[] = {1,0xFF}; - -uint8_t twi_recv_buf[256]; -typedef struct __attribute__((__packed__)) -{ - uint8_t len; - uint8_t command; - uint8_t status; - uint8_t data[sizeof(twi_recv_buf)-3]; -} sl018_message_t; - -sl018_message_t* twi_recv_msg = (sl018_message_t *)&twi_recv_buf; - -#define SL018_TWI_ADDR 0xA0 -#define SL018_TAG_STA_PIN PIND -#define SL018_TAG_STA_BIT 7 -#define CARD_PRESENT (!((SL018_TAG_STA_PIN >> SL018_TAG_STA_BIT) & 1)) -uint8_t card_status = 0; - - - FILE usb_stream; FILE serial_stream; FILE * stdio = &serial_stream; @@ -207,73 +116,6 @@ int16_t stdio_bytes_received(void) return (int16_t)Serial_IsCharReceived(); } -uint8_t sl018_cmd_raw(const uint8_t* twi_send_buf, bool wait_for_answer) -{ - uint8_t pos = 0; - - if (TWI_StartTransmission(SL018_TWI_ADDR | TWI_ADDRESS_WRITE,10) == TWI_ERROR_NoError) { - for(pos=0; pos<=twi_send_buf[0]; pos++) { - if( ! TWI_SendByte(twi_send_buf[pos])) { - TWI_StopTransmission(); - return 1; - } - } - TWI_StopTransmission(); - } else - return 1; - - if(!wait_for_answer) return 0; - - memset(twi_recv_buf, 0, sizeof(twi_recv_buf)); - _delay_ms(50); - - if (TWI_StartTransmission(SL018_TWI_ADDR | TWI_ADDRESS_READ,10) == TWI_ERROR_NoError) { - TWI_ReceiveByte(twi_recv_buf, 0); - for(pos=1; pos<=twi_recv_buf[0]; pos++) { - if (! TWI_ReceiveByte(&twi_recv_buf[pos], (pos == twi_recv_buf[0]) ? 1:0 ) ) { - TWI_StopTransmission(); - return 1; - } - } - TWI_StopTransmission(); - } else - return 1; - - return 0; -} - -uint8_t sl018_reset(void) -{ - if(sl018_cmd_raw(SL018_CMD_ComReset, 0)) { - fprintf(stdio, "I2C error\n\r"); - return 1; - } - return 0; -} - -uint8_t sl018_cmd(const uint8_t* twi_send_buf) -{ - if(sl018_cmd_raw(twi_send_buf, 1)) { - fprintf(stdio, "I2C error\n\r"); - return 1; - } else { - if(twi_recv_msg->len < 2) { - fprintf(stdio,"SL018 Cmd,Error: short message received\n\r"); - return 1; - } - if(twi_recv_msg->status) { - fprintf(stdio,"SL018 Cmd,Error: '%s','%s'\n\r",SL018_cmd_tostring(twi_recv_msg->command),SL018_status_tostring(twi_recv_msg->status)); - return 1; - } - sl018_message_t * twi_send_msg = (sl018_message_t *)twi_send_buf; - if(twi_send_msg->command != twi_recv_msg->command) { - fprintf(stdio,"SL018 Cmd,Error: mismatch of sent and received command code: %02X,%02X\n\r",twi_send_msg->command,twi_recv_msg->command); - } - } - return 0; -} - - void flash_keystore_from_stdio(void) { @@ -322,14 +164,15 @@ void handle_stdio(uint8_t cmd) reset2bootloader(); break; case 'R': - if(!sl018_reset()) + if(!sl018_reset(stdio)) fprintf(stdio, "ok\n\r"); break; case 'f': //get cardreader firmware version - if(!sl018_cmd(SL018_CMD_ComGetFirmwareVersion)) { - twi_recv_msg->data[sizeof(twi_recv_msg->data) - 1] = 0; - fprintf(stdio, "%s\n\r",twi_recv_msg->data); - } + do { + unsigned char * firmware_str = sl018_get_firmware_version(stdio); + if(firmware_str) + fprintf(stdio, "%s\n\r",firmware_str); + } while(0); break; case 'e': //flash eeprom flash_keystore_from_stdio(); @@ -402,42 +245,21 @@ bool check_card(const uint8_t * uid, uint8_t uid_len) void handle_card(void) { - fprintf(stdio, "CARD IN: "); - if(!sl018_cmd(SL018_CMD_ComSelectCard)) + uid_t uid; + sl018_read_card_uid(&uid,stdio); + if (uid.length) { - uint8_t uid_len = twi_recv_msg->len - sizeof(twi_recv_msg->command) - sizeof(twi_recv_msg->status) - 1; - if(uid_len == 255 || uid_len > sizeof(keyslot_t) - 1) { - fprintf(stdio," received UID length (%d) is to big for keystore \n\r", uid_len); - return; - } - uint8_t type = twi_recv_msg->data[uid_len]; - uint8_t expected_uid_len = SL018_tagtype_to_uidlen(type); - if(expected_uid_len != uid_len) { - fprintf(stdio," Invalid uid length (%d) for tag type: %s\n\r", uid_len, SL018_tagtype_tostring(type)); - return; - } - - for (uint8_t pos=0; posdata[uid_len-pos-1]); - fprintf(stdio, ", %s\n\r", SL018_tagtype_tostring(type)); - - if (0 < type && type < 7) { - if(check_card(twi_recv_msg->data,uid_len)) { - sl018_cmd(SL018_CMD_ComRedLedOn); - fprintf(stdio,"Card allowed - opening/closing door\n\r"); // TODO: open/close door! - _delay_ms(255); - sl018_cmd(SL018_CMD_ComRedLedOff); - } else { - fprintf(stdio,"Card not found in Database\n\r"); - } - } else { - fprintf(stdio,"Ignoring unknown card type %02x\n\r",type); - } - } + if(check_card(uid.buffer,uid.length)) { + sl018_set_led(1,stdio); + _delay_ms(255); + fprintf(stdio,"Card allowed - opening/closing door\n\r"); // TODO: open/close door! + sl018_set_led(0,stdio); + } else { + fprintf(stdio,"Card not found in Database\n\r"); + } + } } - - int main(void) { MCUSR &= ~(1 << WDRF); @@ -457,7 +279,7 @@ int main(void) init_stepper(); init_ledmatrix(); - sl018_reset(); + sl018_reset(stdio); for(;;) { CDC_Device_USBTask(&VirtualSerial_CDC_Interface); @@ -467,12 +289,8 @@ int main(void) if(bytes_received > 0) handle_stdio(fgetc(stdio)); - if(CARD_PRESENT != card_status) { - card_status = CARD_PRESENT; - if(card_status) - handle_card(); - } - + if (sl018_check_for_new_card(stdio)) + handle_card(); handle_heartbeat(); } } -- cgit v1.2.3