Merge branch 'RAK12035VB' of https://github.com/fifieldt/meshtastic-firmware into pr/6259

2025-06-16 01:52:04 +00:00 · 2025-03-10 19:39:19 -06:00 · 2025-03-10 19:39:19 -06:00 · 3200102342
commit 3200102342
parent b0ecfb86f8 0c41f90ef5
12 changed files with 44 additions and 25 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,5 @@
 * text=auto eol=lf
 *.{cmd,[cC][mM][dD]} text eol=crlf
 *.{bat,[bB][aA][tT]} text eol=crlf
+*.{ps1,[pP][sS]} text eol=crlf
 *.{sh,[sS][hH]} text eol=lf
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -7,5 +7,8 @@
  "cmake.configureOnOpen": false,
  "[cpp]": {
    "editor.defaultFormatter": "trunk.io"
+  },
+  "[powershell]": {
+    "editor.defaultFormatter": "ms-vscode.powershell"
  }
 }
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@ -20,7 +20,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
 ECHO.
 ECHO Options:
-ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@ -30,7 +30,7 @@ ECHO                      If not supplied the script will try to find esptool in
 ECHO     --web            Enable WebUI. (default: false)
 ECHO.
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f littlefs-unphone-2.6.0.0b106d4.bin -p COM11 --web
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
 GOTO eof

 :version
@ -60,16 +60,20 @@ IF "__!FILENAME!__"=="____" (
    CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
    GOTO help
 ) ELSE (
+    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
    IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
        GOTO help
    )
+    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
+        GOTO help
+    )
    @REM Remove ".\" or "./" file prefix if present.
    SET "FILENAME=!FILENAME:.\=!"
    SET "FILENAME=!FILENAME:./=!"
 )

-CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
 CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
 IF NOT EXIST !FILENAME! (
    CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@ -29,7 +29,7 @@ Flash image file to device, but first erasing and writing system information.
    -h               Display this help and exit.
    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
    -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
    --web            Enable WebUI. (Default: false)

 EOF
@ -73,6 +73,11 @@ done
 	shift
 }

+if [[ $FILENAME != firmware-* ]]; then
+  echo "Filename must be a firmware-* file."
+  exit 1
+fi
+
 # Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
 if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
 	TFT_BUILD=true
--- a/bin/device-install_test.ps1
+++ b/bin/device-install_test.ps1
@ -25,10 +25,10 @@ param()
 function New-EmptyFile() {
    [CmdletBinding()]
    param (
-        [Parameter(Position=0,Mandatory=$true)]
+        [Parameter(Position = 0, Mandatory = $true)]
        # Specifies the file name.
        [string]$FileName,
-        [Parameter(Position=1)]
+        [Parameter(Position = 1)]
        # Specifies the target path. (Get-Location).Path is the default.
        [string]$Directory = (Get-Location).Path
    )
@ -42,10 +42,10 @@ function New-EmptyFile() {
 function Remove-EmptyFile() {
    [CmdletBinding()]
    param (
-        [Parameter(Position=0,Mandatory=$true)]
+        [Parameter(Position = 0, Mandatory = $true)]
        # Specifies the file name.
        [string]$FileName,
-        [Parameter(Position=1)]
+        [Parameter(Position = 1)]
        # Specifies the target path. (Get-Location).Path is the default.
        [string]$Directory = (Get-Location).Path
    )
@ -60,14 +60,14 @@ function Remove-EmptyFile() {
 $TestCases = New-Object -TypeName PSObject -Property @{
    # Use this PSObject to define testcases according to this syntax:
    # "testname" = @("firmware-testname","bleota","littlefs-testname","args")
-    "t-deck" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin","")
-    "t-deck_web" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin","--web")
-    "t-deck-tft" = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin","")
-    "heltec-ht62-esp32c3" = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin","")
-    "tlora-c6" = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin","")
-    "heltec-v3_web" = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin","--web")
-    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin","")
-    "picomputer-s3-tft" = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin","")
+    "t-deck"                       = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin", "")
+    "t-deck_web"                   = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin", "--web")
+    "t-deck-tft"                   = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin", "")
+    "heltec-ht62-esp32c3"          = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "")
+    "tlora-c6"                     = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin", "")
+    "heltec-v3_web"                = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin", "--web")
+    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "")
+    "picomputer-s3-tft"            = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin", "")
 }

 foreach ($TestCase in $TestCases.PSObject.Properties) {
@ -90,7 +90,8 @@ foreach ($TestCase in $TestCases.PSObject.Properties) {
        if ($Line -match "Set OTA_OFFSET to" -or `
                $Line -match "Set SPIFFS_OFFSET to") {
            Write-Host -Object "$($Line -replace "^.*?Set","Set")" -ForegroundColor Blue
-        } elseif ($VerbosePreference -eq "Continue") {
+        }
+        elseif ($VerbosePreference -eq "Continue") {
            Write-Host -Object $Line
        }
        if ($Line -match "ERROR") {
@ -100,7 +101,7 @@ foreach ($TestCase in $TestCases.PSObject.Properties) {
    }
    if ($null -ne $Errors) {
        Write-Host -Object "$Counter ERROR(s) detected!" -ForegroundColor Red
-        if (-not ($VerbosePreference -eq "Continue")) {Write-Host -Object $Errors}
+        if (-not ($VerbosePreference -eq "Continue")) { Write-Host -Object $Errors }
    }

    foreach ($File in $Files) {
--- a/platformio.ini
+++ b/platformio.ini
@ -94,7 +94,7 @@ lib_deps =

 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#d7b18e98704f988fcda9e5fa7404e677b3d11f8c
+	https://github.com/meshtastic/device-ui.git#74e739ed4532ca10393df9fc89ae5a22f0bab2b1

 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1226,8 +1226,12 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
 #if MESHTASTIC_EXCLUDE_AUDIO
    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AUDIO_CONFIG;
 #endif
-#if !HAS_SCREEN || NO_EXT_GPIO
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG | meshtastic_ExcludedModules_EXTNOTIF_CONFIG;
+// Option to explicitly include canned messages for edge cases, e.g. niche graphics
+#if (!HAS_SCREEN && NO_EXT_GPIO) && !MESHTASTIC_INCLUDE_CANNEDMSG
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG;
+#endif
+#if NO_EXT_GPIO
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_EXTNOTIF_CONFIG;
 #endif
 // Only edge case here is if we apply this a device with built in Accelerometer and want to detect interrupts
 // We'll have to macro guard against those targets potentially
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@ -39,6 +39,7 @@ build_flags =
  -D INPUTDRIVER_ENCODER_BTN=0
  -D INPUTDRIVER_BUTTON_TYPE=0
  -D MAX_NUM_NODES=250
+  -D HAS_SDCARD
  -D HAS_SCREEN=0
  -D HAS_TFT=1
  -D USE_I2S_BUZZER
--- a/variants/t-deck/variant.h
+++ b/variants/t-deck/variant.h
@ -42,7 +42,7 @@
 #define GPS_TX_PIN 43

 // Have SPI interface SD card slot
-#define HAS_SDCARD 1
+// #define HAS_SDCARD // --> needs to be in platform.ini for device-ui
 #define SPI_MOSI (41)
 #define SPI_SCK (40)
 #define SPI_MISO (38)
--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@ -46,6 +46,7 @@ build_flags =
  -D MAX_THREADS=40
  -D HAS_SCREEN=0
  -D HAS_TFT=1
+  -D HAS_SDCARD
  -D DISPLAY_SET_RESOLUTION
  -D RAM_SIZE=3072
 	-D LV_LVGL_H_INCLUDE_SIMPLE
--- a/variants/unphone/variant.h
+++ b/variants/unphone/variant.h
@ -48,7 +48,6 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN

-#define HAS_SDCARD 1
 #define SD_SPI_FREQUENCY 25000000
 #define SDCARD_CS 43

--- a/version.properties
+++ b/version.properties
@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 0
+build = 1