From dabbf161337e31a3f948ad721d401e86237c137a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 23 Sep 2013 02:28:07 +0000 Subject: fixed \n\r to \r\n git-svn-id: https://svn.spreadspace.org/avr/trunk@227 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- tuer-rfid/ajar.c | 2 +- tuer-rfid/keystore.c | 6 +++--- tuer-rfid/sl018.c | 18 +++++++++--------- tuer-rfid/statemachine.c | 8 ++++---- tuer-rfid/tuer-rfid.c | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tuer-rfid/ajar.c b/tuer-rfid/ajar.c index 06ca436..08a698a 100644 --- a/tuer-rfid/ajar.c +++ b/tuer-rfid/ajar.c @@ -70,7 +70,7 @@ 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)); + printf("Info(ajar): door is now %s\r\n", ajar_to_string(state)); last_state = state; } diff --git a/tuer-rfid/keystore.c b/tuer-rfid/keystore.c index c03dc77..1a23996 100644 --- a/tuer-rfid/keystore.c +++ b/tuer-rfid/keystore.c @@ -38,7 +38,7 @@ void keystore_flash_from_stdio(void) { keyslot_t ks; uint8_t byte_pos=0; - printf("Info(keystore): flashing\n\r"); + printf("Info(keystore): flashing\r\n"); fflush(stdout); for(uint8_t ks_pos=0;ks_poslen < 2) { - printf("Error(SL018): short message received\n\r"); + printf("Error(SL018): short message received\r\n"); return 1; } if(twi_recv_msg->status) { - printf("Error(SL018): '%s','%s'\n\r",SL018_cmd_tostring(twi_recv_msg->command),SL018_status_tostring(twi_recv_msg->status)); + printf("Error(SL018): '%s','%s'\r\n",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) { - printf("Error(SL018): mismatch of sent and received command code: %02X,%02X\n\r",twi_send_msg->command,twi_recv_msg->command); + printf("Error(SL018): mismatch of sent and received command code: %02X,%02X\r\n",twi_send_msg->command,twi_recv_msg->command); } } return 0; @@ -192,25 +192,25 @@ void sl018_read_card_uid(uid_t * uid) { 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); + printf(" received UID length (%d) is to big for keystore \r\n", 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)); + printf(" Invalid uid length (%d) for tag type: %s\r\n", uid_len, SL018_tagtype_tostring(type)); return; } for (uint8_t pos=0; posdata[uid_len-pos-1]); - printf( ", %s\n\r", SL018_tagtype_tostring(type)); + printf( ", %s\r\n", 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); + printf("Info(card): Ignoring unknown card type %02x\r\n",type); } } } diff --git a/tuer-rfid/statemachine.c b/tuer-rfid/statemachine.c index b83fbec..4850610 100644 --- a/tuer-rfid/statemachine.c +++ b/tuer-rfid/statemachine.c @@ -52,7 +52,7 @@ void change_state(state_t new_state) { if (new_state == state) return; - printf("State: %s\n\r", state_to_string(new_state)); + printf("State: %s\r\n", state_to_string(new_state)); switch(new_state) { case reset: break; @@ -137,12 +137,12 @@ void statemachine_task_event(void) case move_timeout: return change_state(state==opening?timeout_after_open:timeout_after_close); default: - printf("Error(state): event %s not allowed in state %s\n\r", event_to_string(event), state_to_string(state)); + printf("Error(state): event %s not allowed in state %s\r\n", event_to_string(event), state_to_string(state)); return; } case reset: case error: - printf("Error(state): Not accepting commands in state %s\n\r", state_to_string(state)); + printf("Error(state): Not accepting commands in state %s\r\n", state_to_string(state)); break; // Not accepting commands case manual_movement: case timeout_after_open: @@ -166,7 +166,7 @@ void statemachine_task_event(void) case open_fin: case close_fin: case move_timeout: - printf("Error(state): event %s not allowed in state %s\n\r", event_to_string(event), state_to_string(state)); + printf("Error(state): event %s not allowed in state %s\r\n", event_to_string(event), state_to_string(state)); return; } } diff --git a/tuer-rfid/tuer-rfid.c b/tuer-rfid/tuer-rfid.c index 4fbe5de..32cf5c7 100644 --- a/tuer-rfid/tuer-rfid.c +++ b/tuer-rfid/tuer-rfid.c @@ -53,12 +53,12 @@ void handle_cmd(uint8_t cmd) break; case 'R': if(!sl018_reset()) - printf("ok\n\r"); + printf("ok\r\n"); break; case 'f': { unsigned char * firmware_str = sl018_get_firmware_version(); if(firmware_str) - printf("%s\n\r",firmware_str); + printf("%s\r\n",firmware_str); break; } @@ -78,7 +78,7 @@ void handle_cmd(uint8_t cmd) eventqueue_push(cmd_toggle); break; case 's': - printf("Status: %s, %s, %s\n\r", limits_to_string(limits_get()), statemachine_get_state_as_string(), ajar_to_string(ajar_get())); + printf("Status: %s, %s, %s\r\n", limits_to_string(limits_get()), statemachine_get_state_as_string(), ajar_to_string(ajar_get())); break; /* case '0': ledmatrix_set(off); break; */ /* case '1': ledmatrix_set(red); break; */ @@ -89,7 +89,7 @@ void handle_cmd(uint8_t cmd) /* case '6': ledmatrix_set(green_blink); break; */ /* case '7': ledmatrix_set(rg_moving); break; */ /* case '8': ledmatrix_set(rg_blink); break; */ - default: printf("Error(cmd): unknown command %02X '%c'\n\r", cmd, cmd); return; + default: printf("Error(cmd): unknown command %02X '%c'\r\n", cmd, cmd); return; } } @@ -105,10 +105,10 @@ void handle_card(void) printf(") "); if(keystore_check_card(uid.buffer,uid.length)) { - printf("found - opening/closing door\n\r"); + printf("found - opening/closing door\r\n"); eventqueue_push(card); } else { - printf("not found - ignoring\n\r"); + printf("not found - ignoring\r\n"); } } } -- cgit v1.2.3