Merge b6089fcd8f into a30f431b6a

Update Kongduino-Adafruit_nRFCrypto digest to 5f838d2 (#6634 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-04-23 09:06:02 +00:00 · 2025-04-19 18:50:29 +02:00 · 2025-04-19 18:49:05 +02:00 · 2025-04-19 10:56:41 -04:00 · 2025-04-19 00:29:59 -04:00 · 2025-04-18 09:46:16 +02:00
4 changed files with 10 additions and 6 deletions
--- a/alpine.Dockerfile
+++ b/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
--- a/arch/nrf52/nrf52840.ini
+++ b/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.

--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/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>
--- a/src/mesh/api/ServerAPI.h
+++ b/src/mesh/api/ServerAPI.h
@ -43,7 +43,7 @@ template <class T, class U> class APIServerPort : public U, private concurrency:
     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
     */
    T *openAPI = NULL;
-#if RAK_4631
+#if defined(RAK_4631) || defined(RAK11310)
    // Track wait time for RAK13800 Ethernet requests
    int32_t waitTime = 100;
 #endif
Author	SHA1	Message	Date
Nivek-domo	d8637845bb	Merge `b6089fcd8f` into `a30f431b6a`	2025-04-19 18:50:29 +02:00
renovate[bot]	a30f431b6a	Update Kongduino-Adafruit_nRFCrypto digest to 5f838d2 (#6634 ) Some checks are pending CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-04-19 18:49:05 +02:00
Austin	916afb5098	appdata.xml: Add date to all releases (#6632 ) Some checks are pending CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details	2025-04-19 10:56:41 -04:00
Austin	d26b50b78c	docker alpine: Add available.d config templates (#6631 ) Some checks failed CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Daily Packaging / docker-multiarch (push) Has been cancelled Details Daily Packaging / package-ppa (jammy) (push) Has been cancelled Details Daily Packaging / package-ppa (noble) (push) Has been cancelled Details Daily Packaging / package-ppa (oracular) (push) Has been cancelled Details Daily Packaging / package-ppa (plucky) (push) Has been cancelled Details Daily Packaging / package-obs (push) Has been cancelled Details Daily Packaging / hook-copr (push) Has been cancelled Details	2025-04-19 00:29:59 -04:00
Nivek-domo	b6089fcd8f	Update ServerAPI.h we can use rak13800 on rak11310 too	2025-04-18 09:46:16 +02:00