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

unshadow

Browse source
This commit is contained in:
iceman1001 2019-04-08 09:50:06 +02:00
parent 4b12b2cdf3
commit e1d56b5f94
1 changed files with 7 additions and 8 deletions

15
client/cmddata.c
View file

@ -970,26 +970,26 @@ int CmdDetectClockRate(const char *Cmd) {
if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h') if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h')
return usage_data_detectclock(); return usage_data_detectclock();
int clock = 0; int clock1 = 0;
switch (cmdp) { switch (cmdp) {
case 'a' : case 'a' :
clock = GetAskClock(Cmd + 1, true); clock1 = GetAskClock(Cmd + 1, true);
break; break;
case 'f' : case 'f' :
clock = GetFskClock("", true); clock1 = GetFskClock("", true);
break; break;
case 'n' : case 'n' :
clock = GetNrzClock("", true); clock1 = GetNrzClock("", true);
break; break;
case 'p' : case 'p' :
clock = GetPskClock("", true); clock1 = GetPskClock("", true);
break; break;
default : default :
PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help"); PrintAndLogEx(NORMAL, "Please specify a valid modulation to detect the clock of - see option h for help");
break; break;
} }
RepaintGraphWindow(); RepaintGraphWindow();
return clock; return clock1;
} }
char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) { char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) {
@ -1047,9 +1047,8 @@ int FSKrawDemod(const char *Cmd, bool verbose) {
if (BitLen == 0) return 0; if (BitLen == 0) return 0;
//get field clock lengths //get field clock lengths
uint16_t fcs = 0;
if (!fchigh || !fclow) { if (!fchigh || !fclow) {
fcs = countFC(bits, BitLen, true); uint16_t fcs = countFC(bits, BitLen, true);
if (!fcs) { if (!fcs) {
fchigh = 10; fchigh = 10;
fclow = 8; fclow = 8;