mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 13:53:55 -07:00
CHG: added the ASK/Biphase demod of signal for NEDAP demod.
ADD: 'LF SEARCH' now also checks for NEDAP.
This commit is contained in:
parent
56bbb25a41
commit
96faed2124
3 changed files with 13 additions and 1 deletions
|
@ -1119,6 +1119,11 @@ int CmdLFfind(const char *Cmd) {
|
|||
PrintAndLog("\nValid NexWatch ID Found!");
|
||||
return 1;
|
||||
}
|
||||
ans=CmdFSKdemodNedap("");
|
||||
if (ans>0) {
|
||||
PrintAndLog("\nValid NEDAP ID Found!");
|
||||
return 1;
|
||||
}
|
||||
// TIdemod?
|
||||
|
||||
|
||||
|
|
|
@ -78,7 +78,13 @@ int CmdFSKdemodNedap(const char *Cmd) {
|
|||
size_t size = getFromGraphBuf(BitStream);
|
||||
if (size==0) return 0;
|
||||
|
||||
//get binary from fsk wave
|
||||
//get binary from ask wave
|
||||
if (!ASKbiphaseDemod("0 64 1 0", FALSE)) {
|
||||
if (g_debugMode) PrintAndLog("Error NEDAP: ASKbiphaseDemod failed");
|
||||
return 0;
|
||||
}
|
||||
size_t size = DemodBufferLen;
|
||||
|
||||
int idx = NedapDemod(BitStream, &size);
|
||||
if (idx < 0){
|
||||
if (g_debugMode){
|
||||
|
|
|
@ -768,6 +768,7 @@ int PyramiddemodFSK(uint8_t *dest, size_t *size)
|
|||
int NedapDemod(uint8_t *dest, size_t *size) {
|
||||
//make sure buffer has data
|
||||
if (*size < 128) return -3;
|
||||
|
||||
size_t startIdx = 0;
|
||||
uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,0};
|
||||
uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue