Circuit-Forge/easypiezi
3
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

removed bad merge lines

Browse source
This commit is contained in:
pyr0ball 2019-12-31 15:28:40 -08:00
parent 79f0d657da
commit d903a8a4f3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h
View file

@ -43,16 +43,16 @@
extern int Hyst; // Hysteresis value for ADC measurements extern int Hyst; // Hysteresis value for ADC measurements
#endif #endif
#define LOGIC_DEFAULT 0 #define LOGIC_DEFAULT 1
#define LOGIC_ADDRESS 24 #define LOGIC_ADDRESS 32
#if !(defined(LOGIC)) #if !(defined(LOGIC))
extern bool LOGIC; // Trigger logic scheme, Active LOW is default extern int LOGIC; // Trigger logic scheme, Active LOW is default
#endif #endif
#define PZDET_DEFAULT 0 #define PZDET_DEFAULT 0
#define PZDET_ADDRESS 26 #define PZDET_ADDRESS 26
#if !(defined(PZDET)) #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 #endif
#if !(defined(Debug)) #if !(defined(Debug))