diff options
-rw-r--r-- | tuer-rfid/ajar.c | 6 | ||||
-rw-r--r-- | tuer-rfid/heartbeat.c | 2 | ||||
-rw-r--r-- | tuer-rfid/keystore.c | 3 | ||||
-rw-r--r-- | tuer-rfid/ledmatrix.c | 4 | ||||
-rw-r--r-- | tuer-rfid/sl018.c | 56 | ||||
-rw-r--r-- | tuer-rfid/stepper.c | 2 | ||||
-rw-r--r-- | tuer-rfid/tuer-rfid.c | 24 | ||||
-rw-r--r-- | tuer-rfid/update-keys.c | 4 |
8 files changed, 50 insertions, 51 deletions
diff --git a/tuer-rfid/ajar.c b/tuer-rfid/ajar.c index dc7dc01..18bf25b 100644 --- a/tuer-rfid/ajar.c +++ b/tuer-rfid/ajar.c @@ -53,8 +53,8 @@ ajar_t ajar_get(void) last_state = state; lp_cnt = 0; } - - if(last_state) + + if(last_state) return ajar; return shut; } @@ -71,6 +71,6 @@ void ajar_task(void) ajar_t state = ajar_get(); if(last_state != state) printf("Info(ajar): door is now %s\n\r", ajar_to_string(state)); - + last_state = state; } diff --git a/tuer-rfid/heartbeat.c b/tuer-rfid/heartbeat.c index 7700706..95a3eae 100644 --- a/tuer-rfid/heartbeat.c +++ b/tuer-rfid/heartbeat.c @@ -29,7 +29,7 @@ #define HEARTBEAT_DURATION 10 // *10 ms, duration of heartbeat pulse #define HEARTBEAT_DELAY 200 // *10 ms, 1/heartbeat-frequency -uint8_t heartbeat_cnt = 0; +uint8_t heartbeat_cnt = 0; uint8_t heartbeat_flag; #define FASTBEAT_PORT PORTD diff --git a/tuer-rfid/keystore.c b/tuer-rfid/keystore.c index 645f25a..dfe7438 100644 --- a/tuer-rfid/keystore.c +++ b/tuer-rfid/keystore.c @@ -1,4 +1,4 @@ -/* +g/* * spreadspace avr utils * * @@ -108,4 +108,3 @@ uint8_t keystore_check_card(const uint8_t * uid, uint8_t uid_len) } return valid; } - diff --git a/tuer-rfid/ledmatrix.c b/tuer-rfid/ledmatrix.c index c319b6d..0496c31 100644 --- a/tuer-rfid/ledmatrix.c +++ b/tuer-rfid/ledmatrix.c @@ -54,7 +54,7 @@ void ledmatrix_stop_timer(void) } void ledmatrix_off_init(void) -{ +{ LEDMATRIX_PORT = LEDMATRIX_MASK; LEDMATRIX_PORT |= 1<<LEDMATRIX_RED | 1<<LEDMATRIX_GREEN; } @@ -184,7 +184,7 @@ void ledmatrix_init(void) void ledmatrix_set(ledmatrix_mode_t m) { - if(m == mode) + if(m == mode) return; mode = m; diff --git a/tuer-rfid/sl018.c b/tuer-rfid/sl018.c index 9916e36..a94e704 100644 --- a/tuer-rfid/sl018.c +++ b/tuer-rfid/sl018.c @@ -184,37 +184,37 @@ uint8_t sl018_cmd(const uint8_t* twi_send_buf) } void sl018_read_card_uid(uid_t * uid) -{ +{ uid->length=0; uid->buffer=NULL; - printf( "Info(card): "); - if(!sl018_cmd(SL018_CMD_ComSelectCard)) - { - 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) { - printf(" 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) { - printf(" Invalid uid length (%d) for tag type: %s\n\r", uid_len, SL018_tagtype_tostring(type)); - return; - } - - for (uint8_t pos=0; pos<uid_len; pos++) - printf("%02X",twi_recv_msg->data[uid_len-pos-1]); - printf( ", %s\n\r", SL018_tagtype_tostring(type)); - - if (0 < type && type < 7) { + printf( "Info(card): "); + if(!sl018_cmd(SL018_CMD_ComSelectCard)) + { + 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) { + printf(" 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) { + printf(" Invalid uid length (%d) for tag type: %s\n\r", uid_len, SL018_tagtype_tostring(type)); + return; + } + + for (uint8_t pos=0; pos<uid_len; pos++) + printf("%02X",twi_recv_msg->data[uid_len-pos-1]); + printf( ", %s\n\r", SL018_tagtype_tostring(type)); + + if (0 < type && type < 7) { uid->length= uid_len; - uid->buffer=twi_recv_msg->data; - } else { - printf("Info(card): Ignoring unknown card type %02x\n\r",type); - } - } -} - + uid->buffer=twi_recv_msg->data; + } else { + printf("Info(card): Ignoring unknown card type %02x\n\r",type); + } + } +} + void sl018_set_led(uint8_t on) { if(on) diff --git a/tuer-rfid/stepper.c b/tuer-rfid/stepper.c index d26815a..52e902c 100644 --- a/tuer-rfid/stepper.c +++ b/tuer-rfid/stepper.c @@ -28,7 +28,7 @@ #include "limits.h" #include "eventqueue.h" -uint8_t step_table [] = +uint8_t step_table [] = { 10, // 1010 9, // 1001 diff --git a/tuer-rfid/tuer-rfid.c b/tuer-rfid/tuer-rfid.c index f3cf21b..484659e 100644 --- a/tuer-rfid/tuer-rfid.c +++ b/tuer-rfid/tuer-rfid.c @@ -46,12 +46,12 @@ #include "ajar.h" void handle_cmd(uint8_t cmd) -{ +{ switch(cmd) { - case 'r': - reset2bootloader(); + case 'r': + reset2bootloader(); break; - case 'R': + case 'R': if(!sl018_reset()) printf("ok\n\r"); break; @@ -68,16 +68,16 @@ void handle_cmd(uint8_t cmd) case 'd': //dump eeprom - this breaks security! keystore_dump_to_stdio(); break; - case 'o': + case 'o': eventqueue_push(cmd_open); break; - case 'c': + case 'c': eventqueue_push(cmd_close); break; - case 't': + case 't': eventqueue_push(cmd_toggle); break; - case 's': + case 's': printf("Status: %s, %s, %s\n\r", limits_to_string(limits_get()), statemachine_get_state_as_string(), ajar_to_string(ajar_get())); break; /* case '0': ledmatrix_set(off); break; */ @@ -100,11 +100,11 @@ void handle_card(void) if (uid.length) { printf("Info(card): card("); - for (uint8_t pos=0; pos<uid.length; pos++) - printf("%02X",uid.buffer[uid.length-pos-1]); + for (uint8_t pos=0; pos<uid.length; pos++) + printf("%02X",uid.buffer[uid.length-pos-1]); printf(") "); - if(keystore_check_card(uid.buffer,uid.length)) { + if(keystore_check_card(uid.buffer,uid.length)) { printf("found - opening/closing door\n\r"); eventqueue_push(card); } else { @@ -130,7 +130,7 @@ int main(void) limits_init(); manual_init(); ajar_init(); - sei(); + sei(); sl018_reset(); diff --git a/tuer-rfid/update-keys.c b/tuer-rfid/update-keys.c index d4dfd06..90236a5 100644 --- a/tuer-rfid/update-keys.c +++ b/tuer-rfid/update-keys.c @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) fprintf(stderr, "Usage: update-keys <device>\n"); return -1; } - + FILE* dev; dev = fopen(argv[1], "r+"); if(!dev) { @@ -121,7 +121,7 @@ int main(int argc, char* argv[]) } } printf("\nread %d keys from STDIN - filling rest of keystore with invalid keys\n", key_num); - + int i; for(i=0; i<=sizeof(keyslot_t)-1; ++i) key[i] = 0xFF; for(i=key_num; i < EEPROM_SIZE/sizeof(keyslot_t); ++i) { |