github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

colors

Browse source
This commit is contained in:
iceman1001 2019-02-25 00:15:39 +01:00
commit 7945b5a805
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/mifarehost.c
View file

@ -959,8 +959,8 @@ int detect_classic_nackbug(bool verbose){
} }
return 2; return 2;
} }
case 2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3; case 2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
case 1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1; case 1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
case 0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2; case 0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0; default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
} }
@ -981,9 +981,9 @@ void detect_classic_magic(void) {
isGeneration = resp.arg[0] & 0xff; isGeneration = resp.arg[0] & 0xff;
switch( isGeneration ){ switch( isGeneration ){
case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): YES"); break; case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): YES"); break; case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): YES"); break; //case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): " _GREEN_(YES)); break;
default: PrintAndLogEx(INFO, "Answers to magic commands: NO"); break; default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
} }
} }

4
common/lfdemod.c
View file

@ -77,7 +77,7 @@ static void resetSignal(void) {
signalprop.isnoise = true; signalprop.isnoise = true;
} }
static void printSignal(void) { static void printSignal(void) {
prnt("LF Signal properties:"); prnt("LF signal properties:");
prnt(" high..........%d", signalprop.high); prnt(" high..........%d", signalprop.high);
prnt(" low...........%d", signalprop.low); prnt(" low...........%d", signalprop.low);
prnt(" mean..........%d", signalprop.mean); prnt(" mean..........%d", signalprop.mean);
@ -1922,7 +1922,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
dest[numBits++] = curPhase; dest[numBits++] = curPhase;
} else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often) } else if (waveLenCnt < fc - 1) { //wave is smaller than field clock (shouldn't happen often)
errCnt2++; errCnt2++;
if(errCnt2 > 101) return errCnt2; if (errCnt2 > 101) return errCnt2;
avgWaveVal += dest[i+1]; avgWaveVal += dest[i+1];
continue; continue;
} }