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

Merge remote-tracking branch 'upstream/master' into hf_mf_sim

Browse source
This commit is contained in:
vratiskol 2019-03-19 21:15:54 +01:00
commit cb895fb8ff
2 changed files with 16 additions and 9 deletions
client
cmddata.c
common
lfdemod.c

10
client/cmddata.c
View file

@ -482,13 +482,19 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
int foundclk = 0; int foundclk = 0;
//amplify signal before ST check //amplify signal before ST check
if (amp == 'a') if (amp == 'a') {
askAmp(bits, BitLen); askAmp(bits, BitLen);
}
size_t ststart = 0, stend = 0; size_t ststart = 0, stend = 0;
// if (*stCheck) // if (*stCheck)
bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend); bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
clk = (clk == 0) ? foundclk : clk;
if ( clk == 0 ) {
if ( foundclk == 32 || foundclk == 64 ) {
clk = foundclk;
}
}
if (st) { if (st) {
*stCheck = st; *stCheck = st;

13
common/lfdemod.c
View file

@ -311,10 +311,10 @@ size_t findModStart(uint8_t *src, size_t size, uint8_t expWaveSize) {
} }
int getClosestClock(int testclk) { int getClosestClock(int testclk) {
uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 128, 256, 384}; uint16_t clocks[] = {8, 16, 32, 40, 50, 64, 100, 128, 256, 384};
uint8_t limit[] = {1, 2, 4, 4, 5, 8, 8, 8, 8}; uint8_t limit[] = {1, 2, 4, 4, 5, 8, 8, 8, 8, 8};
for (uint8_t i = 0; i < 9; i++) for (uint8_t i = 0; i < 100; i++)
if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i]) if (testclk >= clocks[i] - limit[i] && testclk <= clocks[i] + limit[i])
return clocks[i]; return clocks[i];
@ -487,13 +487,14 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
getNextLow(dest, size, low, &i); getNextLow(dest, size, low, &i);
// clock, numoftimes, first idx // clock, numoftimes, first idx
uint16_t tmpclk[9][3] = { uint16_t tmpclk[10][3] = {
{8, 0, 0}, {8, 0, 0},
{16, 0, 0}, {16, 0, 0},
{32, 0, 0}, {32, 0, 0},
{40, 0, 0}, {40, 0, 0},
{50, 0, 0}, {50, 0, 0},
{64, 0, 0}, {64, 0, 0},
{100, 0, 0},
{128, 0, 0}, {128, 0, 0},
{256, 0, 0}, {256, 0, 0},
{384, 0, 0}, {384, 0, 0},
@ -515,7 +516,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
int foo = getClosestClock(minClk); int foo = getClosestClock(minClk);
if (foo > 0 ) { if (foo > 0 ) {
for (uint8_t i = 0; i < 9; i++) { for (uint8_t i = 0; i < 10; i++) {
if ( tmpclk[i][0] == foo ) { if ( tmpclk[i][0] == foo ) {
tmpclk[i][1]++; tmpclk[i][1]++;
@ -530,7 +531,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
// find the clock with most hits and it the first index it was encountered. // find the clock with most hits and it the first index it was encountered.
int max = 0; int max = 0;
for (uint8_t i = 0; i < 9; i++) { for (uint8_t i = 0; i < 10; i++) {
if (g_debugMode == 2) { if (g_debugMode == 2) {
prnt("DEBUG, ASK, clocks %u | hits %u | idx %u" prnt("DEBUG, ASK, clocks %u | hits %u | idx %u"
, tmpclk[i][0] , tmpclk[i][0]