From 6b9e5e04009867883dd6ab1fa07b5702433ada24 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 9 Mar 2019 11:36:05 +0100 Subject: [PATCH] chg: unified code --- client/cmdlf.c | 3 +-- client/cmdlfparadox.c | 5 ++--- client/cmdlfpyramid.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/client/cmdlf.c b/client/cmdlf.c index 7358d9da1..71c429f00 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -878,8 +878,7 @@ int CmdLFfind(const char *Cmd) { if (isOnline) { // only run if graphbuffer is just noise as it should be for hitag // The improved noise detection will find Cotag. - signal_t *sp = getSignalProperties(); - if (sp->isnoise) { + if (getSignalProperties()->isnoise) { PrintAndLogEx(INFO, "Signal looks just like noise. Looking for Hitag signal now."); diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c index 113036d6f..4ffd7ef61 100644 --- a/client/cmdlfparadox.c +++ b/client/cmdlfparadox.c @@ -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) { //make sure buffer has data if (*size < 96*50) return -1; - - signal_t *sp = getSignalProperties(); - if (sp->isnoise) return -2; + + if (getSignalProperties()->isnoise) return -2; // FSK demodulator *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // paradox fsk2a diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index 796301761..af8c570c5 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -52,8 +52,7 @@ int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) { if (*size < 128*50) return -1; //test samples are not just noise - signal_t *sp = getSignalProperties(); - if (sp->isnoise) return -2; + if (getSignalProperties()->isnoise) return -2; // FSK demodulator RF/50 FSK 10,8 *size = fskdemod(dest, *size, 50, 0, 10, 8, waveStartIdx); // pyramid fsk2