mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 13:23:51 -07:00
fix: use defines instead.
This commit is contained in:
parent
bcb33ca5ef
commit
59eb83bf90
1 changed files with 5 additions and 5 deletions
|
@ -1900,19 +1900,19 @@ bool tryDetectP1(bool getData) {
|
||||||
clk = GetPskClock("", false);
|
clk = GetPskClock("", false);
|
||||||
if (clk > 0) {
|
if (clk > 0) {
|
||||||
// allow undo
|
// allow undo
|
||||||
// save_restoreGB(1);
|
// save_restoreGB(GRAPH_SAVE);
|
||||||
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
|
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
|
||||||
//CmdLtrim("160");
|
//CmdLtrim("160");
|
||||||
if ( PSKDemod("0 0 6", false) &&
|
if ( PSKDemod("0 0 6", false) &&
|
||||||
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
||||||
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
||||||
//save_restoreGB(0);
|
//save_restoreGB(GRAPH_RESTORE);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( PSKDemod("0 1 6", false) &&
|
if ( PSKDemod("0 1 6", false) &&
|
||||||
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
||||||
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
||||||
//save_restoreGB(0);
|
//save_restoreGB(GRAPH_RESTORE);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// PSK2 - needs a call to psk1TOpsk2.
|
// PSK2 - needs a call to psk1TOpsk2.
|
||||||
|
@ -1920,12 +1920,12 @@ bool tryDetectP1(bool getData) {
|
||||||
psk1TOpsk2(DemodBuffer, DemodBufferLen);
|
psk1TOpsk2(DemodBuffer, DemodBufferLen);
|
||||||
if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
if (preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
|
||||||
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
(DemodBufferLen == 32 || DemodBufferLen == 64) ) {
|
||||||
//save_restoreGB(0);
|
//save_restoreGB(GRAPH_RESTORE);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} // inverse waves does not affect PSK2 demod
|
} // inverse waves does not affect PSK2 demod
|
||||||
//undo trim samples
|
//undo trim samples
|
||||||
//save_restoreGB(0);
|
//save_restoreGB(GRAPH_RESTORE);
|
||||||
// no other modulation clocks = 2 or 4 so quit searching
|
// no other modulation clocks = 2 or 4 so quit searching
|
||||||
if (fc1 != 8) return false;
|
if (fc1 != 8) return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue