Merge 974ae821d7 into a30f431b6a

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

alpine.Dockerfile

@@ -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.
 

arch/portduino/portduino.ini

@@ -39,6 +39,7 @@ build_flags =
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
+  -DNXP_WIRE=Wire
   -DHAS_UDP_MULTICAST
   -lpthread
   -lstdc++fs

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

@@ -71,6 +71,8 @@ lib_deps =
 	nanopb/Nanopb@0.4.91
 	# renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32
 	erriez/ErriezCRC32@1.0.1
+	https://github.com/meshtastic/SE05X#031f8feccae62689ebbd06914b44bd88547535af
+
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck

src/detect/ScanI2CTwoWire.cpp

@@ -1,8 +1,8 @@
 #include "ScanI2CTwoWire.h"
 
 #if !MESHTASTIC_EXCLUDE_I2C
-
 #include "concurrency/LockGuard.h"
+#include <SE05X.h>
 #if defined(ARCH_PORTDUINO)
 #include "linux/LinuxHardwareI2C.h"
 #endif
@@ -492,6 +492,10 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 if (len == 5 && memcmp(expectedInfo, info, len) == 0) {
                     LOG_INFO("NXP SE050 crypto chip found");
                     type = NXP_SE050;
+                    if (SE05X.begin()) {
+                        LOG_INFO("NXP Random %u", SE05X.random(65535));
+                        LOG_INFO("NXP Serial Number: %s", SE05X.serialNumber().c_str());
+                    }
 
                 } else {
                     LOG_INFO("FT6336U touchscreen found");

variants/rak4631/platformio.ini

@@ -12,6 +12,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
+  -DNXP_WIRE=Wire
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}