From 287a9dd20466e402682898a696a89589075ee8d0 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Apr 2019 23:42:02 +0200
Subject: [PATCH] chg: 'data raw nr' - cleanup

---
 common/lfdemod.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/common/lfdemod.c b/common/lfdemod.c
index bd51a29b4..cfac0a0b5 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1615,20 +1615,16 @@ int askdemod(uint8_t *bits, size_t *size, int *clk, int *invert, int maxErr, uin
 // peaks invert bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
 int nrzRawDemod(uint8_t *dest, size_t *size, int *clk, int *invert, int *startIdx) {
 
-    if (signalprop.isnoise) return -1;
-
+    if (signalprop.isnoise) {
+        if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
+        return -1;
+    }
+    
     size_t clkStartIdx = 0;
     *clk = DetectNRZClock(dest, *size, *clk, &clkStartIdx);
     if (*clk == 0) return -2;
 
     size_t i;
-
-    // just noise - no super good detection. good enough
-    if (signalprop.isnoise) {
-        if (g_debugMode == 2) prnt("DEBUG nrzRawDemod: just noise detected - quitting");
-        return -3;
-    }
-
     int high, low;
 
     getHiLo(&high, &low, 75, 75);
@@ -1673,7 +1669,7 @@ size_t fsk_wave_demod(uint8_t *dest, size_t size, uint8_t fchigh, uint8_t fclow,
     size_t LastSample = 0;
     size_t currSample = 0;
     size_t last_transition = 0;
-    size_t idx = 1;
+    size_t idx;
     size_t numBits = 0;
 
     //find start of modulating data in trace