github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: used @marshmellow42 's version to fix lf continuous demod problems.

Browse source
This commit is contained in:
iceman1001 2016-12-19 16:04:27 +01:00
commit 55db344f97
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
- Fixed bugs in `lf sim` and other lf continuous demods not turning off antenna when finished (marshmellow)
- `hf iclass write` - fixed bugs, added crc. (?)
- `hf iclass dump` - changed layout in dump (iceman)
- Changed - debug statements are more clear (iceman)
- `lf search` - fixed the silent option when aquireing data. (iceman) - `lf search` - fixed the silent option when aquireing data. (iceman)
- `lf search` - added presco, visa2000, noralsy detection (iceman) - `lf search` - added presco, visa2000, noralsy detection (iceman)
- `lf precso` - fixed some bitsgeneration in precso bits (iceman) - `lf precso` - fixed some bitsgeneration in precso bits (iceman)

13
armsrc/lfops.c
View file

@ -854,14 +854,13 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high = hi; *high = hi;
*low = lo; *low = lo;
goto OUT; break;
} }
// reset // reset
} }
hi2 = hi = lo = idx = 0; hi2 = hi = lo = idx = 0;
WDT_HIT(); WDT_HIT();
} }
OUT:
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
@ -960,12 +959,12 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
break; break;
} }
if (findone) if (findone)
goto OUT; break;
idx = 0; idx = 0;
WDT_HIT(); WDT_HIT();
} }
OUT:
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
@ -1021,13 +1020,14 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high=lo>>32; *high=lo>>32;
*low=lo & 0xFFFFFFFF; *low=lo & 0xFFFFFFFF;
return; break;
} }
} }
WDT_HIT(); WDT_HIT();
hi = lo = size = idx = 0; hi = lo = size = idx = 0;
clk = invert = errCnt = 0; clk = invert = errCnt = 0;
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -1106,7 +1106,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
*high=code; *high=code;
*low=code2; *low=code2;
goto OUT; break;
} }
code=code2=0; code=code2=0;
version=facilitycode=0; version=facilitycode=0;
@ -1115,7 +1115,6 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
WDT_HIT(); WDT_HIT();
} }
OUT:
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("Stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();