github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-31 12:00:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug in st detect +

Browse source 
adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.
This commit is contained in:
marshmellow42 2017-04-04 17:22:21 -04:00
parent b97311b1bd
commit bf85d22f96
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/lfops.c
View file

@ -1222,7 +1222,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
bool PwdMode = arg0 & 0x1; bool PwdMode = arg0 & 0x1;
uint8_t Page = (arg0 & 0x2) >> 1; uint8_t Page = (arg0 & 0x2) >> 1;
uint32_t i = 0; uint32_t i = 0;
bool RegReadMode = (Block == 0xFF); bool RegReadMode = (Block == 0xFF);//regular read mode
//clear buffer now so it does not interfere with timing later //clear buffer now so it does not interfere with timing later
BigBuf_Clear_ext(false); BigBuf_Clear_ext(false);
@ -1257,7 +1257,9 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
T55xxWriteBit(Block & i); T55xxWriteBit(Block & i);
// Turn field on to read the response // Turn field on to read the response
TurnReadLFOn(135*8); // 137*8 seems to get to the start of data pretty well...
// but we want to go past the start and let the repeating data settle in...
TurnReadLFOn(210*8);
// Acquisition // Acquisition
// Now do the acquisition // Now do the acquisition

2
client/cmdlft55xx.c
View file

@ -570,7 +570,7 @@ bool tryDetectModulation(){
} }
} }
clk = GetNrzClock("", false, false); clk = GetNrzClock("", false, false);
if (clk>0) { if (clk>8) { //clock of rf/8 is likely a false positive, so don't use it.
if ( NRZrawDemod("0 0 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) { if ( NRZrawDemod("0 0 1", false) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
tests[hits].modulation = DEMOD_NRZ; tests[hits].modulation = DEMOD_NRZ;
tests[hits].bitrate = bitRate; tests[hits].bitrate = bitRate;

2
client/graph.c
View file

@ -150,7 +150,7 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
start = DetectASKClock(grph, size, &clock, 20); start = DetectASKClock(grph, size, &clock, 20);
} }
// Only print this message if we're not looping something // Only print this message if we're not looping something
if (printAns) { if (printAns || g_debugMode) {
PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
} }
return clock; return clock;

4
common/lfdemod.c
View file

@ -548,7 +548,7 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock, size_t *clockStartIdx
//get high and low peak //get high and low peak
int peak, low; int peak, low;
if (getHiLo(dest, loopCnt, &peak, &low, 85, 85) < 1) return 0; if (getHiLo(dest, loopCnt, &peak, &low, 90, 90) < 1) return 0;
int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low); int lowestTransition = DetectStrongNRZClk(dest, size-20, peak, low);
size_t ii; size_t ii;
@ -958,6 +958,8 @@ uint8_t detectFSKClk(uint8_t *BitStream, size_t size, uint8_t fcHigh, uint8_t fc
// look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index... // look for Sequence Terminator - should be pulses of clk*(1 or 2), clk*2, clk*(1.5 or 2), by idx we mean graph position index...
bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) { bool findST(int *stStopLoc, int *stStartIdx, int lowToLowWaveLen[], int highToLowWaveLen[], int clk, int tol, int buffSize, size_t *i) {
if (buffSize < *i+4) return false;
for (; *i < buffSize - 4; *i+=1) { for (; *i < buffSize - 4; *i+=1) {
*stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST.... to be accounted for in main function for now... *stStartIdx += lowToLowWaveLen[*i]; //caution part of this wave may be data and part may be ST.... to be accounted for in main function for now...
if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) { //1 to 2 clocks depending on 2 bits prior if (lowToLowWaveLen[*i] >= clk*1-tol && lowToLowWaveLen[*i] <= (clk*2)+tol && highToLowWaveLen[*i] < clk+tol) { //1 to 2 clocks depending on 2 bits prior