diff options
| author | Tomek Dubrownik <t.dubrownik@gmail.com> | 2012-01-05 18:33:33 +0100 |
|---|---|---|
| committer | Tomek Dubrownik <t.dubrownik@gmail.com> | 2012-01-05 18:33:33 +0100 |
| commit | e3012705f7c598aa53d1700488ccecd71c6180d1 (patch) | |
| tree | 254ea2572e4717700096970f60357179b7d3af0a | |
| parent | 8747af607a1a82257004b99a8e95f9cc2bae9fac (diff) | |
| parent | 80ae9d8148c238023782e9f0a23608c6b5e33671 (diff) | |
| download | doorman-e3012705f7c598aa53d1700488ccecd71c6180d1.tar.gz doorman-e3012705f7c598aa53d1700488ccecd71c6180d1.tar.bz2 doorman-e3012705f7c598aa53d1700488ccecd71c6180d1.tar.xz doorman-e3012705f7c598aa53d1700488ccecd71c6180d1.zip | |
Merge branch 'minefield' of github.com:tdubrownik/doorman into minefield
| -rw-r--r-- | arduino/arduino.pde | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arduino/arduino.pde b/arduino/arduino.pde index 35cdbf3..c11e403 100644 --- a/arduino/arduino.pde +++ b/arduino/arduino.pde @@ -169,7 +169,7 @@ void loop(){ } if (pc_send_flag){ pc_send_flag=false; - pc_print('a',fid,hash); + pc_print('s',fid,hash); } pin=0; rfid=0; @@ -430,8 +430,7 @@ void pc_print(char code,unsigned int id,unsigned char * data) { Serial.print(buf); pc_print_hash(data); snprintf(buf,12,",%08lx\n",token); - Serial.print(buf); - Serial.println("Printing done"); + Serial.print(buf); } /** @@ -710,4 +709,4 @@ boolean keypad_pin_get(unsigned long * p_pin){ void keypad_off(void) { keypad.print("XX"); keypad_state=SEND; -}
+} |