add em4x05 config printout

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 6208e63caaca604ed0d5882af69d279f52586481..662629f067c5d0e105b53f3e55a60d8cdaeefe6c 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -812,26 +812,84 @@ int CmdEM4x05WriteWord(const char *Cmd) {
        return result;
 }
 
+void printEM4x05config(uint32_t wordData) {
+       uint16_t datarate = (((wordData & 0x3F)+1)*2);
+       uint8_t encoder = ((wordData >> 6) & 0xF);
+       char enc[14];
+       memset(enc,0,sizeof(enc));
+
+       uint8_t PSKcf = (wordData >> 10) & 0x3;
+       char cf[10];
+       memset(cf,0,sizeof(cf));
+       uint8_t delay = (wordData >> 12) & 0x3;
+       char cdelay[33];
+       memset(cdelay,0,sizeof(cdelay));
+       uint8_t LWR = (wordData >> 14) & 0xF; //last word read
+
+       switch (encoder) {
+               case 0: snprintf(enc,sizeof(enc),"NRZ"); break;
+               case 1: snprintf(enc,sizeof(enc),"Manchester"); break;
+               case 2: snprintf(enc,sizeof(enc),"Biphase"); break;
+               case 3: snprintf(enc,sizeof(enc),"Miller"); break;
+               case 4: snprintf(enc,sizeof(enc),"PSK1"); break;
+               case 5: snprintf(enc,sizeof(enc),"PSK2"); break;
+               case 6: snprintf(enc,sizeof(enc),"PSK3"); break;
+               case 7: snprintf(enc,sizeof(enc),"Unknown"); break;
+               case 8: snprintf(enc,sizeof(enc),"FSK1"); break;
+               case 9: snprintf(enc,sizeof(enc),"FSK2"); break;
+               default: snprintf(enc,sizeof(enc),"Unknown"); break;
+       }
+
+       switch (PSKcf) {
+               case 0: snprintf(cf,sizeof(cf),"RF/2"); break;
+               case 1: snprintf(cf,sizeof(cf),"RF/8"); break;
+               case 2: snprintf(cf,sizeof(cf),"RF/4"); break;
+               case 3: snprintf(cf,sizeof(cf),"unknown"); break;
+       }
+
+       switch (delay) {
+               case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+               case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;
+               case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;
+               case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;
+       }
+       PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);
+       PrintAndLog("Config Breakdown:", wordData);
+       PrintAndLog(" Data Rate:  %02X | RF/%u", wordData & 0x3F, datarate);
+       PrintAndLog("   Encoder:   %u | %s", encoder, enc);
+       PrintAndLog("    PSK CF:   %u | %s", PSKcf, cf);
+       PrintAndLog("     Delay:   %u | %s", delay, cdelay);
+       PrintAndLog(" LastWordR:  %02u | Address of last default word read", LWR);
+       PrintAndLog(" ReadLogin:   %u | Read Login is %s", (wordData & 0x40000)>>18, (wordData & 0x40000) ? "Required" : "Not Required");       
+       PrintAndLog("   ReadHKL:   %u | Read Housekeeping Words Login is %s", (wordData & 0x80000)>>19, (wordData & 0x80000) ? "Required" : "Not Required");    
+       PrintAndLog("WriteLogin:   %u | Write Login is %s", (wordData & 0x100000)>>20, (wordData & 0x100000) ? "Required" : "Not Required");    
+       PrintAndLog("  WriteHKL:   %u | Write Housekeeping Words Login is %s", (wordData & 0x200000)>>21, (wordData & 0x200000) ? "Required" : "Not Required"); 
+       PrintAndLog("    R.A.W.:   %u | Read After Write is %s", (wordData & 0x400000)>>22, (wordData & 0x400000) ? "On" : "Off");
+       PrintAndLog("   Disable:   %u | Disable Command is %s", (wordData & 0x800000)>>23, (wordData & 0x800000) ? "Accepted" : "Not Accepted");
+       PrintAndLog("    R.T.F.:   %u | Reader Talk First is %s", (wordData & 0x1000000)>>24, (wordData & 0x1000000) ? "Enabled" : "Disabled");
+       PrintAndLog("    Pigeon:   %u | Pigeon Mode is %s\n", (wordData & 0x4000000)>>26, (wordData & 0x4000000) ? "Enabled" : "Disabled");
+}
+
 void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {
        switch (chipType) {
-               case 9: PrintAndLog("\nChip Type:   %u | EM4305", chipType); break;
-               case 4: PrintAndLog("Chip Type:   %u | Unknown", chipType); break;
-               case 2: PrintAndLog("Chip Type:   %u | EM4469", chipType); break;
+               case 9: PrintAndLog("\n Chip Type:   %u | EM4305", chipType); break;
+               case 4: PrintAndLog(" Chip Type:   %u | Unknown", chipType); break;
+               case 2: PrintAndLog(" Chip Type:   %u | EM4469", chipType); break;
                //add more here when known
-               default: PrintAndLog("Chip Type:   %u Unknown", chipType); break;
+               default: PrintAndLog(" Chip Type:   %u Unknown", chipType); break;
        }
 
        switch (cap) {
-               case 3: PrintAndLog(" Cap Type:   %u | 330pF",cap); break;
-               case 2: PrintAndLog(" Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
-               case 1: PrintAndLog(" Cap Type:   %u | 250pF",cap); break;
-               case 0: PrintAndLog(" Cap Type:   %u | no resonant capacitor",cap); break;
-               default: PrintAndLog(" Cap Type:   %u | unknown",cap); break;
+               case 3: PrintAndLog("  Cap Type:   %u | 330pF",cap); break;
+               case 2: PrintAndLog("  Cap Type:   %u | %spF",cap, (chipType==2)? "75":"210"); break;
+               case 1: PrintAndLog("  Cap Type:   %u | 250pF",cap); break;
+               case 0: PrintAndLog("  Cap Type:   %u | no resonant capacitor",cap); break;
+               default: PrintAndLog("  Cap Type:   %u | unknown",cap); break;
        }
 
-       PrintAndLog("Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
+       PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");
        if (serial != 0) {
-               PrintAndLog("\n Serial #: %08X\n", serial);
+               PrintAndLog("\n  Serial #: %08X\n", serial);
        }
 }
 
@@ -845,22 +903,21 @@ bool EM4x05Block0Test(uint32_t *wordData) {
 
 int CmdEM4x05info(const char *Cmd) {
        //uint8_t addr = 0;
-       //uint32_t pwd;
+       uint32_t pwd;
        uint32_t wordData = 0;
-  //   bool usePwd = false;
+       bool usePwd = false;
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_dump();
 
        // for now use default input of 1 as invalid (unlikely 1 will be a valid password...)
-       //pwd = param_get32ex(Cmd, 0, 1, 16);
+       pwd = param_get32ex(Cmd, 0, 1, 16);
        
-       //if ( pwd != 1 ) {
-       //      usePwd = true;
-       //}
-       int success = 1;
-       // read blk 0
+       if ( pwd != 1 ) {
+               usePwd = true;
+       }
 
-       //block 0 can be read even without a password.
+       // read word 0 (chip info)
+       // block 0 can be read even without a password.
        if ( !EM4x05Block0Test(&wordData) ) 
                return -1;
        
@@ -868,16 +925,22 @@ int CmdEM4x05info(const char *Cmd) {
        uint8_t cap = (wordData >> 5) & 3;
        uint16_t custCode = (wordData >> 9) & 0x3FF;
        
+       // read word 1 (serial #) doesn't need pwd
        wordData = 0;
        if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {
                //failed, but continue anyway...
        }
        printEM4x05info(chipType, cap, custCode, wordData);
 
-       // add read block 4 and read out config if successful
+       // read word 4 (config block) 
        // needs password if one is set
-
-       return success;
+       wordData = 0;
+       if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {
+               //failed
+               return 0;
+       }
+       printEM4x05config(wordData);
+       return 1;
 }