Merge remote-tracking branch 'upstream/master'

diff --cc armsrc/lfops.c
index 67652986afd87560d45e86fe0a2bfdbdbef7fa4e,479da77204ebc3fc357b5c569afbc3b0aab2f2bc..e34eab35f5bc813f8201b699967db819ed9da556
--- 1/armsrc/lfops.c
--- 2/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@@ -734,11 -650,11 +650,11 @@@ void CmdEM410xdemod(int findone, int *h
          WDT_HIT();
          if (ledcontrol) LED_A_ON();
  
-         DoAcquisition125k_internal(-1,true);
-         size  = BigBuf_max_traceLen();
+               DoAcquisition_default(-1,true);
+               size  = BigBuf_max_traceLen();
          //Dbprintf("DEBUG: Buffer got");
                //askdemod and manchester decode
 -              errCnt = askmandemod(dest, &size, &clk, &invert);
 +              errCnt = askmandemod(dest, &size, &clk, &invert, maxErr);
          //Dbprintf("DEBUG: ASK Got");
          WDT_HIT();
  

diff --cc client/cmddata.c
Simple merge

diff --cc client/cmdlf.c
Simple merge

diff --cc client/graph.h
Simple merge