From d903a8a4f371f1ab5a2dbd87b2ae19bf4c0ac080 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Tue, 31 Dec 2019 15:28:40 -0800 Subject: [PATCH] removed bad merge lines --- .../AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h | 8 ++++---- 1 file changed, 4 insertions(+), 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 index 0039034..abe8a97 100644 --- 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))