Merge branch 'develop' into t-watch-ultra

2026-01-29 21:22:03 +00:00 · 2026-01-18 23:26:31 +01:00
parent b905766c6a 49accefd8b
commit e8153ca6c2
124 changed files with 2440 additions and 518 deletions
--- a/variants/esp32/esp32-common.ini
+++ b/variants/esp32/esp32-common.ini
@@ -49,6 +49,7 @@ build_flags =
  -DLIBPAX_BLE
  -DHAS_UDP_MULTICAST=1
  ;-DDEBUG_HEAP
+  -DCAN_RECLOCK_I2C

 lib_deps =
  ${arduino_base.lib_deps}
@@ -65,8 +66,6 @@ lib_deps =
  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
  rweather/Crypto@0.4.0

--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -5,4 +5,5 @@ extends = esp32_common
 custom_esp32_kind = esp32

 build_flags =
-  ${esp32_common.build_flags}
+  ${esp32_common.build_flags}
+  -DMESHTASTIC_EXCLUDE_AUDIO=1
--- a/variants/esp32/heltec_wireless_bridge/platformio.ini
+++ b/variants/esp32/heltec_wireless_bridge/platformio.ini
@@ -1,9 +1,9 @@
 [env:heltec-wireless-bridge]
-;build_type = debug ; to make it possible to step through our jtag debugger 
+;build_type = debug ; to make it possible to step through our jtag debugger
 extends = esp32_base
 board_level = extra
 board = heltec_wifi_lora_32
-build_flags = 
+build_flags =
  ${esp32_base.build_flags}
  -I variants/esp32/heltec_wireless_bridge
  -D HELTEC_WIRELESS_BRIDGE
@@ -13,6 +13,7 @@ build_flags =
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -D MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1
  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
  -D MESHTASTIC_EXCLUDE_EXTERNALNOTIFICATION=1
  -D MESHTASTIC_EXCLUDE_GPS=1
--- a/variants/esp32c3/esp32c3.ini
+++ b/variants/esp32c3/esp32c3.ini
@@ -4,3 +4,8 @@ custom_esp32_kind = esp32c3

 monitor_speed = 115200
 monitor_filters = esp32_c3_exception_decoder
+
+lib_deps =
+  ${esp32_common.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
--- a/variants/esp32s2/esp32s2.ini
+++ b/variants/esp32s2/esp32s2.ini
@@ -12,7 +12,12 @@ build_flags =
  -DHAS_BLUETOOTH=0
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
  -DMESHTASTIC_EXCLUDE_BLUETOOTH
-  
+
+lib_deps =
+  ${esp32_common.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+
 lib_ignore = 
  ${esp32_common.lib_ignore}
  NimBLE-Arduino
--- a/variants/esp32s3/CDEBYTE_EoRa-Hub/pins_arduino.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/pins_arduino.h
@@ -0,0 +1,28 @@
+// Need this file for ESP32-S3
+// No need to modify this file, changes to pins imported from variant.h
+// Most is similar to https://github.com/espressif/arduino-esp32/blob/master/variants/esp32s3/pins_arduino.h
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include <variant.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// Serial
+static const uint8_t TX = UART_TX;
+static const uint8_t RX = UART_RX;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = LORA_CS;
+static const uint8_t SCK = LORA_SCK;
+static const uint8_t MOSI = LORA_MOSI;
+static const uint8_t MISO = LORA_MISO;
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SCL = I2C_SCL;
+static const uint8_t SDA = I2C_SDA;
+
+#endif /* Pins_Arduino_h */
--- a/variants/esp32s3/CDEBYTE_EoRa-Hub/platformio.ini
+++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/platformio.ini
@@ -0,0 +1,8 @@
+[env:CDEBYTE_EoRa-Hub]
+extends = esp32s3_base
+board = CDEBYTE_EoRa-Hub
+board_level = extra
+build_flags =
+  ${esp32s3_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/CDEBYTE_EoRa-Hub
--- a/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h
@@ -0,0 +1,19 @@
+#include "RadioLib.h"
+
+// This is rewritten to match the requirements of the E80-900M2213S
+// The E80 does not conform to the reference Semtech switches(!) and therefore needs a custom matrix.
+// See footnote #3 in "https://www.cdebyte.com/products/E80-900M2213S/2#Pin"
+// RF Switch Matrix SubG RFO_HP_LF / RFO_LP_LF / RFI_[NP]_LF0
+// DIO5 -> RFSW0_V1
+// DIO6 -> RFSW1_V2
+// DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible.
+
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, 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,
+};
--- a/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h
+++ b/variants/esp32s3/CDEBYTE_EoRa-Hub/variant.h
@@ -0,0 +1,50 @@
+// EByte EoRA-Hub
+// Uses E80 (LR1121) LoRa module
+
+#define LED_PIN 35
+
+// Button - user interface
+#define BUTTON_PIN 0 // BOOT button
+
+#define BATTERY_PIN 1
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_MULTIPLIER 103.0 // Calibrated value
+#define ADC_ATTENUATION ADC_ATTEN_DB_0
+#define ADC_CTRL 37
+#define ADC_CTRL_ENABLED LOW
+
+// Display - OLED connected via I2C by the default hardware configuration
+#define HAS_SCREEN 1
+#define USE_SSD1306
+#define I2C_SCL 17
+#define I2C_SDA 18
+
+// UART - The 1mm JST SH connector closest to the USB-C port
+#define UART_TX 43
+#define UART_RX 44
+
+// Peripheral I2C - The 1mm JST SH connector furthest from the USB-C port which follows Adafruit connection standard. There are no
+// pull-up resistors on these lines, the downstream device needs to include them. TODO: test, currently untested
+#define I2C_SCL1 21
+#define I2C_SDA1 10
+
+// Radio
+#define USE_LR1121
+
+#define LORA_SCK 9
+#define LORA_MOSI 10
+#define LORA_MISO 11
+#define LORA_RESET 12
+#define LORA_CS 8
+#define LORA_DIO9 13
+
+// LR1121
+#define LR1121_IRQ_PIN 14
+#define LR1121_NRESET_PIN LORA_RESET
+#define LR1121_BUSY_PIN LORA_DIO9
+#define LR1121_SPI_NSS_PIN LORA_CS
+#define LR1121_SPI_SCK_PIN LORA_SCK
+#define LR1121_SPI_MOSI_PIN LORA_MOSI
+#define LR1121_SPI_MISO_PIN LORA_MISO
+#define LR11X0_DIO3_TCXO_VOLTAGE 1.8
+#define LR11X0_DIO_AS_RF_SWITCH
--- a/variants/esp32s3/ELECROW-ThinkNode-M5/platformio.ini
+++ b/variants/esp32s3/ELECROW-ThinkNode-M5/platformio.ini
@@ -27,6 +27,6 @@ build_flags =

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
  # renovate: datasource=custom.pio depName=PCA9557-arduino packageName=maxpromer/library/PCA9557-arduino
  maxpromer/PCA9557-arduino@1.0.0
--- a/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip

 [env:crowpanel-esp32s3-4-epaper]
 extends = esp32s3_base
@@ -56,7 +56,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip

 [env:crowpanel-esp32s3-2-epaper]
 extends = esp32s3_base
@@ -86,4 +86,4 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
--- a/variants/esp32s3/elecrow_panel/platformio.ini
+++ b/variants/esp32s3/elecrow_panel/platformio.ini
@@ -44,11 +44,10 @@ lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
  earlephilhower/ESP8266Audio@1.9.9
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality
+  earlephilhower/ESP8266SAM@1.1.0
  # renovate: datasource=custom.pio depName=TCA9534 packageName=hideakitai/library/TCA9534
  hideakitai/TCA9534@0.1.1
+  lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality

 [crowpanel_small_esp32s3_base] ; 2.4, 2.8, 3.5 inch
 extends = crowpanel_base
--- a/variants/esp32s3/esp32s3.ini
+++ b/variants/esp32s3/esp32s3.ini
@@ -3,3 +3,8 @@ extends = esp32_common
 custom_esp32_kind = esp32s3

 monitor_speed = 115200
+
+lib_deps =
+  ${esp32_common.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -34,6 +34,17 @@ build_flags =
  -D I2C_SCL1=3

 [env:heltec-v4-tft]
+custom_meshtastic_hw_model = 110
+custom_meshtastic_hw_model_slug = HELTEC_V4
+custom_meshtastic_architecture = esp32-s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = Heltec V4 TFT
+custom_meshtastic_images = heltec_v4.svg
+custom_meshtastic_tags = Heltec
+custom_meshtastic_requires_dfu = true
+custom_meshtastic_partition_scheme = 16MB
+
 extends = heltec_v4_base
 build_flags = 
  ${heltec_v4_base.build_flags} ;-Os
--- a/variants/esp32s3/heltec_vision_master_e213/platformio.ini
+++ b/variants/esp32s3/heltec_vision_master_e213/platformio.ini
@@ -29,7 +29,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 upload_speed = 115200

 [env:heltec-vision-master-e213-inkhud]
--- a/variants/esp32s3/heltec_vision_master_e290/platformio.ini
+++ b/variants/esp32s3/heltec_vision_master_e290/platformio.ini
@@ -32,7 +32,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/448c8538129fde3d02a7cb5e6fc81971ad92547f.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 upload_speed = 115200

 [env:heltec-vision-master-e290-inkhud]
--- a/variants/esp32s3/heltec_wireless_paper/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_paper/platformio.ini
@@ -29,7 +29,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 upload_speed = 115200

 [env:heltec-wireless-paper-inkhud]
--- a/variants/esp32s3/heltec_wireless_paper_v1/platformio.ini
+++ b/variants/esp32s3/heltec_wireless_paper_v1/platformio.ini
@@ -26,5 +26,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 upload_speed = 115200
--- a/variants/esp32s3/t-beam-1w/platformio.ini
+++ b/variants/esp32s3/t-beam-1w/platformio.ini
@@ -1,5 +1,14 @@
 ; LilyGo T-Beam-1W (1 Watt LoRa with external PA)
 [env:t-beam-1w]
+custom_meshtastic_hw_model = 122
+custom_meshtastic_hw_model_slug = TBEAM_1_WATT
+custom_meshtastic_architecture = esp32s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = LILYGO T-Beam 1W
+custom_meshtastic_images = tbeam-1w.svg
+custom_meshtastic_tags = LilyGo
+
 extends = esp32s3_base
 board = t-beam-1w
 board_build.partitions = default_8MB.csv
--- a/variants/esp32s3/t-deck-pro/platformio.ini
+++ b/variants/esp32s3/t-deck-pro/platformio.ini
@@ -29,7 +29,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.4
+  zinggjm/GxEPD2@1.6.5
  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
  https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
--- a/variants/esp32s3/t-watch-s3/variant.h
+++ b/variants/esp32s3/t-watch-s3/variant.h
@@ -53,10 +53,13 @@
 #define HAS_BMA423 1
 #define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor

+#define HAS_GPS 1
 #define GPS_DEFAULT_NOT_PRESENT 1
 #define GPS_BAUDRATE 38400
-#define GPS_RX_PIN 42
-#define GPS_TX_PIN 41
+#define GPS_RX_PIN 41
+#define GPS_TX_PIN 42
+
+#define BUTTON_PIN 0 // only for Plus version

 #define USE_SX1262
 #define USE_SX1268
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -33,7 +33,7 @@ lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
  earlephilhower/ESP8266Audio@1.9.9
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
-  earlephilhower/ESP8266SAM@1.0.1
+  earlephilhower/ESP8266SAM@1.1.0
  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
  adafruit/Adafruit DRV2605 Library@1.2.4
  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
@@ -41,7 +41,7 @@ lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.3
  # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
-  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.1.3.zip
+  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.0.zip
  # TODO renovate
  https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip
  # TODO renovate
--- a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
+++ b/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
@@ -31,7 +31,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip

 [env:tlora-t3s3-epaper-inkhud]
 extends = esp32s3_base, inkhud
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
@@ -33,7 +33,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
  # renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
  khoih-prog/nRF52_PWM@1.0.1
 ;upload_protocol = fs
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/platformio.ini
@@ -0,0 +1,15 @@
+; ThinkNode M4 - Powerbank nrf52840/LR1110 by Elecrow
+[env:thinknode_m4]
+extends = nrf52840_base
+board = ThinkNode-M4
+board_check = true
+debug_tool = jlink
+
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/ELECROW-ThinkNode-M4
+  -DELECROW_ThinkNode_M4
+
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M4>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+  lewisxhe/PCF8563_Library@^1.0.1
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/rfswitch.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/rfswitch.h
@@ -0,0 +1,11 @@
+#include "RadioLib.h"
+
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+    // mode                  DIO5  DIO6
+    {LR11x0::MODE_STBY, {LOW, LOW}},  {LR11x0::MODE_RX, {HIGH, LOW}},
+    {LR11x0::MODE_TX, {HIGH, HIGH}},  {LR11x0::MODE_TX_HP, {LOW, HIGH}},
+    {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
+    {LR11x0::MODE_WIFI, {LOW, LOW}},  END_OF_MODE_TABLE,
+};
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp
@@ -0,0 +1,51 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    pinMode(LED_PAIRING, OUTPUT);
+    ledOff(LED_PAIRING);
+
+    pinMode(Battery_LED_1, OUTPUT);
+    ledOff(Battery_LED_1);
+    pinMode(Battery_LED_2, OUTPUT);
+    ledOff(Battery_LED_2);
+
+    pinMode(Battery_LED_3, OUTPUT);
+    ledOff(Battery_LED_3);
+
+    pinMode(Battery_LED_4, OUTPUT);
+    ledOff(Battery_LED_4);
+}
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h
@@ -0,0 +1,142 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ELECROW_THINKNODE_M4_
+#define _VARIANT_ELECROW_THINKNODE_M4_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define LED_BUILTIN -1
+#define LED_BLUE -1
+#define PIN_LED2 (32 + 9)
+#define LED_PAIRING (13)
+
+#define Battery_LED_1 (15)
+#define Battery_LED_2 (17)
+#define Battery_LED_3 (32 + 2)
+#define Battery_LED_4 (32 + 4)
+
+#define LED_STATE_ON 1
+
+// Button
+#define PIN_BUTTON1 (4)
+
+// Battery ADC
+#define PIN_A0 (2)
+#define BATTERY_PIN PIN_A0
+#define BATTERY_SENSE_SAMPLES 30
+#define ADC_RESOLUTION 14
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#define ADC_MULTIPLIER (2.00F)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+
+#define HAS_SERIAL_BATTERY_LEVEL 1
+#define SERIAL_BATTERY_RX 30
+#define SERIAL_BATTERY_TX 5
+
+static const uint8_t A0 = PIN_A0;
+
+#define PIN_NFC1 (9)
+#define PIN_NFC2 (10)
+
+// I2C
+#define WIRE_INTERFACES_COUNT 1
+#define PIN_WIRE_SDA (23)
+#define PIN_WIRE_SCL (25)
+
+// actually the LORA Radio
+#define PIN_POWER_EN (11)
+
+// charger status
+#define EXT_CHRG_DETECT (32 + 6)
+#define EXT_CHRG_DETECT_VALUE HIGH
+
+// SPI
+#define SPI_INTERFACES_COUNT 1
+#define PIN_SPI_MISO (8)
+#define PIN_SPI_MOSI (7)
+#define PIN_SPI_SCK (6)
+
+#define LORA_RESET (32 + 8)
+#define LORA_DIO1 (12)
+#define LORA_DIO2 (26)
+#define LORA_SCK PIN_SPI_SCK
+#define LORA_MISO PIN_SPI_MISO
+#define LORA_MOSI PIN_SPI_MOSI
+#define LORA_CS (27)
+
+#define USE_LR1110
+#define LR1110_IRQ_PIN LORA_DIO1
+#define LR1110_NRESET_PIN LORA_RESET
+#define LR1110_BUSY_PIN LORA_DIO2
+#define LR1110_SPI_NSS_PIN LORA_CS
+#define LR1110_SPI_SCK_PIN LORA_SCK
+#define LR1110_SPI_MOSI_PIN LORA_MOSI
+#define LR1110_SPI_MISO_PIN LORA_MISO
+
+#define LR11X0_DIO3_TCXO_VOLTAGE 1.6
+#define LR11X0_DIO_AS_RF_SWITCH
+
+// Peripherals on I2C bus. Active Low
+#define VEXT_ENABLE (32)
+#define VEXT_ON_VALUE LOW
+
+// GPS L76K
+#define HAS_GPS 1
+#define GPS_L76K
+#define GPS_BAUDRATE 9600
+#define PIN_GPS_EN (32 + 11)
+#define GPS_EN_ACTIVE LOW
+#define PIN_GPS_RESET (3)
+#define GPS_RESET_MODE HIGH
+#define PIN_GPS_STANDBY (28)
+#define GPS_STANDBY_ACTIVE HIGH
+#define GPS_TX_PIN (32 + 12)
+#define GPS_RX_PIN (32 + 14)
+#define GPS_THREAD_INTERVAL 50
+
+#define PIN_SERIAL1_RX GPS_RX_PIN
+#define PIN_SERIAL1_TX GPS_TX_PIN
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -134,12 +134,14 @@ static const uint8_t A0 = PIN_A0;
 #define BATTERY_SENSE_RESOLUTION_BITS 12
 #define BATTERY_SENSE_RESOLUTION 4096.0
 #undef AREF_VOLTAGE
-#define AREF_VOLTAGE 3.0
-#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define AREF_VOLTAGE 2.4
+#define VBAT_AR_INTERNAL AR_INTERNAL_2_4
 #define ADC_MULTIPLIER (1.75F)

 #define HAS_SOLAR

+#define OCV_ARRAY 4080, 3990, 3935, 3880, 3825, 3770, 3715, 3660, 3605, 3550, 3450
+
 #ifdef __cplusplus
 }
 #endif
--- a/variants/nrf52840/heltec_mesh_pocket/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_pocket/platformio.ini
@@ -38,7 +38,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip

 [env:heltec-mesh-pocket-5000-inkhud]
 extends = nrf52840_base, inkhud
@@ -101,7 +101,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip

 [env:heltec-mesh-pocket-10000-inkhud]
 extends = nrf52840_base, inkhud
--- a/variants/nrf52840/heltec_mesh_solar/platformio.ini
+++ b/variants/nrf52840/heltec_mesh_solar/platformio.ini
@@ -16,7 +16,7 @@ lib_deps =
  # renovate: datasource=git-refs depName=NMIoT-meshsolar packageName=https://github.com/NMIoT/meshsolar gitBranch=main
  https://github.com/NMIoT/meshsolar/archive/dfc5330dad443982e6cdd37a61d33fc7252f468b.zip
  # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.4
+  bblanchon/ArduinoJson@6.21.5

 [env:heltec-mesh-solar]
 custom_meshtastic_hw_model = 108
--- a/variants/nrf52840/meshlink/platformio.ini
+++ b/variants/nrf52840/meshlink/platformio.ini
@@ -47,7 +47,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshlin
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
--- a/variants/nrf52840/rak4631_eth_gw/platformio.ini
+++ b/variants/nrf52840/rak4631_eth_gw/platformio.ini
@@ -36,7 +36,7 @@ lib_deps =
  # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
  https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
  # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.4
+  bblanchon/ArduinoJson@6.21.5
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
 ;upload_protocol = jlink
--- a/variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
+++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
@@ -34,7 +34,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_w
 lib_deps =
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 debug_tool = jlink

 [env:seeed_wio_tracker_L1_eink-inkhud]
--- a/variants/nrf52840/t-echo/platformio.ini
+++ b/variants/nrf52840/t-echo/platformio.ini
@@ -30,7 +30,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo>
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
-  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.3
 ;upload_protocol = fs
--- a/variants/stm32/CDEBYTE_E77-MBL/platformio.ini
+++ b/variants/stm32/CDEBYTE_E77-MBL/platformio.ini
@@ -13,6 +13,7 @@ build_flags =
  -DPIN_SERIAL1_RX=PB7
  -DPIN_SERIAL1_TX=PB6
  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1
  -DMESHTASTIC_EXCLUDE_I2C=1
  -DMESHTASTIC_EXCLUDE_GPS=1

--- a/variants/stm32/rak3172/platformio.ini
+++ b/variants/stm32/rak3172/platformio.ini
@@ -12,6 +12,7 @@ build_flags =
  -DPIN_WIRE_SDA=PA11
  -DPIN_WIRE_SCL=PA12
  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1
  -DMESHTASTIC_EXCLUDE_I2C=1
  -DMESHTASTIC_EXCLUDE_GPS=1