This commit is contained in:
iceman1001 2019-06-08 10:11:18 -04:00
parent 7fd7b539be
commit a6fc729f22

View file

@ -2164,17 +2164,20 @@ bool tryDetectP1(bool getData) {
(DemodBufferLen == 32 || DemodBufferLen == 64)) { (DemodBufferLen == 32 || DemodBufferLen == 64)) {
return true; return true;
} }
st = true; st = true;
if ((ASKDemod_ext("0 1 1", false, false, 1, &st) == PM3_SUCCESS) && if ((ASKDemod_ext("0 1 1", false, false, 1, &st) == PM3_SUCCESS) &&
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
(DemodBufferLen == 32 || DemodBufferLen == 64)) { (DemodBufferLen == 32 || DemodBufferLen == 64)) {
return true; return true;
} }
if ((ASKbiphaseDemod("0 0 0 2", false) == PM3_SUCCESS) && if ((ASKbiphaseDemod("0 0 0 2", false) == PM3_SUCCESS) &&
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
(DemodBufferLen == 32 || DemodBufferLen == 64)) { (DemodBufferLen == 32 || DemodBufferLen == 64)) {
return true; return true;
} }
if ((ASKbiphaseDemod("0 0 1 2", false) == PM3_SUCCESS) && if ((ASKbiphaseDemod("0 0 1 2", false) == PM3_SUCCESS) &&
preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) && preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &DemodBufferLen, &startIdx, false) &&
(DemodBufferLen == 32 || DemodBufferLen == 64)) { (DemodBufferLen == 32 || DemodBufferLen == 64)) {