(no commit message)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index f2ae56d850e9ee15173004ca75656c506a968525..e9e412d5ec3204bd0956b7992e5683542086d9b2 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -792,6 +792,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
 #endif
 
+#ifdef WITH_LF
+               case CMD_HID_CLONE_TAG:
+                       CopyHIDtoT5567(c->arg[0], c->arg[1]);                                   // Clone HID tag by ID to T55x7
+                       break;
+#endif
+
                case CMD_FPGA_MAJOR_MODE_OFF:           // ## FPGA Control
                        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                        SpinDelay(200);

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 1f0dd5584535af444ef083395119bf63b2e84017..5094271acb2e702e1007e92d66627c76036e332a 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -94,6 +94,8 @@ void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void CmdHIDsimTAG(int hi, int lo, int ledcontrol);
 void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol);
 void SimulateTagLowFrequencyBidir(int divisor, int max_bitlen);
+void CopyHIDtoT5567(int hi, int lo); // Clone an HID card to T5557/T5567
+
 
 /// iso14443.h
 void SimulateIso14443Tag(void);

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 21e068c16ab92e80901cbb3b13f3129c14636f30..50cf35c6c53734fdfd1354375486aa9f1a6a0df0 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -975,3 +975,109 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                WDT_HIT();
        }
 }
+
+//----------------------
+// T5557/T5567 routines
+
+// Relevant times in microsecond
+// To compensate antenna falling times shorten the write times
+//  and enlarge the gap ones.
+#define start_gap 250 
+#define write_gap 160 
+#define write_0 144 //192
+#define write_1 400 //432 for T55x7; 448 for E5550
+
+//Write one bit to card
+void T5567WriteBit(int bit)
+{
+       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
+       if (bit == 0)  SpinDelayUs(write_0);
+       else SpinDelayUs(write_1);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelayUs(write_gap);
+}
+
+//Write one card block in page 0, no lock
+void T5567WriteBlock(int Data, int Block)
+{
+
+       /* Make sure the tag is reset */
+//     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+//     SpinDelay(2500);
+
+       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
+
+       // Give it a bit of time for the resonant antenna to settle.
+       // And for the tag to fully power up
+       SpinDelay(150);
+
+       // now start writting
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelayUs(start_gap);
+
+  //Opcode
+  T5567WriteBit(1);
+  T5567WriteBit(0); //Page 0
+  //Lock bit
+  T5567WriteBit(0);
+  
+  //Data 
+  for (int i=0;i<32;i++){
+     T5567WriteBit(Data&(1<<(31-i)));
+  }    
+
+  //Page 
+  for (int i=0;i<3;i++){
+     T5567WriteBit(Block&(1<<(2-i)));
+  }    
+  
+  //Now perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
+  //                   so wait a little more)
+       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);
+       SpinDelay(20);
+       
+}
+
+//Copy HID id to card and setup block 0 config
+void CopyHIDtoT5567(int hi, int lo)
+{
+       int data1, data2, data3;
+
+  // ensure no more than 44 bits supplied
+       if (hi>0xFFF) {
+               DbpString("Tags can only have 44 bits.");
+               return;
+       }
+       
+       //Build the 3 data blocks for supplied 44bit ID
+       data1 = 0x1D000000; //load preamble
+       for (int i=0;i<12;i++){
+               if (hi & (1<<(11-i))) data1 |= (1<<(((11-i)*2)+1)); // 1 -> 10
+               else data1 |= (1<<((11-i)*2));                      // 0 -> 01
+       }
+       data2 = 0; 
+       for (int i=0;i<16;i++){
+               if (lo & (1<<(31-i))) data2 |= (1<<(((15-i)*2)+1)); // 1 -> 10
+               else data2 |= (1<<((15-i)*2));                      // 0 -> 01
+       }
+       data3 = 0; 
+       for (int i=0;i<16;i++){
+               if (lo & (1<<(15-i))) data3 |= (1<<(((15-i)*2)+1)); // 1 -> 10
+               else data3 |= (1<<((15-i)*2));                      // 0 -> 01
+       }
+
+       //Program the 3 data blocks for supplied 44bit ID
+       // and the block 0 for HID format
+  T5567WriteBlock(data1,1);
+  T5567WriteBlock(data2,2);
+  T5567WriteBlock(data3,3);
+  //Config for HID (RF/50;FSK2a;Maxblock=3)
+  T5567WriteBlock(0x00107060,0);
+
+       DbpString("DONE!");
+
+}      
+

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 344662e1dd23f61609f09676c8b12e7aa675e26e..767ea3cc3dec3216489babd45473b83e8656ffbe 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -60,12 +60,30 @@ int CmdHIDSim(const char *Cmd)
   return 0;
 }
 
+int CmdHIDClone(const char *Cmd)
+{
+  unsigned int hi = 0, lo = 0;
+  int n = 0, i = 0;
+
+  while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
+    hi = (hi << 4) | (lo >> 28);
+    lo = (lo << 4) | (n & 0xf);
+  }
+
+  PrintAndLog("Cloning tag with ID %x%08x", hi, lo);
+
+  UsbCommand c = {CMD_HID_CLONE_TAG, {hi, lo}};
+  SendCommand(&c);
+  return 0;
+}
+
 static command_t CommandTable[] = 
 {
   {"help",      CmdHelp,        1, "This help"},
   {"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
   {"fskdemod",  CmdHIDDemodFSK, 0, "Realtime HID FSK demodulator"},
   {"sim",       CmdHIDSim,      0, "<ID> -- HID tag simulator"},
+  {"clone",     CmdHIDClone,    0, "<ID> -- Clone HID to T55x7 (tag must be in antenna)"},
   {NULL, NULL, 0, NULL}
 };
 

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 8b8133cc62fdcc795cb3a1f329058bcf2a8cbd1c..5385fbf5752af5f316437696330ce5f36a100294 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -66,6 +66,8 @@ typedef struct {
 #define CMD_SET_LF_DIVISOR                                                     0x020D
 #define CMD_LF_SIMULATE_BIDIR                                          0x020E
 #define CMD_SET_ADC_MUX                                                                        0x020F
+#define CMD_HID_CLONE_TAG                                                              0x0210
+
 /* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
 // For the 13.56 MHz tags