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: unified code

Browse source
This commit is contained in:
iceman1001 2019-03-09 11:36:05 +01:00
commit 6b9e5e0400
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/cmdlf.c
View file

@ -878,8 +878,7 @@ int CmdLFfind(const char *Cmd) {
if (isOnline) { if (isOnline) {
// only run if graphbuffer is just noise as it should be for hitag // only run if graphbuffer is just noise as it should be for hitag
// The improved noise detection will find Cotag. // The improved noise detection will find Cotag.
signal_t *sp = getSignalProperties(); if (getSignalProperties()->isnoise) {
if (sp->isnoise) {
PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now."); PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now.");

5
client/cmdlfparadox.c
View file

@ -41,9 +41,8 @@ int usage_lf_paradox_sim(void) {
int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) { int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
//make sure buffer has data //make sure buffer has data
if (*size < 96*50) return -1; if (*size < 96*50) return -1;
signal_t *sp = getSignalProperties(); if (getSignalProperties()->isnoise) return -2;
if (sp->isnoise) return -2;
// FSK demodulator // FSK demodulator
*size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a

3
client/cmdlfpyramid.c
View file

@ -52,8 +52,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
if (*size < 128*50) return -1; if (*size < 128*50) return -1;
//test samples are not just noise //test samples are not just noise
signal_t *sp = getSignalProperties(); if (getSignalProperties()->isnoise) return -2;
if (sp->isnoise) return -2;
// FSK demodulator RF/50 FSK 10,8 // FSK demodulator RF/50 FSK 10,8
*size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx); // pyramid fsk2 *size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx); // pyramid fsk2