removed bad merge lines

pyr0ball · Dec 31, 2019 · d903a8a · d903a8a
1 parent 79f0d65
commit d903a8a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h
@@ -43,16 +43,16 @@
   extern int Hyst; // Hysteresis value for ADC measurements
 #endif
 
-#define LOGIC_DEFAULT 0
-#define LOGIC_ADDRESS 24
+#define LOGIC_DEFAULT 1
+#define LOGIC_ADDRESS 32
 #if !(defined(LOGIC))
-  extern bool LOGIC; // Trigger logic scheme, Active LOW is default
+  extern int LOGIC; // Trigger logic scheme, Active LOW is default
 #endif
 
 #define PZDET_DEFAULT 0
 #define PZDET_ADDRESS 26
 #if !(defined(PZDET))
-  extern bool PZDET; // Enable or disable piezo connection detection, default is off
+  extern int PZDET; // Enable or disable piezo connection detection, default is off
 #endif
 
 #if !(defined(Debug))