Skip to content
Snippets Groups Projects
Commit f9f7a7a3 authored by da1l6's avatar da1l6
Browse files

CardReader: Print human readable error message in case of Card ATR error.

CardReader: Change standby message.
parent dafa7f0f
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ volatile uint16_t host_timeout = HOST_TIMEOUT; ...@@ -28,7 +28,7 @@ volatile uint16_t host_timeout = HOST_TIMEOUT;
volatile uint8_t host_ping = 1; volatile uint8_t host_ping = 1;
volatile uint8_t host_dead = 0; volatile uint8_t host_dead = 0;
#define DISPLAY_RESET_TIMEOUT 400 /* 400*10 = 4 sec */ #define DISPLAY_RESET_TIMEOUT 1000 /* 1000*10 = 4 sec */
volatile uint16_t display_reset_timeout = DISPLAY_RESET_TIMEOUT; volatile uint16_t display_reset_timeout = DISPLAY_RESET_TIMEOUT;
volatile uint8_t display_reset = 1; volatile uint8_t display_reset = 1;
...@@ -209,7 +209,7 @@ void display_card_status(void){ ...@@ -209,7 +209,7 @@ void display_card_status(void){
return; return;
} }
lcd_write_string_sz_P(PSTR("PortalCardReader")); lcd_write_string_sz_P(PSTR("Warpzone Portal"));
lcd_set_pos(0,1); lcd_set_pos(0,1);
switch (card_status){ switch (card_status){
case CARD_STATUS_REMOVED: case CARD_STATUS_REMOVED:
...@@ -222,9 +222,17 @@ void display_card_status(void){ ...@@ -222,9 +222,17 @@ void display_card_status(void){
lcd_write_string_sz_P(PSTR("Card Ready")); lcd_write_string_sz_P(PSTR("Card Ready"));
break; break;
case CARD_STATUS_ERROR: case CARD_STATUS_ERROR:
lcd_write_string_sz_P(PSTR("Card Error 0x")); // lcd_write_string_sz_P(PSTR("Card Error 0x"));
lcd_write_byte_hex(card_atr_error); // lcd_write_byte_hex(card_atr_error);
lcd_write_char(' '); // lcd_write_char(' ');
switch(card_atr_error){
case ERR_ATR_TIMEOUT: lcd_write_string_sz_P(PSTR("Card Mute")); break;
case ERR_TOO_MANY_ATR_INTERFACE_BYTES: lcd_write_string_sz_P(PSTR("ATR too long")); break;
case ERR_ATR_CHECKSUM_FAIL: lcd_write_string_sz_P(PSTR("ATR chksum fail")); break;
case ERR_PROTOCOL_NOT_SUPPORTED: lcd_write_string_sz_P(PSTR("Card unspported")); break;
case ERR_ATR_CARD_REMOVED: lcd_write_string_sz_P(PSTR("Card removed")); break;
default: lcd_write_string_sz_P(PSTR("Unknown error ")); lcd_write_byte_hex(card_atr_error); break;
}
break; break;
} }
// lcd_write_char('C'); // lcd_write_char('C');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment