From 9448ec40523cae5ec57fa9bd247b4b3385910cce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 29 Jan 2020 17:26:08 +0100
Subject: [PATCH] hitagstuff

---
 armsrc/lfadc.c | 10 ++++++----
 armsrc/lfadc.h |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/armsrc/lfadc.c b/armsrc/lfadc.c
index a15aa429b..04f293e1d 100644
--- a/armsrc/lfadc.c
+++ b/armsrc/lfadc.c
@@ -60,7 +60,6 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
         // only every 100th times, in order to save time when collecting samples.
         if (checked == 1000) {
             if (data_available()) {
-                checked = -1;
                 break;
             } else {
                 checked = 0;
@@ -77,7 +76,7 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
             if (logging) logSampleSimple(adc_val);
 
             // Only test field changes if state of adc values matter
-            if (!wait) {
+            if (wait == false) {
                 // Test if we are locating a field modulation (100% ASK = complete field drop)
                 if (detect_gap) {
                     // Only return when the field completely dissapeared
@@ -132,6 +131,9 @@ void lf_reset_counter() {
 bool lf_get_tag_modulation() {
     return (rising_edge == false);
 }
+bool lf_get_reader_modulation() {
+    return rising_edge;    
+}
 
 void lf_wait_periods(size_t periods) {
     lf_count_edge_periods_ex(periods, true, false);
@@ -228,11 +230,11 @@ size_t lf_detect_field_drop(size_t max) {
     volatile uint8_t adc_val;
     int16_t checked = 0;
 
-    while (true) {
+    while (!BUTTON_PRESS()) {
 
         // only every 1000th times, in order to save time when collecting samples.
         if (checked == 1000) {
-            if (BUTTON_PRESS() || data_available()) {
+            if (data_available()) {
                 checked = -1;
                 break;
             } else {
diff --git a/armsrc/lfadc.h b/armsrc/lfadc.h
index d394916ea..8c33aa778 100644
--- a/armsrc/lfadc.h
+++ b/armsrc/lfadc.h
@@ -21,7 +21,10 @@ bool lf_test_periods(size_t expected, size_t count);
 size_t lf_count_edge_periods(size_t max);
 size_t lf_detect_gap(size_t max);
 void lf_reset_counter();
+
 bool lf_get_tag_modulation();
+bool lf_get_reader_modulation();
+
 void lf_wait_periods(size_t periods);
 //void lf_init(bool reader);
 void lf_init(bool reader, bool simulate);