hswaw
/
doorman
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'minefield' of github.com:tdubrownik/doorman into minefield

serial
Tomek Dubrownik 2012-01-05 18:33:33 +01:00
parent 8747af607a 80ae9d8148
commit e3012705f7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arduino/arduino.pde
View File

@ -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;
}
}