Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update targets

Browse Source
This commit is contained in:
Magnus Persson 2022-10-14 19:35:39 +02:00
parent 15d3371437
commit ddeca29f8e
5 changed files with 95 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pio-build.yaml vendored
View File

@ -36,7 +36,7 @@ jobs:
git config --global advice.detachedHead false git config --global advice.detachedHead false
- name: Run PlatformIO - name: Run PlatformIO
run: pio run -e gravity-release -e gravity-perf -e gravity32-release -e gravity32-c3-release run: pio run -e gravity-release -e gravity32-release -e gravity32c3-release
- uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit - uses: EndBug/add-and-commit@v7 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
with: with:

BIN
bin/firmware-perf.bin
View File

Binary file not shown.

BIN
bin/firmware32-perf.bin
View File

Binary file not shown.

125
platformio.ini
View File

@ -22,7 +22,7 @@ board = d1_mini
build_unflags = build_unflags =
build_flags = build_flags =
-Wl,-Map,output.map -Wl,-Map,output.map
-D BAUD=${common_env_data.monitor_speed} -DBAUD=${common_env_data.monitor_speed}
#-D SKIP_SLEEPMODE #-D SKIP_SLEEPMODE
#-D FORCE_GRAVITY_MODE #-D FORCE_GRAVITY_MODE
#-D DOUBLERESETDETECTOR_DEBUG=true #-D DOUBLERESETDETECTOR_DEBUG=true
@ -44,47 +44,47 @@ build_flags =
#!python script/git_rev.py #!python script/git_rev.py
lib_deps = lib_deps =
# Using local copy of these libraries # Using local copy of these libraries
#https://github.com/mp-se/i2cdevlib.git#<document> # https://github.com/mp-se/i2cdevlib.git#<document>
#https://github.com/mp-se/OneWire # https://github.com/mp-se/OneWire
#https://github.com/mp-se/Arduino-Temperature-Control-Library # https://github.com/mp-se/Arduino-Temperature-Control-Library
#https://github.com/khoih-prog/ESP_WiFiManager # https://github.com/khoih-prog/ESP_WiFiManager
#https://github.com/khoih-prog/ESP_DoubleResetDetector # https://github.com/khoih-prog/ESP_DoubleResetDetector
https://github.com/mp-se/tinyexpr # https://github.com/codeplea/tinyexpr https://github.com/mp-se/tinyexpr # https://github.com/codeplea/tinyexpr
https://github.com/mp-se/Arduino-Log#1.1.1 # https://github.com/thijse/Arduino-Log https://github.com/mp-se/Arduino-Log#1.1.1 # https://github.com/thijse/Arduino-Log
https://github.com/mp-se/ArduinoJson#v6.18.5 # https://github.com/bblanchon/ArduinoJson https://github.com/mp-se/ArduinoJson#v6.18.5 # https://github.com/bblanchon/ArduinoJson
https://github.com/mp-se/arduinoCurveFitting#v1.0.6 # https://github.com/Rotario/arduinoCurveFitting https://github.com/mp-se/arduinoCurveFitting#v1.0.6 # https://github.com/Rotario/arduinoCurveFitting
https://github.com/mp-se/arduino-mqtt#v2.5.0 # https://github.com/256dpi/arduino-mqtt https://github.com/mp-se/arduino-mqtt#v2.5.0 # https://github.com/256dpi/arduino-mqtt
lib_deps32 = lib_deps32 =
https://github.com/mp-se/NimBLE-Arduino#1.3.8 # https://github.com/h2zero/NimBLE-Arduino https://github.com/mp-se/NimBLE-Arduino#1.3.8 # https://github.com/h2zero/NimBLE-Arduino
extra_scripts = extra_scripts =
script/copy_firmware.py script/copy_firmware.py
script/create_versionjson.py script/create_versionjson.py
[env:gravity-debug] ; [env:gravity-debug]
upload_speed = ${common_env_data.upload_speed} ; upload_speed = ${common_env_data.upload_speed}
monitor_speed = ${common_env_data.monitor_speed} ; monitor_speed = ${common_env_data.monitor_speed}
framework = ${common_env_data.framework} ; framework = ${common_env_data.framework}
platform = ${common_env_data.platform} ; platform = ${common_env_data.platform}
extra_scripts = ${common_env_data.extra_scripts} ; extra_scripts = ${common_env_data.extra_scripts}
build_unflags = ${common_env_data.build_unflags} ; build_unflags = ${common_env_data.build_unflags}
build_flags = ; build_flags =
${common_env_data.build_flags} ; ${common_env_data.build_flags}
#-D DEBUG_ESP_HTTP_CLIENT ; #-D DEBUG_ESP_HTTP_CLIENT
#-D DEBUG_ESP_HTTP_SERVER ; #-D DEBUG_ESP_HTTP_SERVER
#-D DEBUG_ESP_PORT=Serial ; #-D DEBUG_ESP_PORT=Serial
#-D DEBUG_ESP_WIFI ; #-D DEBUG_ESP_WIFI
#-D DEBUG_ESP_SSL ; #-D DEBUG_ESP_SSL
#-D DEBUG_ESP_CORE ; #-D DEBUG_ESP_CORE
-DPIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS ; -DPIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
-DCOLLECT_PERFDATA # Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb ; -DCOLLECT_PERFDATA # Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb
-DLOG_LEVEL=6 ; -DLOG_LEVEL=6
lib_deps = ; lib_deps =
https://github.com/mp-se/incbin # https://github.com/graphitemaster/incbin ; https://github.com/mp-se/incbin # https://github.com/graphitemaster/incbin
${common_env_data.lib_deps} ; ${common_env_data.lib_deps}
board = ${common_env_data.board} ; board = ${common_env_data.board}
build_type = release ; build_type = release
board_build.filesystem = littlefs ; board_build.filesystem = littlefs
monitor_filters = esp8266_exception_decoder ; monitor_filters = esp8266_exception_decoder
[env:gravity-release] [env:gravity-release]
upload_speed = ${common_env_data.upload_speed} upload_speed = ${common_env_data.upload_speed}
@ -120,7 +120,7 @@ lib_deps =
${common_env_data.lib_deps} ${common_env_data.lib_deps}
${common_env_data.lib_deps32} ${common_env_data.lib_deps32}
lib_ignore = lib_ignore =
board = featheresp32 board = wemos_d1_mini32
build_type = release build_type = release
board_build.partitions = part32.csv board_build.partitions = part32.csv
board_build.filesystem = littlefs board_build.filesystem = littlefs
@ -134,7 +134,40 @@ board_build.embed_txtfiles =
html/index.min.htm html/index.min.htm
html/test.min.htm html/test.min.htm
[env:gravity32-c3-release] [env:gravity32c3-release]
framework = arduino
platform = ${common_env_data.platform32}
upload_speed = 115200
monitor_speed = ${common_env_data.monitor_speed}
extra_scripts = ${common_env_data.extra_scripts}
build_unflags =
${common_env_data.build_unflags}
build_flags =
-Wl,-Map,output.map
${common_env_data.build_flags}
-DLOG_LEVEL=5
-DCORE_DEBUG_LEVEL=0
-DESP32C3
-DARDUINO_ESP32C3_DEV
lib_deps =
${common_env_data.lib_deps}
${common_env_data.lib_deps32}
lib_ignore =
board = lolin_c3_mini
build_type = release
board_build.partitions = part32.csv
board_build.filesystem = littlefs
monitor_filters = esp32_exception_decoder
board_build.embed_txtfiles =
html/calibration.min.htm
html/config.min.htm
html/firmware.min.htm
html/format.min.htm
html/about.min.htm
html/index.min.htm
html/test.min.htm
[env:gravity32c3-debug]
framework = arduino framework = arduino
platform = ${common_env_data.platform32} platform = ${common_env_data.platform32}
upload_speed = 115200 upload_speed = 115200
@ -148,14 +181,24 @@ debug_server =
debug_port = localhost:3333 debug_port = localhost:3333
debug_init_break = break setup debug_init_break = break setup
build_unflags = build_unflags =
-DCFG_DISABLE_LOGGING
-DGYRO_DISABLE_LOGGING
-DCALC_DISABLE_LOGGING
-DHELPER_DISABLE_LOGGING
-DPUSH_DISABLE_LOGGING
-DTSEN_DISABLE_LOGGING
-DWIFI_DISABLE_LOGGING
-DWEB_DISABLE_LOGGING
-DMAIN_DISABLE_LOGGING
${common_env_data.build_unflags} ${common_env_data.build_unflags}
build_flags = build_flags =
-Wl,-Map,output.map -Wl,-Map,output.map
${common_env_data.build_flags} ${common_env_data.build_flags}
-DLOG_LEVEL=5 -DLOG_LEVEL=6
-DCORE_DEBUG_LEVEL=0 -DCORE_DEBUG_LEVEL=0
-DESP32C3 -DESP32C3
-DARDUINO_ESP32C3_DEV -DARDUINO_ESP32C3_DEV
-DCOLLECT_PERFDATA # Collect runtime data for a few defined methods to measure time, dumped to serial and/or influxdb
lib_deps = lib_deps =
${common_env_data.lib_deps} ${common_env_data.lib_deps}
${common_env_data.lib_deps32} ${common_env_data.lib_deps32}
@ -174,7 +217,7 @@ board_build.embed_txtfiles =
html/index.min.htm html/index.min.htm
html/test.min.htm html/test.min.htm
; [env:gravity32-s2-release] ; [env:gravity32s2-release]
; framework = arduino ; framework = arduino
; platform = ${common_env_data.platform32} ; platform = ${common_env_data.platform32}
; upload_speed = 115200 ; upload_speed = 115200

21
script/copy_firmware.py
View File

@ -23,12 +23,6 @@ def after_build(source, target, env):
print( "Copy file : " + source + " -> " + target ) print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target ) shutil.copyfile( source, target )
if name == "gravity-perf" :
target = dir + "/bin/firmware-perf.bin"
source = dir + "/.pio/build/" + name + "/firmware.bin"
print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target )
if name == "gravity32-release" : if name == "gravity32-release" :
target = dir + "/bin/firmware32.bin" target = dir + "/bin/firmware32.bin"
source = dir + "/.pio/build/" + name + "/firmware.bin" source = dir + "/.pio/build/" + name + "/firmware.bin"
@ -40,19 +34,24 @@ def after_build(source, target, env):
print( "Copy file : " + source + " -> " + target ) print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target ) shutil.copyfile( source, target )
if name == "gravity32-perf" : if name == "gravity32c3-release" :
target = dir + "/bin/firmware32-perf.bin" target = dir + "/bin/firmware32c3.bin"
source = dir + "/.pio/build/" + name + "/firmware.bin" source = dir + "/.pio/build/" + name + "/firmware.bin"
print( "Copy file : " + source + " -> " + target ) print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target ) shutil.copyfile( source, target )
if name == "gravity32-c3-release" : target = dir + "/bin/partitions32c3.bin"
target = dir + "/bin/firmware32_c3.bin" source = dir + "/.pio/build/" + name + "/partitions.bin"
print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target )
if name == "gravity32s2-release" :
target = dir + "/bin/firmware32s2.bin"
source = dir + "/.pio/build/" + name + "/firmware.bin" source = dir + "/.pio/build/" + name + "/firmware.bin"
print( "Copy file : " + source + " -> " + target ) print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target ) shutil.copyfile( source, target )
target = dir + "/bin/partitions32_c3.bin" target = dir + "/bin/partitions32s2.bin"
source = dir + "/.pio/build/" + name + "/partitions.bin" source = dir + "/.pio/build/" + name + "/partitions.bin"
print( "Copy file : " + source + " -> " + target ) print( "Copy file : " + source + " -> " + target )
shutil.copyfile( source, target ) shutil.copyfile( source, target )