Merge remote-tracking branch 'upstream/master'

diff --combined armsrc/appmain.c
index d20b08b26326f45e0a525eb43f8151018085474d,475b1c1b8e7e2a3e593d9dde365e70b5229a50a5..ffe6b7f22f745e47ccdd5c3ed0890682e63081ab
--- 1/armsrc/appmain.c
--- 2/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@@ -23,6 -23,7 +23,7 @@@
  
  #include "legicrf.h"
  #include <hitag2.h>
+ #include <hitagS.h>
  #include "lfsampling.h"
  #include "BigBuf.h"
  #include "mifareutil.h"
@@@ -36,6 -37,8 +37,6 @@@
   #include "iso14443a.h"
  #endif
  
 -#define abs(x) ( ((x)<0) ? -(x) : (x) )
 -
  //=============================================================================
  // A buffer where we can queue things up to be sent through the FPGA, for
  // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@@@ -839,7 -842,7 +840,7 @@@ void ListenReaderField(int limit
  
                if (limit != HF_ONLY) {
                        if(mode == 1) {
 -                              if (abs(lf_av - lf_baseline) > REPORT_CHANGE) 
 +                              if (ABS(lf_av - lf_baseline) > REPORT_CHANGE) 
                                        LED_D_ON();
                                else
                                        LED_D_OFF();
@@@ -847,7 -850,7 +848,7 @@@
  
                        lf_av_new = AvgAdc(ADC_CHAN_LF);
                        // see if there's a significant change
 -                      if(abs(lf_av - lf_av_new) > REPORT_CHANGE) {
 +                      if(ABS(lf_av - lf_av_new) > REPORT_CHANGE) {
                                Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
                                lf_av = lf_av_new;
                                if (lf_av > lf_max)
@@@ -857,7 -860,7 +858,7 @@@
  
                if (limit != LF_ONLY) {
                        if (mode == 1){
 -                              if (abs(hf_av - hf_baseline) > REPORT_CHANGE)   
 +                              if (ABS(hf_av - hf_baseline) > REPORT_CHANGE)   
                                        LED_B_ON();
                                else
                                        LED_B_OFF();
@@@ -865,7 -868,7 +866,7 @@@
  
                        hf_av_new = AvgAdc(ADC_CHAN_HF);
                        // see if there's a significant change
 -                      if(abs(hf_av - hf_av_new) > REPORT_CHANGE) {
 +                      if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
                                Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
                                hf_av = hf_av_new;
                                if (hf_av > hf_max)
@@@ -1014,6 -1017,18 +1015,18 @@@ void UsbPacketReceived(uint8_t *packet
                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

diff --combined client/cmdlf.c
index 245eb2245d102ad0037866395587f31e0487347a,34e0c1c765c0ff8260162295c8952a5e153245e9..016f0fe288ba5ca051916d5a775fb009594178d2
--- 1/client/cmdlf.c
--- 2/client/cmdlf.c
+++ b/client/cmdlf.c
@@@ -13,26 -13,24 +13,26 @@@
  #include <string.h>
  #include <limits.h>
  #include "proxmark3.h"
 -#include "data.h"
 -#include "graph.h"
 -#include "ui.h"
 -#include "cmdparser.h"
 -#include "cmdmain.h"
 -#include "cmddata.h"
 -#include "util.h"
  #include "cmdlf.h"
 -#include "cmdlfhid.h"
 -#include "cmdlfawid.h"
 -#include "cmdlfti.h"
 -#include "cmdlfem4x.h"
 -#include "cmdlfhitag.h"
 -#include "cmdlft55xx.h"
 -#include "cmdlfpcf7931.h"
 -#include "cmdlfio.h"
 -#include "cmdlfviking.h"
 -#include "lfdemod.h"
 +#include "lfdemod.h"     // for psk2TOpsk1
 +#include "util.h"        // for parsing cli command utils
 +#include "ui.h"          // for show graph controls
 +#include "graph.h"       // for graph data
 +#include "cmdparser.h"   // for getting cli commands included in cmdmain.h
 +#include "cmdmain.h"     // for sending cmds to device
 +#include "data.h"        // for GetFromBigBuf
 +#include "cmddata.h"     // for `lf search`
 +#include "cmdlfawid.h"   // for awid menu
 +#include "cmdlfem4x.h"   // for em4x menu
 +#include "cmdlfhid.h"    // for hid menu
 +#include "cmdlfhitag.h"  // for hitag menu
 +#include "cmdlfio.h"     // for ioprox menu
 +#include "cmdlft55xx.h"  // for t55xx menu
 +#include "cmdlfti.h"     // for ti menu
 +#include "cmdlfpresco.h" // for presco menu
 +#include "cmdlfpcf7931.h"// for pcf7931 menu
 +#include "cmdlfpyramid.h"// for pyramid menu
 +#include "cmdlfviking.h" // for viking menu
  
  static int CmdHelp(const char *Cmd);
  
@@@ -64,7 -62,6 +64,6 @@@ int CmdLFCommandRead(const char *Cmd
        bool errors = FALSE;
        //uint8_t divisor = 95; //125khz
        uint8_t cmdp = 0;
-       int strLength = 0;
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
@@@ -80,7 -77,7 +79,7 @@@
                        cmdp++;
                        break;
                case 'c':
-                       strLength = param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+                       param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
                        cmdp+=2;
                        break;
                case 'd':
@@@ -541,7 -538,7 +540,7 @@@ int CmdLFSetConfig(const char *Cmd
                return usage_lf_config();
        }
        //Bps is limited to 8, so fits in lower half of arg1
 -      if(bps >> 8) bps = 8;
 +      if(bps >> 4) bps = 8;
  
        sample_config config = {
                decimation,bps,averaging,divisor,trigger_threshold
@@@ -665,7 -662,7 +664,7 @@@ int usage_lf_simask(void
        PrintAndLog("       b              sim ask/biphase");
        PrintAndLog("       m              sim ask/manchester - Default");
        PrintAndLog("       r              sim ask/raw");
 -      PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
 +      PrintAndLog("       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");
        PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
        return 0;
  }
@@@ -1222,9 -1219,7 +1221,9 @@@ static command_t CommandTable[] 
        {"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},
        {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
        {"io",          CmdLFIO,            1, "{ ioProx tags...   }"},
 +      {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
 +      {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs...   }"},
        {"ti",          CmdLFTI,            1, "{ TI RFIDs...      }"},
        {"viking",      CmdLFViking,        1, "{ Viking tags...   }"},