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

Merge branch 'develop' of https://github.com/pyr0ball/pyr0piezo into develop

Browse source
This commit is contained in:
pyr0ball 2020-01-20 17:01:50 -08:00
commit 76fb8c3631
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/platformio.ini
View file

@ -32,7 +32,7 @@ board = ATmega88P
framework = arduino framework = arduino
lib_deps = Arduino lib_deps = Arduino
build_flags = build_flags = !python version_git.py
; --verbose ; --verbose
upload_protocol = arduino upload_protocol = arduino
@ -58,7 +58,7 @@ board = ATmega328PB
framework = arduino framework = arduino
lib_deps = Arduino lib_deps = Arduino
build_flags = build_flags = !python version_git.py
; --verbose ; --verbose
upload_protocol = arduino upload_protocol = arduino

2
firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/Pyr0_Piezo_Sensor_V2.x.x.cpp
View file

@ -84,8 +84,6 @@ update the voltMeterConstant variable in pP_config.h with the correct value
------------------------------------------------------------*/ ------------------------------------------------------------*/
#define PP_VERSION "2.2.1_1ed670"
/* Debug output verbose mode will continuously output sensor readings /* Debug output verbose mode will continuously output sensor readings
rather than waiting for user input */ rather than waiting for user input */
#define VERBOSE true #define VERBOSE true

4
firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/version_git.py Normal file
View file

@ -0,0 +1,4 @@
import subprocess
major_version = "2.2.1"
print("-DPP_VERSION=\\\"" + major_version + "_" + subprocess.check_output(["git", "rev-parse", "HEAD"])[0:6] + "\\\"")