RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: some minor changes from @marshmellow42

Browse source
This commit is contained in:
iceman1001 2017-02-16 21:44:25 +01:00
parent 516dbac210
commit 1a4b907335
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/cmdlfem4x.c
View file

@ -571,7 +571,6 @@ bool doPreambleSearch(size_t *startIdx){
if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
return FALSE;
}
return TRUE;
}
@ -695,7 +694,7 @@ int CmdReadWord(const char *Cmd) {
//attempt demod:
//need 32 bits from a read word
return demodEM4x05resp(32);
return demodEM4x05resp(44);
}
int CmdWriteWord(const char *Cmd) {

15
client/graph.c
View file

@ -182,21 +182,18 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
if (!strcmp(str, ""))
clock = 0;
if (clock!=0)
return clock;
if (clock!=0) return clock;
// Auto-detect clock
uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
size_t size = getFromGraphBuf(grph);
if ( size == 0 ) {
if (verbose)
PrintAndLog("Failed to copy from graphbuffer");
if (verbose) PrintAndLog("Failed to copy from graphbuffer");
return -1;
}
clock = DetectPSKClock(grph,size,0);
// Only print this message if we're not looping something
if (printAns){
PrintAndLog("Auto-detected clock rate: %d", clock);
}
if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock);
return clock;
}
@ -255,7 +252,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
if (size==0) return 0;
uint16_t ans = countFC(BitStream, size, 1);
if (ans==0) {
if (verbose) PrintAndLog("DEBUG: No data found");
if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
return 0;
}
*fc1 = (ans >> 8) & 0xFF;
@ -263,7 +260,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
*rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
if (*rf1==0) {
if (verbose) PrintAndLog("DEBUG: Clock detect error");
if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
return 0;
}
return 1;

4
common/lfdemod.c
View file

@ -1448,10 +1448,10 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj)
uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
uint8_t fcLensFnd = 0;
uint8_t lastFCcnt=0;
uint8_t lastFCcnt = 0;
uint8_t fcCounter = 0;
size_t i;
if (size == 0) return 0;
if (size < 180) return 0;
// prime i to first up transition
for (i = 160; i < size-20; i++)