diff options
| author | Tomek Dubrownik <t.dubrownik@gmail.com> | 2012-01-06 22:39:51 +0100 |
|---|---|---|
| committer | Tomek Dubrownik <t.dubrownik@gmail.com> | 2012-01-06 22:39:51 +0100 |
| commit | 0349e3c1c91b25bbd6e70495207241cc61204026 (patch) | |
| tree | f4e8fb3f5f4890f09fcbef9bf5dca73f989fe46b | |
| parent | dacfb779b08b2093bc9a3ebcd85b60685b117fab (diff) | |
| parent | 6d2b9d3dc6f52393f337f107e67d334f810b764c (diff) | |
| download | doorman-0349e3c1c91b25bbd6e70495207241cc61204026.tar.gz doorman-0349e3c1c91b25bbd6e70495207241cc61204026.tar.bz2 doorman-0349e3c1c91b25bbd6e70495207241cc61204026.tar.xz doorman-0349e3c1c91b25bbd6e70495207241cc61204026.zip | |
Merge branch 'minefield' of github.com:tdubrownik/doorman into minefield
| -rw-r--r-- | arduino/arduino.pde | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arduino/arduino.pde b/arduino/arduino.pde index c11e403..00f5e04 100644 --- a/arduino/arduino.pde +++ b/arduino/arduino.pde @@ -147,6 +147,10 @@ void loop(){ #endif //DEBUG //react unsigned int fid = emem_find_data(hash); + if (pc_send_flag){ + pc_send_flag=false + pc_print('s',fid,hash); + } if(fid!=EMEM_INV_ADR) { //"success" beep keypad_pin_ok(); @@ -167,10 +171,7 @@ void loop(){ Serial.println("Wrong rfid or pin"); #endif //DEBUG } - if (pc_send_flag){ - pc_send_flag=false; - pc_print('s',fid,hash); - } + pin=0; rfid=0; state=STATE_IDLE; @@ -467,7 +468,12 @@ void pc_comm(){ //$a,0000,dfdd69691a7af8c141cef1ce69b5196b327f71f40b54da3c4e673283dcebd9b7,386855c3 code=pc_bytes[1]; - id=pc_bytes[3]<<24+pc_bytes[4]<<16+pc_bytes[5]<<8+pc_bytes[6]; + char ids[5]; + for (int ii=0;ii<4;ii++){ + ids[ii]=pc_bytes[ii+3]; + } + ids[4]='\0'; + sscanf(ids,"%d",&id); for (int ii=0;ii<32;ii++){ char hex[3]; hex[0]= pc_bytes[ii*2+8]; |