diff --git a/arch/stm32/stm32wl5e.ini b/arch/stm32/stm32wl5e.ini index 4d5cee56..b610bf40 100644 --- a/arch/stm32/stm32wl5e.ini +++ b/arch/stm32/stm32wl5e.ini @@ -4,11 +4,11 @@ board = generic_wl5e framework = arduino build_type = debug -build_flags = +build_flags = ${arduino_base.build_flags} -Isrc/platform/stm32wl -g -build_src_filter = +build_src_filter = ${arduino_base.build_src_filter} - - - - - - - - - - - - - - lib_deps = @@ -16,5 +16,5 @@ lib_deps = jgromes/RadioLib@^6.0.0 https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b -lib_ignore = - mathertel/OneButton@^2.0.3 +lib_ignore = + https://github.com/mathertel/OneButton#2.1.0 diff --git a/platformio.ini b/platformio.ini index 2040b75c..f7af9631 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,7 +31,7 @@ extra_configs = variants/*/platformio.ini [env] -extra_scripts = bin/platformio-custom.py +extra_scripts = bin/platformio-custom.py ; note: we add src to our include search path so that lmic_project_config can override ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important. We don't use custom fields and somewhere in that pile @@ -39,8 +39,8 @@ extra_scripts = bin/platformio-custom.py ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc ; The Radiolib stuff will speed up building considerably. Exclud all the stuff we dont need. build_flags = -Wno-missing-field-initializers - -Wno-format - -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map + -Wno-format + -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map -DUSE_THREAD_NAMES -DTINYGPS_OPTION_NO_CUSTOM_FIELDS -DPB_ENABLE_MALLOC=1 @@ -59,8 +59,8 @@ build_flags = -Wno-missing-field-initializers monitor_speed = 115200 lib_deps = - https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306 - mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce + https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306 + https://github.com/mathertel/OneButton#2.1.0 ; OneButton library for non-blocking button debounce https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159 https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4 https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3 @@ -87,14 +87,14 @@ lib_deps = build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0 build_src_filter = ${env.build_src_filter} - -; Common libs for communicating over TCP/IP networks such as MQTT +; Common libs for communicating over TCP/IP networks such as MQTT [networking_base] lib_deps = knolleary/PubSubClient@^2.8 arduino-libraries/NTPClient@^3.1.0 arcao/Syslog@^2.0.0 -; Common libs for environmental measurements in telemetry module +; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) [environmental_base] lib_deps =