ADD: Added the HitagS from @spenneb ref:https://events.ccc.de/congress/2015/Fahrplan...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 3dfa526752b29a4c43a41d226f83a3d41b358b19..cc074815e1718ae5ac51bba804110f8aeab233a8 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -22,7 +22,8 @@
 #include <stdarg.h>
 
 #include "legicrf.h"
-#include <hitag2.h>
+#include "hitag2.h"
+#include "hitagS.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"
@@ -651,7 +652,7 @@ void SamyRun()
                        SpinDelay(500);
 
                        CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-                       Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
+                       Dbprintf("Recorded %x %x %08x", selected, high[selected], low[selected]);
 
                        LEDsoff();
                        LED(selected + 1, 0);
@@ -667,7 +668,7 @@ void SamyRun()
                        LED(LED_ORANGE, 0);
 
                        // record
-                       Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+                       Dbprintf("Cloning %x %x %08x", selected, high[selected], low[selected]);
 
                        // wait for button to be released
                        while(BUTTON_PRESS())
@@ -676,8 +677,8 @@ void SamyRun()
                        /* need this delay to prevent catching some weird data */
                        SpinDelay(500);
 
-                       CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
-                       Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+                       CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+                       Dbprintf("Cloned %x %x %08x", selected, high[selected], low[selected]);
 
                        LEDsoff();
                        LED(selected + 1, 0);
@@ -708,7 +709,7 @@ void SamyRun()
                                while(BUTTON_PRESS())
                                        WDT_HIT();
                                
-                               Dbprintf("%x %x %x", selected, high[selected], low[selected]);
+                               Dbprintf("%x %x %08x", selected, high[selected], low[selected]);
                                CmdHIDsimTAG(high[selected], low[selected], 0);         
                                DbpString("Done playing");
                                
@@ -996,6 +997,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
                        ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
                        break;
+               case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+                       SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+                       check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+                       break;
+               case CMD_READ_HITAG_S://Reader for only Hitag S tags, args = key or challenge
+                       ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+                       break;
+               case CMD_WR_HITAG_S://writer for Hitag tags args=data to write,page and key or challenge
+                       WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+                       break;
 #endif
 
 #ifdef WITH_ISO15693