mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-25 19:27:28 +00:00
Merge branch 'nrf52-power-saving-1' of ssh://github.com/phaseloop/meshtastic-firmware into nrf52-power-saving-1
This commit is contained in:
@@ -2,10 +2,16 @@
|
||||
[esp32_base]
|
||||
extends = arduino_base
|
||||
custom_esp32_kind = esp32
|
||||
custom_mtjson_part =
|
||||
platform =
|
||||
# renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
|
||||
platformio/espressif32@6.11.0
|
||||
|
||||
extra_scripts =
|
||||
${env.extra_scripts}
|
||||
pre:extra_scripts/esp32_pre.py
|
||||
extra_scripts/esp32_extra.py
|
||||
|
||||
build_src_filter =
|
||||
${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
|
||||
|
||||
|
||||
@@ -114,5 +114,5 @@ extends = env:native
|
||||
build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:native.build_flags}
|
||||
; https://docs.platformio.org/en/latest/projectconf/sections/env/options/test/test_testing_command.html
|
||||
test_testing_command =
|
||||
${platformio.build_dir}/${this.__env__}/program
|
||||
${platformio.build_dir}/${this.__env__}/meshtasticd
|
||||
-s
|
||||
|
||||
@@ -64,6 +64,7 @@ extern "C" {
|
||||
#define INPUTDRIVER_ENCODER_UP 26
|
||||
#define INPUTDRIVER_ENCODER_DOWN 4
|
||||
#define INPUTDRIVER_ENCODER_BTN 28
|
||||
#define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 150
|
||||
|
||||
#define CANNED_MESSAGE_MODULE_ENABLE 1
|
||||
|
||||
|
||||
@@ -11,6 +11,10 @@ platform_packages =
|
||||
; Don't renovate toolchain-gccarmnoneeabi
|
||||
platformio/toolchain-gccarmnoneeabi@~1.90301.0
|
||||
|
||||
extra_scripts =
|
||||
${env.extra_scripts}
|
||||
extra_scripts/nrf52_extra.py
|
||||
|
||||
build_type = release
|
||||
build_flags =
|
||||
-include variants/nrf52840/cpp_overrides/lfs_util.h
|
||||
|
||||
@@ -4,11 +4,22 @@ extends = nrf52840_base
|
||||
board = wio-sdk-wm1110
|
||||
|
||||
extra_scripts =
|
||||
${env.extra_scripts}
|
||||
${nrf52840_base.extra_scripts}
|
||||
extra_scripts/disable_adafruit_usb.py
|
||||
|
||||
# Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
|
||||
build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
|
||||
build_unflags =
|
||||
-Ofast
|
||||
-Og
|
||||
-ggdb3
|
||||
-ggdb2
|
||||
-g3
|
||||
-g2
|
||||
-g
|
||||
-g1
|
||||
-g0
|
||||
-DUSBCON
|
||||
-DUSE_TINYUSB
|
||||
build_flags = ${nrf52840_base.build_flags}
|
||||
-Ivariants/nrf52840/wio-sdk-wm1110
|
||||
-Isrc/platform/nrf52/softdevice
|
||||
|
||||
@@ -8,7 +8,7 @@ platform_packages =
|
||||
platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
|
||||
extra_scripts =
|
||||
${env.extra_scripts}
|
||||
post:extra_scripts/extra_stm32.py
|
||||
extra_scripts/stm32_extra.py
|
||||
|
||||
build_type = release
|
||||
|
||||
|
||||
Reference in New Issue
Block a user