ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-17 00:51:30 +10:00
Code Releases Activity

Merge branch 'develop' into pioarduino

Browse Source
This commit is contained in:
Manuel
2026-04-09 17:02:38 +02:00
committed by GitHub
parent a6f6175535 17945884a5
commit 35e4a877ee
80 changed files with 1423 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/esp32/esp32-common.ini
+2 -3
View File
@@ -36,7 +36,6 @@ build_flags =
-Wall
-Wextra
-Isrc/platform/esp32
-include mbedtls/error.h
-std=gnu++17
-DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
@@ -58,8 +57,8 @@ lib_deps =
${environmental_base.lib_deps}
${environmental_extra.lib_deps}
${radiolib_base.lib_deps}
# TODO renovate
https://github.com/meshtastic/esp32_https_server/archive/e42e0bbca3eaa59672bfb42cda8e53a6f9a2266e.zip
# renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
# renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
h2zero/NimBLE-Arduino@1.4.3
# TODO renovate
variants/esp32/nano-g1-explorer/platformio.ini
+1 -1
View File
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1 Explorer
custom_meshtastic_tags = B&Q
extends = esp32_base
board = ttgo-t-beam
board = ttgo-tbeam
build_flags =
${esp32_base.build_flags}
-D NANO_G1_EXPLORER
variants/esp32/nano-g1/platformio.ini
+1 -1
View File
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1
custom_meshtastic_tags = B&Q
extends = esp32_base
board = ttgo-t-beam
board = ttgo-tbeam
build_flags =
${esp32_base.build_flags}
-D NANO_G1
variants/esp32/station-g1/platformio.ini
+1 -4
View File
@@ -9,10 +9,7 @@ custom_meshtastic_display_name = Station G1
custom_meshtastic_tags = B&Q
extends = esp32_base
board = ttgo-t-beam
build_unflags =
${esp32_common.build_unflags}
-DBOARD_HAS_PSRAM
board = ttgo-tbeam
build_flags =
${esp32_base.build_flags}
-D STATION_G1
variants/esp32/tbeam/platformio.ini
+1 -3
View File
@@ -10,14 +10,12 @@ custom_meshtastic_images = tbeam.svg
custom_meshtastic_tags = LilyGo
extends = esp32_base
board = ttgo-t-beam
board = ttgo-tbeam
board_check = true
build_flags = ${esp32_base.build_flags}
-D TBEAM_V10
-I variants/esp32/tbeam
-DBOARD_HAS_PSRAM
-mfix-esp32-psram-cache-issue
-ULED_BUILTIN
upload_speed = 921600
variants/esp32/tbeam_v07/platformio.ini
+1 -1
View File
@@ -9,7 +9,7 @@ custom_meshtastic_tags = LilyGo
board_level = extra
extends = esp32_base
board = ttgo-t-beam
board = ttgo-tbeam
build_flags =
${esp32_base.build_flags}
-D TBEAM_V07
variants/esp32s3/ELECROW-ThinkNode-M5/variant.cpp
+2 -2
View File
@@ -9,11 +9,11 @@ void earlyInitVariant()
io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
io.pinMode(PCA_LED_POWER, OUTPUT);
io.pinMode(PCA_LED_USER, OUTPUT);
io.pinMode(PCA_LED_NOTIFICATION, OUTPUT);
io.pinMode(PCA_LED_ENABLE, OUTPUT);
io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
io.digitalWrite(PCA_LED_USER, LOW);
io.digitalWrite(PCA_LED_NOTIFICATION, LOW);
io.digitalWrite(PCA_LED_ENABLE, LOW);
}
variants/esp32s3/ELECROW-ThinkNode-M5/variant.h
+5 -4
View File
@@ -8,9 +8,9 @@
// LED
// Both of these are on the GPIO expander
#define PCA_LED_USER 1 // the Blue LED
#define PCA_LED_ENABLE 2 // the power supply to the LEDs, in an OR arrangement with VBUS power
#define PCA_LED_POWER 3 // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
#define PCA_LED_NOTIFICATION 1 // the Blue LED
#define PCA_LED_ENABLE 2 // the power supply to the LEDs, in an OR arrangement with VBUS power
#define PCA_LED_POWER 3 // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
#define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING
// USB_CHECK
@@ -18,7 +18,7 @@
#define BATTERY_PIN 8
#define ADC_CHANNEL ADC_CHANNEL_7
#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
#define ADC_MULTIPLIER 2.0 // 2.0 + 10% for correction of display undervoltage.
#define PIN_BUZZER 9
@@ -86,6 +86,7 @@
#define BUTTON_PIN PIN_BUTTON1
#define BUTTON_PIN_ALT PIN_BUTTON2
#define ALT_BUTTON_WAKE
#define SERIAL_PRINT_PORT 0
#endif
variants/esp32s3/elecrow_panel/platformio.ini
+3
View File
@@ -89,6 +89,7 @@ custom_meshtastic_images = crowpanel_2_4.svg, crowpanel_2_8.svg
custom_meshtastic_tags = Elecrow
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = crowpanel_small_esp32s3_base
build_flags =
@@ -124,6 +125,7 @@ custom_meshtastic_images = crowpanel_3_5.svg
custom_meshtastic_tags = Elecrow
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = crowpanel_small_esp32s3_base
board_level = pr
@@ -163,6 +165,7 @@ custom_meshtastic_images = crowpanel_5_0.svg, crowpanel_7_0.svg
custom_meshtastic_tags = Elecrow
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = crowpanel_large_esp32s3_base
build_flags =
variants/esp32s3/heltec_v4/platformio.ini
+1
View File
@@ -22,6 +22,7 @@ custom_meshtastic_images = heltec_v4.svg
custom_meshtastic_tags = Heltec
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = heltec_v4_base
build_flags =
variants/esp32s3/heltec_vision_master_e213/platformio.ini
+1
View File
@@ -9,6 +9,7 @@ custom_meshtastic_images = heltec-vision-master-e213.svg
custom_meshtastic_tags = Heltec
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 8MB
custom_meshtastic_has_ink_hud = true
extends = esp32s3_base
board = heltec_vision_master_e213
variants/esp32s3/heltec_vision_master_e290/platformio.ini
+1
View File
@@ -10,6 +10,7 @@ custom_meshtastic_images = heltec-vision-master-e290.svg
custom_meshtastic_tags = Heltec
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 8MB
custom_meshtastic_has_ink_hud = true
extends = esp32s3_base
board = heltec_vision_master_e290
variants/esp32s3/heltec_wireless_paper/platformio.ini
+1
View File
@@ -9,6 +9,7 @@ custom_meshtastic_display_name = Heltec Wireless Paper
custom_meshtastic_images = heltec-wireless-paper.svg
custom_meshtastic_tags = Heltec
custom_meshtastic_partition_scheme = 8MB
custom_meshtastic_has_ink_hud = true
extends = esp32s3_base
board = heltec_wifi_lora_32_V3
variants/esp32s3/mesh-tab/platformio.ini
+5 -1
View File
@@ -12,6 +12,7 @@ build_flags = ${esp32s3_base.build_flags}
-D CONFIG_ARDUHAL_ESP_LOG
-D CONFIG_ARDUHAL_LOG_COLORS=1
-D CONFIG_DISABLE_HAL_LOCKS=1
-D MESHTASTIC_EXCLUDE_SCREEN=1
-D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-D MESHTASTIC_EXCLUDE_INPUTBROKER=1
-D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -31,7 +32,10 @@ build_flags = ${esp32s3_base.build_flags}
-D HAS_SCREEN=0
-D HAS_TFT=1
-D USE_PIN_BUZZER
-D RAM_SIZE=1024
-D MAP_TILES_GREY ; required for 2MB PSRAM
-D RAM_SIZE=1432
-D STBI_ARENA_SIZE=450000
-D LV_CACHE_DEF_SIZE=0
-D LGFX_DRIVER_TEMPLATE
-D LGFX_DRIVER=LGFX_GENERIC
-D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
variants/esp32s3/mini-epaper-s3/platformio.ini
+2 -1
View File
@@ -1,5 +1,5 @@
[env:mini-epaper-s3]
;custom_meshtastic_hw_model =
custom_meshtastic_hw_model = 125
custom_meshtastic_hw_model_slug = MINI_EPAPER_S3
custom_meshtastic_architecture = esp32-s3
custom_meshtastic_actively_supported = true
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO Mini ePaper S3 E-Ink
custom_meshtastic_images = mini-epaper-s3.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = no
custom_meshtastic_has_mui = false
extends = esp32s3_base
board = mini-epaper-s3
variants/esp32s3/picomputer-s3/platformio.ini
+1
View File
@@ -6,6 +6,7 @@ custom_meshtastic_actively_supported = true
custom_meshtastic_support_level = 3
custom_meshtastic_display_name = Pi Computer S3
custom_meshtastic_partition_scheme = 8MB
custom_meshtastic_has_mui = true
extends = esp32s3_base
board = bpi_picow_esp32_s3
variants/esp32s3/rak3312/platformio.ini
+1
View File
@@ -9,6 +9,7 @@ custom_meshtastic_images = rak_3312.svg
custom_meshtastic_tags = RAK
custom_meshtastic_requires_dfu = false
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = false
extends = esp32s3_base
board = wiscore_rak3312
variants/esp32s3/rak_wismesh_tap_v2/platformio.ini
+2
View File
@@ -20,6 +20,7 @@ custom_meshtastic_display_name = RAK WisMesh Tap V2
custom_meshtastic_images = rak-wismesh-tap-v2.svg
custom_meshtastic_tags = RAK
custom_meshtastic_partition_scheme = 8MB
custom_meshtastic_has_mui = true
extends = esp32s3_base
board = wiscore_rak3312
@@ -43,6 +44,7 @@ extends = env:rak_wismesh_tap_v2
build_flags =
${env:rak_wismesh_tap_v2.build_flags}
-D MESHTASTIC_EXCLUDE_WEBSERVER=1
-D CONFIG_ARDUHAL_ESP_LOG
-D CONFIG_ARDUHAL_LOG_COLORS=1
-D CONFIG_DISABLE_HAL_LOCKS=1
variants/esp32s3/seeed-sensecap-indicator/platformio.ini
+1 -1
View File
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Seeed SenseCAP Indicator
custom_meshtastic_images = seeed-sensecap-indicator.svg
custom_meshtastic_tags = Seeed
custom_meshtastic_partition_scheme = 8MB
= true
custom_meshtastic_has_mui = true
extends = esp32s3_base
platform_packages =
variants/esp32s3/t-beam-1w/platformio.ini
+1
View File
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
custom_meshtastic_display_name = LILYGO T-Beam 1W
custom_meshtastic_images = tbeam-1w.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_has_mui = false
extends = esp32s3_base
board = t-beam-1w
variants/esp32s3/t-deck-pro/platformio.ini
+1
View File
@@ -9,6 +9,7 @@ custom_meshtastic_images = tdeck_pro.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = false
extends = esp32s3_base
board = t-deck-pro
variants/esp32s3/t-deck/platformio.ini
+1
View File
@@ -10,6 +10,7 @@ custom_meshtastic_images = t-deck.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = esp32s3_base
board = t-deck
variants/esp32s3/t5s3_epaper/platformio.ini
+2
View File
@@ -30,6 +30,8 @@ lib_deps =
[env:t5s3_epaper_inkhud]
extends = t5s3_epaper_base, inkhud
board_level = extra # inkhud port is incomplete
board_check = false
build_flags =
${t5s3_epaper_base.build_flags}
${inkhud.build_flags}
variants/esp32s3/tlora-pager/platformio.ini
+1
View File
@@ -10,6 +10,7 @@ custom_meshtastic_images = lilygo-tlora-pager.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = true
custom_meshtastic_partition_scheme = 16MB
custom_meshtastic_has_mui = true
extends = esp32s3_base
board = t-deck-pro ; same as T-Deck Pro
variants/esp32s3/tlora_t3s3_epaper/platformio.ini
+1
View File
@@ -8,6 +8,7 @@ custom_meshtastic_display_name = LILYGO T-LoRa T3-S3 E-Ink
custom_meshtastic_images = tlora-t3s3-epaper.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = true
custom_meshtastic_has_ink_hud = true
extends = esp32s3_base
board = tlora-t3s3-v1
variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
+1
View File
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
custom_meshtastic_display_name = ThinkNode M1
custom_meshtastic_images = thinknode_m1.svg
custom_meshtastic_tags = Elecrow
custom_meshtastic_has_ink_hud = true
extends = nrf52840_base
board = ThinkNode-M1
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/rfswitch.h
+11 -5
View File
@@ -12,9 +12,15 @@ static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11
RADIOLIB_NC};
static const Module::RfSwitchMode_t rfswitch_table[] = {
// mode DIO5 DIO6 DIO7
{LR11x0::MODE_STBY, {LOW, LOW, LOW}}, {LR11x0::MODE_RX, {LOW, HIGH, LOW}},
{LR11x0::MODE_TX, {HIGH, HIGH, LOW}}, {LR11x0::MODE_TX_HP, {HIGH, LOW, LOW}},
{LR11x0::MODE_TX_HF, {LOW, LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW, HIGH}},
{LR11x0::MODE_WIFI, {LOW, LOW, LOW}}, END_OF_MODE_TABLE,
// clang-format off
// mode DIO5 DIO6 DIO7
{LR11x0::MODE_STBY, {LOW, LOW, LOW}},
{LR11x0::MODE_RX, {LOW, HIGH, LOW}},
{LR11x0::MODE_TX, {HIGH, HIGH, LOW}},
{LR11x0::MODE_TX_HP, {HIGH, LOW, LOW}},
{LR11x0::MODE_TX_HF, {LOW, LOW, LOW}},
{LR11x0::MODE_GNSS, {LOW, LOW, HIGH}},
{LR11x0::MODE_WIFI, {LOW, LOW, LOW}},
END_OF_MODE_TABLE,
// clang-format on
};
variants/nrf52840/heltec_mesh_pocket/platformio.ini
+2
View File
@@ -15,6 +15,7 @@ custom_meshtastic_display_name = Heltec Mesh Pocket
custom_meshtastic_actively_supported = true
custom_meshtastic_variant = 5000mAh
custom_meshtastic_key = heltec_mesh_pocket
custom_meshtastic_has_ink_hud = true
# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
build_flags = ${nrf52840_base.build_flags}
@@ -78,6 +79,7 @@ custom_meshtastic_display_name = Heltec Mesh Pocket
custom_meshtastic_actively_supported = true
custom_meshtastic_variant = 10000mAh
custom_meshtastic_key = heltec_mesh_pocket
custom_meshtastic_has_ink_hud = true
# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
build_flags = ${nrf52840_base.build_flags}
variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
+1
View File
@@ -7,6 +7,7 @@ custom_meshtastic_support_level = 1
custom_meshtastic_display_name = Seeed Wio Tracker L1 E-Ink
custom_meshtastic_images = wio_tracker_l1_eink.svg
custom_meshtastic_tags = Seeed
custom_meshtastic_has_ink_hud = true
board = seeed_wio_tracker_L1
extends = nrf52840_base
variants/nrf52840/t-echo-plus/platformio.ini
+11
View File
@@ -1,4 +1,15 @@
[env:t-echo-plus]
custom_meshtastic_hw_model = 33
custom_meshtastic_hw_model_slug = T_ECHO_PLUS
custom_meshtastic_architecture = nrf52840
custom_meshtastic_actively_supported = true
custom_meshtastic_support_level = 1
custom_meshtastic_display_name = LILYGO T-Echo Plus
custom_meshtastic_images = t-echo_plus.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_requires_dfu = true
custom_meshtastic_has_ink_hud = true
extends = nrf52840_base
board = t-echo
board_level = pr
variants/nrf52840/t-echo/platformio.ini
+1
View File
@@ -8,6 +8,7 @@ custom_meshtastic_support_level = 1
custom_meshtastic_display_name = LILYGO T-Echo
custom_meshtastic_images = t-echo.svg
custom_meshtastic_tags = LilyGo
custom_meshtastic_has_ink_hud = true
extends = nrf52840_base
board = t-echo
variants/nrf52840/wio-sdk-wm1110/platformio.ini
+1
View File
@@ -9,6 +9,7 @@ extra_scripts =
# 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}
-Ofast
-Og
-ggdb3