Merge 79c49a94bb into a30f431b6a

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Dockerfile

@@ -3,9 +3,9 @@
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
-ARG PIO_ENV=native
 
 FROM python:3.13-bookworm AS builder
+ARG PIO_ENV=native
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 

alpine.Dockerfile

@@ -2,11 +2,11 @@
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
-ARG PIO_ENV=native
 
 FROM python:3.13-alpine3.21 AS builder
-
+ARG PIO_ENV=native
 ENV PIP_ROOT_USER_ACTION=ignore
+
 RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
         libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
@@ -39,7 +39,11 @@ RUN apk --no-cache add \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
     && mkdir -p /etc/meshtasticd/ssl
+
+# Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
+# Copy config templates
+COPY ./bin/config.d /etc/meshtasticd/available.d
 
 WORKDIR /var/lib/meshtasticd
 VOLUME /var/lib/meshtasticd

arch/nrf52/nrf52840.ini

@@ -7,7 +7,7 @@ lib_deps =
   ${nrf52_base.lib_deps}
   ${environmental_base.lib_deps}
   # renovate: datasource=git-refs depName=Kongduino-Adafruit_nRFCrypto packageName=https://github.com/Kongduino/Adafruit_nRFCrypto gitBranch=master
-  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/e31a8825ea3300b163a0a3c1ddd5de34e10e1371.zip
+  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/5f838d2709461a2c981f642917aa50254a25c14c.zip
 
 ; Common NRF52 debugging settings follow.  See the Meshtastic developer docs for how to connect SWD debugging probes to your board.
 

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <component type="desktop-application">
   <id>org.meshtastic.meshtasticd</id>
 
@@ -87,13 +87,13 @@
   </screenshots>
 
   <releases>
-    <release version="2.6.6">
+    <release version="2.6.6" date="2025-04-15">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.6</url>
     </release>
-    <release version="2.6.5" date="2025-04-09">
+    <release version="2.6.5" date="2025-03-30">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.5</url>
     </release>
-    <release version="2.6.4" date="2025-03-29">
+    <release version="2.6.4" date="2025-03-28">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.4</url>
     </release>
   </releases>

meshtasticd.spec.rpkg

@@ -42,6 +42,10 @@ BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)
 BuildRequires: pkgconfig(libyder)
 BuildRequires: pkgconfig(libulfius)
+# TFT components:
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(libinput)
+BuildRequires: pkgconfig(xkbcommon-x11)
 
 %description
 Meshtastic daemon for controlling Meshtastic devices. Meshtastic is an off-grid
@@ -55,12 +59,12 @@ tar -xf %{SOURCE1} -C web
 gzip -dr web
 
 %build
-# Use the “native” environment from platformio to build a Linux binary
+# Use the “native-tft” environment from platformio to build a Linux binary
-platformio run -e native
+platformio run -e native-tft
 
 %install
 mkdir -p %{buildroot}%{_sbindir}
-install -m 0755 .pio/build/native/program %{buildroot}%{_sbindir}/meshtasticd
+install -m 0755 .pio/build/native-tft/program %{buildroot}%{_sbindir}/meshtasticd
 
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd
 install -m 0644 bin/config-dist.yaml %{buildroot}%{_sysconfdir}/meshtasticd/config.yaml

platformio.ini

@@ -108,7 +108,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/da8fb5eaac7874c31508fad5252999ec82c02498.zip
+	https://github.com/meshtastic/device-ui/archive/65eb74fadf373e3ceec0bddb95a7cb978e2acd81.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)

src/modules/Telemetry/AirQualityTelemetry.cpp

@@ -14,6 +14,13 @@
 #include "main.h"
 #include <Throttle.h>
 
+#ifndef PMSA003I_WARMUP_MS
+// from the PMSA003I datasheet:
+// "Stable data should be got at least 30 seconds after the sensor wakeup
+// from the sleep mode because of the fan’s performance."
+#define PMSA003I_WARMUP_MS 30000
+#endif
+
 int32_t AirQualityTelemetryModule::runOnce()
 {
     /*
@@ -34,6 +41,13 @@ int32_t AirQualityTelemetryModule::runOnce()
 
         if (moduleConfig.telemetry.air_quality_enabled) {
             LOG_INFO("Air quality Telemetry: init");
+
+#ifdef PMSA003I_ENABLE_PIN
+            // put the sensor to sleep on startup
+            pinMode(PMSA003I_ENABLE_PIN, OUTPUT);
+            digitalWrite(PMSA003I_ENABLE_PIN, LOW);
+#endif /* PMSA003I_ENABLE_PIN */
+
             if (!aqi.begin_I2C()) {
 #ifndef I2C_NO_RESCAN
                 LOG_WARN("Could not establish i2c connection to AQI sensor. Rescan");
@@ -63,21 +77,45 @@ int32_t AirQualityTelemetryModule::runOnce()
         if (!moduleConfig.telemetry.air_quality_enabled)
             return disable();
 
-        if (((lastSentToMesh == 0) ||
+        switch (state) {
-             !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+#ifdef PMSA003I_ENABLE_PIN
-                                                               moduleConfig.telemetry.air_quality_interval,
+            case State::IDLE:
-                                                               default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
+                // sensor is in standby; fire it up and sleep
-            airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+                LOG_DEBUG("runOnce(): state = idle");
-            airTime->isTxAllowedAirUtil()) {
+                digitalWrite(PMSA003I_ENABLE_PIN, HIGH);
-            sendTelemetry();
+                state = State::ACTIVE;
-            lastSentToMesh = millis();
+
-        } else if (service->isToPhoneQueueEmpty()) {
+                return PMSA003I_WARMUP_MS;
-            // Just send to phone when it's not our time to send to mesh yet
+#endif /* PMSA003I_ENABLE_PIN */
-            // Only send while queue is empty (phone assumed connected)
+            case State::ACTIVE:
-            sendTelemetry(NODENUM_BROADCAST, true);
+                // sensor is already warmed up; grab telemetry and send it
+                LOG_DEBUG("runOnce(): state = active");
+
+                if (((lastSentToMesh == 0) ||
+                    !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+                                                                    moduleConfig.telemetry.air_quality_interval,
+                                                                    default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
+                    airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+                    airTime->isTxAllowedAirUtil()) {
+                    sendTelemetry();
+                    lastSentToMesh = millis();
+                } else if (service->isToPhoneQueueEmpty()) {
+                    // Just send to phone when it's not our time to send to mesh yet
+                    // Only send while queue is empty (phone assumed connected)
+                    sendTelemetry(NODENUM_BROADCAST, true);
+                }
+
+#ifdef PMSA003I_ENABLE_PIN
+                // put sensor back to sleep
+                digitalWrite(PMSA003I_ENABLE_PIN, LOW);
+                state = State::IDLE;
+#endif /* PMSA003I_ENABLE_PIN */
+
+                return sendToPhoneIntervalMs;
+            default:
+                return disable();
         }
     }
-    return sendToPhoneIntervalMs;
 }
 
 bool AirQualityTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)

src/modules/Telemetry/AirQualityTelemetry.h

@@ -23,6 +23,14 @@ class AirQualityTelemetryModule : private concurrency::OSThread, public Protobuf
         setIntervalFromNow(10 * 1000);
         aqi = Adafruit_PM25AQI();
         nodeStatusObserver.observe(&nodeStatus->onNewStatus);
+
+#ifdef PMSA003I_ENABLE_PIN
+        // the PMSA003I sensor uses about 300mW on its own; support powering it off when it's not actively taking
+        // a reading
+        state = State::IDLE;
+#else
+        state = State::ACTIVE;
+#endif
     }
 
   protected:
@@ -42,6 +50,12 @@ class AirQualityTelemetryModule : private concurrency::OSThread, public Protobuf
     bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
 
   private:
+    enum State {
+      IDLE = 0,
+      ACTIVE = 1,
+    };
+
+    State state;
     Adafruit_PM25AQI aqi;
     PM25_AQI_Data data = {0};
     bool firstTime = true;