Upgrade trunk

.trunk/trunk.yaml

@@ -4,7 +4,7 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.8
+      ref: v1.6.7
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
@@ -16,7 +16,7 @@ lint:
     - terrascan@1.19.9
     - trivy@0.61.0
     - taplo@0.9.3
-    - ruff@0.11.5
+    - ruff@0.11.4
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4

arch/portduino/portduino.ini

@@ -47,5 +47,4 @@ build_flags =
   -lyaml-cpp
   -li2c
   -luv
-  -std=gnu17
   -std=c++17

bin/device-install.bat

@@ -17,8 +17,8 @@ SET "LOGCOUNTER=0"
 SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 SET "C3=esp32c3"
 @REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite"
 
 GOTO getopts
 :help

bin/device-install.sh

@@ -22,6 +22,7 @@ BIGDB_8MB=(
 	"icarus"
 	"seeed-xiao-s3"
 	"tbeam-s3-core"
+	"t-watch-s3"
 	"tracksenger"
 )
 BIGDB_16MB=(
@@ -33,7 +34,6 @@ BIGDB_16MB=(
 	"m5stack-cores3"
 	"station-g2"
 	"t-eth-elite"
-	"t-watch-s3"
 )
 S3_VARIANTS=(
 	"s3"

bin/org.meshtastic.meshtasticd.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Meshtastic
-Comment=Meshtastic App
-Exec=meshtasticd
-Icon=org.meshtastic.meshtasticd
-Terminal=true
-Type=Application
-Categories=Network;Chat;HamRadio;

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>org.meshtastic.meshtasticd</id>
-
-  <name>Meshtastic</name>
-  <summary>Decentralized mesh communication</summary>
-
-  <metadata_license>CC-BY-4.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
-
-  <developer id="org.meshtastic">
-    <name>Meshtastic</name>
-  </developer>
-
-  <description>
-    <p>
-      Meshtastic is an open source project for creating off-grid, affordable, and resilient communication with LoRa mesh networks.
-    </p>
-  </description>
-
-  <launchable type="desktop-id">org.meshtastic.meshtasticd.desktop</launchable>
-
-  <categories>
-    <category>Network</category>
-    <category>Chat</category>
-    <category>HamRadio</category>
-  </categories>
-  <keywords>
-    <keyword>mesh</keyword>
-    <keyword>LoRa</keyword>
-  </keywords>
-
-  <recommends>
-    <control>keyboard</control>
-    <control>pointing</control>
-    <control>touch</control>
-  </recommends>
-  <requires>
-    <display_length compare="ge">360</display_length>
-  </requires>
-
-  <branding>
-    <color type="primary" scheme_preference="light">#97be89</color>
-    <color type="primary" scheme_preference="dark">#206538</color>
-  </branding>
-
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-chat">intense</content_attribute>
-    <content_attribute id="social-location">intense</content_attribute>
-  </content_rating>
-
-  <url type="bugtracker">https://github.com/meshtastic/firmware/issues</url>
-  <url type="homepage">https://meshtastic.org/</url>
-  <url type="donation">https://opencollective.com/meshtastic</url>
-  <url type="faq">https://meshtastic.org/docs/software/linux/usage/</url>
-  <url type="vcs-browser">https://github.com/meshtastic/firmware/</url>
-
-  <screenshots>
-    <screenshot type="default">
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_home_dashboard_dark.webp</image>
-      <caption>Home Dashboard</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_initial_boot.webp</image>
-      <caption>Setup</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_node_list_dark.webp</image>
-      <caption>Nodes List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_list_dark.webp</image>
-      <caption>Chats List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_message_dark.webp</image>
-      <caption>Messages</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_map_dark.webp</image>
-      <caption>Map</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_settings_dark.webp</image>
-      <caption>Settings</caption>
-    </screenshot>
-  </screenshots>
-
-  <releases>
-    <release version="v2.6.4.b89355f" date="2025-04-10">
-      <url type="details">https://github.com/meshtastic/firmware/releases/tag/v2.6.4.b89355f</url>
-    </release>
-  </releases>
-</component>

bin/org.meshtastic.meshtasticd.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512" height="512" viewBox="0 0 512 512" xml:space="preserve">
-<desc>Created with Fabric.js 4.6.0</desc>
-<defs>
-</defs>
-<g transform="matrix(1 0 0 1 256 256)" id="xYQ9Gk9Jwpgj_HMOXB3F_"  >
-<path style="stroke: rgb(213,130,139); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(103,234,148); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-256, -256)" d="M 0 0 L 512 0 L 512 512 L 0 512 z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.79 0 0 1.79 313.74 258.36)" id="1xBsk2n9FZp60Rz1O-ceJ"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-250.97, -362.41)" d="M 250.908 330.267 L 193.126 415.005 L 180.938 406.694 L 244.802 313.037 C 246.174 311.024 248.453 309.819 250.889 309.816 C 253.326 309.814 255.606 311.015 256.982 313.026 L 320.994 406.536 L 308.821 414.869 L 250.908 330.267 Z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.81 0 0 1.81 145 256.15)" id="KxN7E9YpbyPgz0S4z4Cl6"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-115.14, -528.06)" d="M 87.642 581.398 L 154.757 482.977 L 142.638 474.713 L 75.523 573.134 L 87.642 581.398 Z" stroke-linecap="round" />
-</g>
-</svg>

boards/t-watch-s3.json

@@ -24,16 +24,16 @@
     "mcu": "esp32s3",
     "variant": "t-watch-s3"
   },
-  "connectivity": ["wifi", "bluetooth", "lora"],
+  "connectivity": ["wifi", "bluetooth"],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
   "frameworks": ["arduino"],
   "name": "LilyGo T-Watch 2020 V3",
   "upload": {
-    "flash_size": "16MB",
+    "flash_size": "8MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
+    "maximum_size": 8388608,
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true,

platformio.ini

@@ -50,7 +50,6 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
   	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
-	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
         #-DBUILD_EPOCH=$UNIX_TIME
         #-D OLED_PL=1
 
@@ -108,7 +107,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/3cdb8a63039aa2cf426104ab02656996730f79fa.zip
+	https://github.com/meshtastic/device-ui/archive/acf343b73cedbdcd5838ba1407c054974a0b6914.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)

src/modules/GenericThreadModule.cpp

@@ -1,28 +0,0 @@
-#include "GenericThreadModule.h"
-#include "MeshService.h"
-#include "configuration.h"
-#include <Arduino.h>
-
-/*
-Generic Thread Module allows for the execution of custom code at a set interval.
-*/
-GenericThreadModule *genericThreadModule;
-
-GenericThreadModule::GenericThreadModule() : concurrency::OSThread("GenericThreadModule") {}
-
-int32_t GenericThreadModule::runOnce()
-{
-
-    bool enabled = true;
-    if (!enabled)
-        return disable();
-
-    if (firstTime) {
-        // do something the first time we run
-        firstTime = 0;
-        LOG_INFO("first time GenericThread running");
-    }
-
-    LOG_INFO("GenericThread executing");
-    return (my_interval);
-}

src/modules/GenericThreadModule.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "MeshModule.h"
-#include "concurrency/OSThread.h"
-#include "configuration.h"
-#include <Arduino.h>
-#include <functional>
-
-class GenericThreadModule : private concurrency::OSThread
-{
-    bool firstTime = 1;
-
-  public:
-    GenericThreadModule();
-
-  protected:
-    unsigned int my_interval = 10000; // interval in millisconds
-    virtual int32_t runOnce() override;
-};
-
-extern GenericThreadModule *genericThreadModule;

src/modules/Modules.cpp

@@ -65,10 +65,6 @@
 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_POWER_TELEMETRY
 #include "modules/Telemetry/PowerTelemetry.h"
 #endif
-#if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
-#include "modules/GenericThreadModule.h"
-#endif
-
 #ifdef ARCH_ESP32
 #if defined(USE_SX1280) && !MESHTASTIC_EXCLUDE_AUDIO
 #include "modules/esp32/AudioModule.h"
@@ -135,9 +131,6 @@ void setupModules()
 
 #if !MESHTASTIC_EXCLUDE_DROPZONE
         dropzoneModule = new DropzoneModule();
-#endif
-#if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
-        new GenericThreadModule();
 #endif
         // Note: if the rest of meshtastic doesn't need to explicitly use your module, you do not need to assign the instance
         // to a global variable.

variants/ec_catsniffer/platformio.ini

@@ -1,15 +0,0 @@
-[env:catsniffer]
-extends = rp2040_base
-board = rpipico
-upload_protocol = picotool
-
-build_flags = ${rp2040_base.build_flags} 
-  -DRPI_PICO
-  -Ivariants/ec_catsniffer
-  -DDEBUG_RP2040_PORT=Serial
-  # -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
-lib_deps =
-  ${rp2040_base.lib_deps}
-debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap

variants/ec_catsniffer/variant.cpp

@@ -1,39 +0,0 @@
-/*
-  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 "wiring_constants.h"
-#include "wiring_digital.h"
-
-#define CTF1 8
-#define CTF2 9
-#define CTF3 10
-
-void initVariant()
-{
-    // Config the LoRa Switch
-    pinMode(CTF1, OUTPUT);
-    pinMode(CTF2, OUTPUT);
-    pinMode(CTF3, OUTPUT);
-
-    digitalWrite(CTF1, HIGH);
-    digitalWrite(CTF2, LOW);
-    digitalWrite(CTF3, LOW);
-}

variants/ec_catsniffer/variant.h

@@ -1,41 +0,0 @@
-// #define RADIOLIB_CUSTOM_ARDUINO 1
-// #define RADIOLIB_TONE_UNSUPPORTED 1
-// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
-
-#define ARDUINO_ARCH_AVR
-
-#define HAS_SCREEN 0
-#define HAS_GPS 0
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-
-#define LED_PIN 27
-
-#define USE_SX1262
-
-#undef LORA_SCK
-#undef LORA_MISO
-#undef LORA_MOSI
-#undef LORA_CS
-
-#define LORA_SCK 18
-#define LORA_MISO 16
-#define LORA_MOSI 19
-#define LORA_CS 17 // NSS
-
-#define LORA_DIO0 5
-#define LORA_RESET 24
-#define LORA_DIO1 4
-#define LORA_DIO2 23
-#define LORA_DIO3 25
-#define SX126X_RXEN 21
-#define SX126X_TXEN 20
-
-#ifdef USE_SX1262
-#define SX126X_CS LORA_CS
-#define SX126X_DIO1 LORA_DIO0
-#define SX126X_BUSY LORA_DIO1
-#define SX126X_RESET LORA_RESET
-// #define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 0
-#endif

variants/t-watch-s3/platformio.ini

@@ -3,7 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
-board_build.partitions = default_16MB.csv
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}