Merge branch 'meshtastic:master' into master

.github/workflows/build_raspbian.yml

@@ -41,5 +41,5 @@ jobs:
         with:
           name: firmware-raspbian-${{ steps.version.outputs.version }}.zip
           path: |
-            release/meshtasticd_linux_arm64
+            release/meshtasticd_linux_aarch64
             bin/config-dist.yaml

.github/workflows/main_matrix.yml

@@ -245,7 +245,7 @@ jobs:
         id: version
 
       - name: Move files up
-        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./*tbeam-s3*/bleota-s3.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat ./firmware-raspbian-*/release/meshtasticd_linux_arm64 ./firmware-raspbian-*/bin/config-dist.yaml
+        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./*tbeam-s3*/bleota-s3.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat ./firmware-raspbian-*/release/meshtasticd_linux_aarch64 ./firmware-raspbian-*/bin/config-dist.yaml
 
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v3

.github/workflows/package_raspbian.yml

@@ -40,7 +40,7 @@ jobs:
           mkdir -p .debpkg/usr/sbin
           mkdir -p .debpkg/etc/meshtasticd
           mkdir -p .debpkg/usr/lib/systemd/system/
-          cp release/meshtasticd_linux_arm64 .debpkg/usr/sbin/meshtasticd
+          cp release/meshtasticd_linux_aarch64 .debpkg/usr/sbin/meshtasticd
           cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
           chmod +x .debpkg/usr/sbin/meshtasticd
           cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service

Dockerfile

@@ -12,7 +12,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install build deps
 USER root
 RUN apt-get update && \
-	apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates
+	apt-get -y install wget python3 g++ zip python3-venv git vim ca-certificates libgpiod-dev libyaml-cpp-dev libbluetooth-dev
 
 # create a non-priveleged user & group
 RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
@@ -32,10 +32,10 @@ FROM frolvlad/alpine-glibc:glibc-2.31
 RUN apk --update add --no-cache g++ shadow && \
 	groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 mesh
 
-COPY --from=builder /tmp/firmware/release/meshtasticd_linux_amd64 /home/mesh/
+COPY --from=builder /tmp/firmware/release/meshtasticd_linux_x86_64 /home/mesh/
 
 USER mesh
 WORKDIR /home/mesh
-CMD sh -cx "./meshtasticd_linux_amd64 --hwid '${HWID:-$RANDOM}'"
+CMD sh -cx "./meshtasticd_linux_x86_64 --hwid '${HWID:-$RANDOM}'"
 
 HEALTHCHECK NONE

arch/portduino/portduino.ini

@@ -23,6 +23,7 @@ lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
+  lovyan03/LovyanGFX@^1.1.12
 
 build_flags =
   ${arduino_base.build_flags}

bin/build-native.sh

@@ -14,14 +14,7 @@ rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 platformio pkg update
-
-if command -v raspi-config &>/dev/null; then
-	pio run --environment raspbian
-	cp .pio/build/raspbian/program $OUTDIR/meshtasticd_linux_arm64
-else
-	pio run --environment native
-	cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
-fi
-
+pio run --environment native
+cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(arch)"
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR

bin/native-install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cp release/meshtasticd_linux_arm64 /usr/sbin/meshtasticd
+cp "release/meshtasticd_linux_$(arch)" /usr/sbin/meshtasticd
 mkdir /etc/meshtasticd
 if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
 	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml

src/RedirectablePrint.cpp

@@ -99,10 +99,17 @@ size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
                 int hour = hms / SEC_PER_HOUR;
                 int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
                 int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
-
+#ifdef ARCH_PORTDUINO
                 r += ::printf("%s | %02d:%02d:%02d %u ", logLevel, hour, min, sec, millis() / 1000);
+#else
+                r += printf("%s | %02d:%02d:%02d %u ", logLevel, hour, min, sec, millis() / 1000);
+#endif
             } else
+#ifdef ARCH_PORTDUINO
                 r += ::printf("%s | ??:??:?? %u ", logLevel, millis() / 1000);
+#else
+                r += printf("%s | ??:??:?? %u ", logLevel, millis() / 1000);
+#endif
 
             auto thread = concurrency::OSThread::currentThread;
             if (thread) {

variants/portduino/platformio.ini

@@ -3,22 +3,4 @@ extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
 board = cross_platform
 lib_deps = ${portduino_base.lib_deps}
-  lovyan03/LovyanGFX@^1.1.12
-build_src_filter = ${portduino_base.build_src_filter}
-
-; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
-[env:linux]
-extends = portduino_base
-build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
-board = linux_hardware
-lib_deps = ${portduino_base.lib_deps}
-build_src_filter = ${portduino_base.build_src_filter}
-
-; The Raspberry Pi actually has accessible SPI and GPIO, so we can support real hardware there.
-[env:raspbian]
-extends = portduino_base
-build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino -DARCH_RASPBERRY_PI -lyaml-cpp
-board = linux_arm
-lib_deps = ${portduino_base.lib_deps}
-  https://github.com/jp-bennett/LovyanGFX.git#jp-bennett-patch-1 ; lovyan03/LovyanGFX@^1.1.9
 build_src_filter = ${portduino_base.build_src_filter}