Inheritance of variables

steadramon · Apr 5, 2024 · dc735d1 · dc735d1
1 parent 60d5cf1
commit dc735d1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/ESPGeiger/src/GeigerInput/Type/Pulse.h b/ESPGeiger/src/GeigerInput/Type/Pulse.h
@@ -39,12 +39,12 @@ extern "C" {
 #define PCNT_CHANNEL PCNT_CHANNEL_0
 #endif
 
+#include "../GeigerInput.h"
+
 #ifndef GEIGER_MODEL
 #define GEIGER_MODEL "genpulse"
 #endif
 
-#include "../GeigerInput.h"
-
 class GeigerPulse : public GeigerInput
 {
   public:

diff --git a/ESPGeiger/src/GeigerInput/Type/TestPulse.h b/ESPGeiger/src/GeigerInput/Type/TestPulse.h
@@ -41,6 +41,8 @@ extern "C" {
 #define PCNT_CHANNEL PCNT_CHANNEL_0
 #endif
 
+#include "../GeigerInput.h"
+
 #ifndef GEIGER_DEBOUNCE
 #define GEIGER_DEBOUNCE 500
 #endif
@@ -53,17 +55,13 @@ extern "C" {
 #define GEIGER_TXPIN 12
 #endif
 
-#include "../GeigerInput.h"
-
 static bool _pulse_send = false;
 
 #ifndef GEIGER_TESTPULSE_ADJUSTTIME
 #define GEIGER_TESTPULSE_ADJUSTTIME 300000
 #endif
 
-#ifndef GEIGERTESTMODE
 #define GEIGERTESTMODE
-#endif
 
 #ifdef ESP32
 static hw_timer_t * pulsetimer = NULL;

diff --git a/ESPGeiger/src/GeigerInput/Type/TestPulseInt.h b/ESPGeiger/src/GeigerInput/Type/TestPulseInt.h
@@ -59,9 +59,7 @@ static bool _pulse_send = false;
 #define GEIGER_TESTPULSE_ADJUSTTIME 300000
 #endif
 
-#ifndef GEIGERTESTMODE
 #define GEIGERTESTMODE
-#endif
 
 #ifdef ESP32
 static hw_timer_t * pulsetimer = NULL;

diff --git a/ESPGeiger/src/GeigerInput/Type/TestSerial.h b/ESPGeiger/src/GeigerInput/Type/TestSerial.h
@@ -29,6 +29,7 @@ MightyOhm CPS, 1, CPM, 60, uSv/hr, 1.23, INST/FAST/SLOW\n
 GC10 60\n
 
 */
+#include "../GeigerInput.h"
 
 #ifndef GEIGER_BAUDRATE
 #define GEIGER_BAUDRATE 9600
@@ -38,22 +39,22 @@ GC10 60\n
 #define GEIGER_TXPIN 12
 #endif
 
+#if GEIGER_TXPIN == -1
+#define GEIGER_TXPIN 12
+#endif
+
 #ifndef GEIGER_SERIAL_TYPE
 #define GEIGER_SERIAL_TYPE GEIGER_SERIAL_CPM
 #endif
 
-#ifndef GEIGERTESTMODE
 #define GEIGERTESTMODE
-#endif
 
 #ifndef GEIGER_TESTPULSE_ADJUSTTIME
 #define GEIGER_TESTPULSE_ADJUSTTIME 300000
 #endif
 
 #define GEIGER_TEST_INITIAL_CPS 0.5
 
-#include "../GeigerInput.h"
-
 class GeigerTestSerial : public GeigerInput
 {
   public: