Merge branch 'master' into t-deck-pro

2026-01-06 09:57:52 +00:00 · 2025-07-03 12:28:16 +02:00
parent a427b92adf 81828c6244
commit 7a1295e976
95 changed files with 3453 additions and 546 deletions
--- a/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
+++ b/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
@@ -56,7 +56,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(10, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h
+++ b/variants/diy/nrf52_promicro_diy_tcxo/nicheGraphics.h
@@ -55,8 +55,9 @@ void setupNicheGraphics()
    // Set how many FAST updates per FULL update.
    inkhud->setDisplayResilience(INKHUD_BUILDCONF_DISPLAYRESILIENCE); // Suggest roughly ten

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Init settings, and customize defaults
--- a/variants/elecrow_panel/platformio.ini
+++ b/variants/elecrow_panel/platformio.ini
@@ -79,6 +79,7 @@ build_flags =
  -D SPI_FREQUENCY=80000000
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_PANEL=ST7789
  -D LGFX_ROTATION=1
  -D LGFX_CFG_HOST=SPI2_HOST
@@ -103,6 +104,7 @@ build_flags =
  -D SPI_FREQUENCY=60000000
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_PANEL=ILI9488
  -D LGFX_ROTATION=0
  -D LGFX_CFG_HOST=SPI2_HOST
@@ -126,3 +128,4 @@ extends = crowpanel_large_esp32s3_base
 build_flags =
  ${crowpanel_large_esp32s3_base.build_flags}
  -D VIEW_320x240
+  -D DISPLAY_SIZE=800x480 ; landscape mode
--- a/variants/heltec_mesh_node_t114-inkhud/nicheGraphics.h
+++ b/variants/heltec_mesh_node_t114-inkhud/nicheGraphics.h
@@ -56,8 +56,9 @@ void setupNicheGraphics()
    // Set how many FAST updates per FULL update.
    inkhud->setDisplayResilience(INKHUD_BUILDCONF_DISPLAYRESILIENCE); // Suggest roughly ten

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Init settings, and customize defaults
--- a/variants/heltec_mesh_node_t114/variant.h
+++ b/variants/heltec_mesh_node_t114/variant.h
@@ -57,6 +57,9 @@ extern "C" {
 #define TFT_OFFSET_X 0
 #define TFT_OFFSET_Y 0

+// T114 gets a muted yellow on black display
+#define TFT_MESH_OVERRIDE COLOR565(255, 255, 128)
+
 // #define TFT_OFFSET_ROTATION 0
 // #define SCREEN_ROTATE
 // #define SCREEN_TRANSITION_FRAMERATE 5
--- a/variants/heltec_mesh_pocket/nicheGraphics.h
+++ b/variants/heltec_mesh_pocket/nicheGraphics.h
@@ -50,7 +50,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(10, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/heltec_vision_master_e213/nicheGraphics.h
+++ b/variants/heltec_vision_master_e213/nicheGraphics.h
@@ -54,7 +54,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(10, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/heltec_vision_master_e290/nicheGraphics.h
+++ b/variants/heltec_vision_master_e290/nicheGraphics.h
@@ -67,7 +67,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(7, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/heltec_wireless_paper/nicheGraphics.h
+++ b/variants/heltec_wireless_paper/nicheGraphics.h
@@ -51,7 +51,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(10, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/mesh-tab/platformio.ini
+++ b/variants/mesh-tab/platformio.ini
@@ -85,6 +85,7 @@ build_flags = ${mesh_tab_xpt2046.build_flags}
  -D SPI_FREQUENCY=60000000
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_PANEL=ST7789
  -D LGFX_INVERT_COLOR=false
  -D LGFX_ROTATION=3
@@ -97,6 +98,7 @@ build_flags = ${mesh_tab_xpt2046.build_flags}
  -D SPI_FREQUENCY=60000000 ; if image is distorted then lower to 40 MHz
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_PANEL=ILI9341
  -D LGFX_ROTATION=1
  -D LGFX_TOUCH_ROTATION=4
@@ -109,6 +111,7 @@ build_flags = ${mesh_tab_xpt2046.build_flags}
  -D DISPLAY_SET_RESOLUTION
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_PANEL=ILI9488
  -D LGFX_ROTATION=0
  -D LGFX_TOUCH_ROTATION=0
@@ -121,6 +124,7 @@ build_flags = ${mesh_tab_xpt2046.build_flags}
  -D DISPLAY_SET_RESOLUTION
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_PANEL=HX8357B
  -D LGFX_INVERT_COLOR=false
  -D LGFX_ROTATION=4
@@ -133,6 +137,7 @@ build_flags = ${mesh_tab_ft5x06.build_flags}
  -D SPI_FREQUENCY=75000000 ; may go higher upto 60/80 MHz
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_PANEL=ILI9341
  -D LGFX_ROTATION=1
  -D LGFX_TOUCH_X_MIN=0
@@ -149,6 +154,7 @@ build_flags = ${mesh_tab_ft5x06.build_flags}
  -D DISPLAY_SET_RESOLUTION
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_PANEL=ILI9488
  -D LGFX_ROTATION=2
  -D LGFX_TOUCH_X_MIN=0
@@ -165,6 +171,7 @@ build_flags = ${mesh_tab_ft5x06.build_flags}
  -D DISPLAY_SET_RESOLUTION
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_PANEL=HX8357B
  -D LGFX_ROTATION=4
  -D LGFX_TOUCH_X_MIN=0
--- a/variants/picomputer-s3/platformio.ini
+++ b/variants/picomputer-s3/platformio.ini
@@ -44,6 +44,7 @@ build_flags =
  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_DRIVER=LGFX_PICOMPUTER_S3
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_PICOMPUTER_S3.h\"
  -D VIEW_320x240
--- a/variants/picomputer-s3/variant.h
+++ b/variants/picomputer-s3/variant.h
@@ -49,7 +49,7 @@
 #define SCREEN_TRANSITION_FRAMERATE 5

 // Picomputer gets a white on black display
-#define TFT_MESH COLOR565(0xFF, 0xFF, 0xFF)
+#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 #define CANNED_MESSAGE_MODULE_ENABLE 1

--- a/variants/rak3172/platformio.ini
+++ b/variants/rak3172/platformio.ini
@@ -5,6 +5,8 @@ board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 build_flags =
  ${stm32_base.build_flags}
  -Ivariants/rak3172
+  -DPIN_WIRE_SDA=PA11
+  -DPIN_WIRE_SCL=PA12
  -DHAL_DAC_MODULE_ONLY
  -DHAL_RNG_MODULE_ENABLED
  -DRADIOLIB_EXCLUDE_SX128X=1
@@ -18,6 +20,5 @@ build_flags =
  -DMESHTASTIC_EXCLUDE_SCREEN=1
  -DMESHTASTIC_EXCLUDE_MQTT=1
  -DMESHTASTIC_EXCLUDE_POWERMON=1
-  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
  ;-DCFG_DEBUG
 upload_port = stlink
--- a/variants/rak3312/pins_arduino.h
+++ b/variants/rak3312/pins_arduino.h
@@ -0,0 +1,28 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include "variant.h"
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 9;
+static const uint8_t SCL = 40;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 12;
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 10;
+static const uint8_t SCK = 13;
+
+#define SPI_MOSI (11)
+#define SPI_SCK (13)
+#define SPI_MISO (10)
+#define SPI_CS (12)
+
+// LEDs
+#define LED_BUILTIN LED_GREEN
+
+#endif /* Pins_Arduino_h */
--- a/variants/rak3312/platformio.ini
+++ b/variants/rak3312/platformio.ini
@@ -0,0 +1,8 @@
+[env:rak3312]
+extends = esp32s3_base
+board = wiscore_rak3312
+board_check = true
+upload_protocol = esptool
+
+build_flags = 
+  ${esp32_base.build_flags} -D RAK3312 -I variants/rak3312
--- a/variants/rak3312/variant.h
+++ b/variants/rak3312/variant.h
@@ -0,0 +1,44 @@
+#define I2C_SDA 9
+#define I2C_SCL 40
+
+#define USE_SX1262
+
+#define LORA_SCK 5
+#define LORA_MISO 3
+#define LORA_MOSI 6
+#define LORA_CS 7
+#define LORA_RESET 8
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 47
+#define SX126X_BUSY 48
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif
+
+#define SX126X_POWER_EN (4)
+
+#define PIN_POWER_EN PIN_3V3_EN
+#define PIN_3V3_EN (14)
+
+#define LED_GREEN 46
+#define LED_BLUE 45
+
+#define PIN_LED1 LED_GREEN
+#define PIN_LED2 LED_BLUE
+
+#define LED_CONN LED_BLUE
+#define LED_PIN LED_GREEN
+#define ledOff(pin) pinMode(pin, INPUT)
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+#define HAS_GPS 1
+#define GPS_TX_PIN 43
+#define GPS_RX_PIN 44
+
+#define BATTERY_PIN 1
+#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
+#define ADC_MULTIPLIER 1.667
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -55,6 +55,7 @@ build_flags =
  -D CUSTOM_TOUCH_DRIVER
  -D LGFX_SCREEN_WIDTH=480
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=480x480
  -D LGFX_DRIVER=LGFX_INDICATOR
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_INDICATOR.h\"
  -D VIEW_320x240
--- a/variants/seeed_wio_tracker_L1_eink/nicheGraphics.h
+++ b/variants/seeed_wio_tracker_L1_eink/nicheGraphics.h
@@ -57,7 +57,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(7, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
@@ -66,7 +67,6 @@ void setupNicheGraphics()
    inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery
    inkhud->persistence->settings.optionalMenuItems.backlight = true;  // Until proves capacitive button works by touching it
    inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users
-    inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead

    // Setup backlight controller
    // Note: AUX button attached further down
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -54,6 +54,7 @@ build_flags =
 ;  -D CALIBRATE_TOUCH=0
  -D LGFX_SCREEN_WIDTH=240
  -D LGFX_SCREEN_HEIGHT=320
+  -D DISPLAY_SIZE=320x240 ; landscape mode
  -D LGFX_DRIVER=LGFX_TDECK
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_T_DECK.h\"
 ;  -D LVGL_DRIVER=LVGL_TDECK
--- a/variants/t-echo/nicheGraphics.h
+++ b/variants/t-echo/nicheGraphics.h
@@ -57,7 +57,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(20, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/tlora_t3s3_epaper/nicheGraphics.h
+++ b/variants/tlora_t3s3_epaper/nicheGraphics.h
@@ -51,7 +51,8 @@ void setupNicheGraphics()
    inkhud->setDisplayResilience(15, 1.5);

    // Select fonts
-    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
--- a/variants/tracksenger/internal/variant.h
+++ b/variants/tracksenger/internal/variant.h
@@ -72,7 +72,7 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH COLOR565(0xFF, 0xFF, 0xFF)
+#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

--- a/variants/tracksenger/lcd/variant.h
+++ b/variants/tracksenger/lcd/variant.h
@@ -96,7 +96,7 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH COLOR565(0xFF, 0xFF, 0xFF)
+#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

--- a/variants/tracksenger/oled/variant.h
+++ b/variants/tracksenger/oled/variant.h
@@ -74,7 +74,7 @@
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Picomputer gets a white on black display
-#define TFT_MESH COLOR565(0xFF, 0xFF, 0xFF)
+#define TFT_MESH_OVERRIDE COLOR565(255, 255, 255)

 // keyboard changes

--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@@ -56,6 +56,7 @@ build_flags =
  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
  -D LGFX_SCREEN_WIDTH=320
  -D LGFX_SCREEN_HEIGHT=480
+  -D DISPLAY_SIZE=320x480 ; portrait mode
  -D LGFX_DRIVER=LGFX_UNPHONE_V9
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_UNPHONE.h\"
  -D VIEW_320x240
--- a/variants/wio-e5/platformio.ini
+++ b/variants/wio-e5/platformio.ini
@@ -8,20 +8,17 @@ build_flags =
  -DSERIAL_UART_INSTANCE=1
  -DPIN_SERIAL_RX=PB7
  -DPIN_SERIAL_TX=PB6
+  -DPIN_WIRE_SDA=PA15
+  -DPIN_WIRE_SCL=PB15
  -DHAL_DAC_MODULE_ONLY
  -DHAL_RNG_MODULE_ENABLED
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
-  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
-  -DMESHTASTIC_EXCLUDE_I2C=1
-  -DMESHTASTIC_EXCLUDE_WIFI=1
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
-  -DMESHTASTIC_EXCLUDE_GPS=1
-  -DMESHTASTIC_EXCLUDE_SCREEN=1
-  -DMESHTASTIC_EXCLUDE_MQTT=1
-  -DMESHTASTIC_EXCLUDE_POWERMON=1
-  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
-  ;-DCFG_DEBUG
+  -DHAS_SENSOR

-upload_port = stlink
+upload_port = stlink
+
+lib_deps =
+  ${stm32_base.lib_deps}
+  # Add your custom sensor here!