Merge branch 'master' into ext_notification_channel

.github/workflows/main_matrix.yml

@@ -33,6 +33,7 @@ jobs:
           - board: heltec-v2.1
           - board: tbeam0.7
           - board: meshtastic-diy-v1
+          - board: meshtastic-dr-dev
           - board: rak4631
           - board: rak4631_eink
           - board: t-echo
@@ -42,7 +43,7 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
         # - board: pico
-          
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -96,6 +97,7 @@ jobs:
           - board: heltec-v2.1
           - board: tbeam0.7
           - board: meshtastic-diy-v1
+          - board: meshtastic-dr-dev
           - board: nano-g1
           - board: station-g1
           - board: m5stack-core
@@ -131,11 +133,11 @@ jobs:
       - name: Upgrade platformio
         run: |
           pio upgrade
-          
+
       - name: Pull web ui
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          repo: "meshtastic/meshtastic-web"
+          repo: "meshtastic/web"
           file: "build.tar"
           target: "build.tar"
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -147,15 +149,15 @@ jobs:
 
       - name: Build ESP32
         run: bin/build-esp32.sh ${{ matrix.board }}
-         
+
       - name: Pull OTA Firmware
         uses: dsaltares/fetch-gh-release-asset@master
         with:
-          repo: "meshtastic/Meshtastic-OTA"
+          repo: "meshtastic/firmware-ota"
           file: "firmware.bin"
           target: "release/bleota.bin"
           token: ${{ secrets.GITHUB_TOKEN }}
-          
+
       - name: Get release version string
         run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
         id: version
@@ -369,7 +371,7 @@ jobs:
         id: version
 
       - name: Move files up
-        run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat
+        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat
 
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v3
@@ -392,7 +394,7 @@ jobs:
       # For diagnostics
       - name: Show artifacts
         run: ls -lR
-        
+
       - name: Device scripts permissions
         run: |
           chmod +x ./output/device-install.sh
@@ -427,7 +429,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-          
+
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -441,7 +443,7 @@ jobs:
         with:
           name: firmware-${{ steps.version.outputs.version }}
           path: ./output
-      
+
       - name: Device scripts permissions
         run: |
           chmod +x ./output/device-install.sh
@@ -454,7 +456,7 @@ jobs:
         with:
           name: debug-elfs-${{ steps.version.outputs.version }}.zip
           path: ./elfs
-      
+
       - name: Zip Elfs
         run: zip -j -r ./debug-elfs-${{ steps.version.outputs.version }}.zip ./elfs
 
@@ -468,7 +470,7 @@ jobs:
         with:
           draft: true
           prerelease: true
-          release_name: Meshtastic Device ${{ steps.version.outputs.version }} Alpha
+          release_name: Meshtastic Firmware ${{ steps.version.outputs.version }}
           tag_name: v${{ steps.version.outputs.version }}
           body: |
             Autogenerated by github action, developer should edit as required before publishing...
@@ -498,10 +500,9 @@ jobs:
       - name: Bump version.properties
         run: >-
           bin/bump_version.py
-          
+
       - name: Create version.properties pull request
         uses: peter-evans/create-pull-request@v3
         with:
           add-paths: |
             version.properties
-

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "protobufs"]
 	path = protobufs
-	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+	url = https://github.com/meshtastic/protobufs.git

README.md

@@ -1,19 +1,18 @@
 # Meshtastic Firmware
 
-![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
-[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-device/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/repo/actions/workflows/main_matrix.yml)
-[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-device)](https://cla-assistant.io/meshtastic/Meshtastic-device)
+![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/main_matrix.yml)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware)
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
 
 ## Overview
 
 This repository contains the device firmware for the Meshtastic project.
 
-
 **[Building Instructions](https://meshtastic.org/docs/developers/Firmware/build)**
 **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
 
 ## Stats
 
-![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image')
+![Alt](https://repobeats.axiom.co/api/embed/a92f097d9197ae853e780ec53d7d126e545629ab.svg "Repobeats analytics image")

arch/esp32/esp32.ini

@@ -3,7 +3,7 @@
 extends = arduino_base
 platform = platformio/espressif32@^5.2.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
 upload_speed = 921600
 debug_init_break = tbreak setup
 monitor_filters = esp32_exception_decoder
@@ -33,8 +33,7 @@ lib_deps =
   ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#657509856ce97e9dddeffb89a559f544faefd5cd
   h2zero/NimBLE-Arduino@^1.4.0
-  arduino-libraries/NTPClient@^3.1.0
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+   https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
 
 lib_ignore = 
   segger_rtt

arch/esp32/esp32s3.ini

@@ -2,7 +2,7 @@
 extends = arduino_base
 platform = platformio/espressif32@^5.2.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
 upload_speed = 961200
 monitor_speed = 115200
 debug_init_break = tbreak setup
@@ -33,7 +33,6 @@ lib_deps =
   ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#657509856ce97e9dddeffb89a559f544faefd5cd
   h2zero/NimBLE-Arduino@^1.4.0
-  arduino-libraries/NTPClient@^3.1.0
   https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
 
 lib_ignore = 

arch/nrf52/nrf52.ini

@@ -8,7 +8,7 @@ build_flags =
   ${arduino_base.build_flags} -Wno-unused-variable 
   -Isrc/platform/nrf52
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040> -<mesh/eth/>
 lib_ignore =
   BluetoothOTA
 

arch/portduino/portduino.ini

@@ -7,7 +7,8 @@ build_src_filter =
   -<platform/nrf52/> 
   -<platform/stm32wl/> 
   -<platform/rp2040>
-  -<mesh/http/> 
+  -<mesh/http/>
+  -<mesh/eth/>
   -<modules/esp32>
   -<modules/Telemetry>
   +<../variants/portduino>

arch/rp2040/rp2040.ini

@@ -10,7 +10,7 @@ build_flags =
   -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/>
 lib_ignore =
   BluetoothOTA
 lib_deps =

arch/stm32/stm32wl5e.ini

@@ -10,7 +10,7 @@ build_flags =
 #  Arduino/PlatformIO framework-arduinoststm32 package does not presently have SUBGHZSPI support
 #  -DPIN_SPI_MOSI=PINSUBGHZSPIMOSI -DPIN_SPI_MISO=PINSUBGHZSPIMISO -DPIN_SPI_SCK=PINSUBGHZSPISCK
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
 lib_deps =
   ${env.lib_deps}
   https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b

bin/promote-release.sh

@@ -9,9 +9,6 @@ VERSION=`bin/buildinfo.py long`
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"
 
-# Commented out per https://github.com/meshtastic/Meshtastic-device/issues/947
-#git push root "v${VERSION}" # push the tag
-
 git push origin "v${VERSION}" # push the tag
 
 echo "Tag ${VERSION} pushed to github, github actions should now be building the draft release.  If it seems good, click to publish it"

bin/regen-protos.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.6 to be located in the"
-echo "meshtastic-device root directory if the following step fails, you should download the correct"
+echo "firmware root directory if the following step fails, you should download the correct"
 echo "prebuilt binaries for your computer into nanopb-0.4.6"
 
 # the nanopb tool seems to require that the .options file be in the current directory!

platformio.ini

@@ -22,6 +22,7 @@
 ;default_envs = pca10059_diy_eink
 ;default_envs = meshtastic-diy-v1
 ;default_envs = meshtastic-diy-v1.1
+;default_envs = meshtastic-dr-dev
 ;default_envs = m5stack-coreink
 ;default_envs = rak4631
 
@@ -68,7 +69,7 @@ lib_deps =
   ${env.lib_deps}
   ; Portduino is using meshtastic fork for now
   jgromes/[email protected]
-  https://github.com/caveman99/SparkFun_ATECCX08a_Arduino_Library.git#008e7f9d40bad66b2f7a0074aaac05b7c424339d
+  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76
 
 build_flags = ${env.build_flags} -Os 
   -DRADIOLIB_SPI_PARANOID=0
@@ -79,6 +80,7 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 [networking_base]
 lib_deps =
   knolleary/PubSubClient@^2.8
+  arduino-libraries/NTPClient@^3.1.0
   meshtastic/json11@^1.0.2
 
 ; Common libs for environmental measurements in telemetry module 

src/ButtonThread.h

@@ -159,7 +159,7 @@ class ButtonThread : public concurrency::OSThread
 
     static void userButtonDoublePressed()
     {
-#if defined(USE_EINK)
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
     }

src/Power.cpp

@@ -233,11 +233,14 @@ bool Power::setup()
 
 void Power::shutdown()
 {
-
+    screen->setOn(false);
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
+    digitalWrite(PIN_EINK_EN, LOW); //power off backlight first
+#endif
 
 #ifdef HAS_PMU
     DEBUG_MSG("Shutting down\n");
-    if(PMU){
+    if(PMU) {
         PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
         PMU->shutdown();
     }
@@ -312,7 +315,7 @@ int32_t Power::runOnce()
 #ifdef HAS_PMU
     // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
     // the IRQ status by reading the registers over I2C
-    if(PMU){
+    if(PMU) {
 
         PMU->getIrqStatus();
 
@@ -341,10 +344,11 @@ int32_t Power::runOnce()
         if (PMU->isBatRemoveIrq()) {
             DEBUG_MSG("Battery removed\n");
         }
-        if (PMU->isPekeyShortPressIrq()) {
-            DEBUG_MSG("PEK short button press\n");
-        }
         */
+        if (PMU->isPekeyLongPressIrq()) {
+            DEBUG_MSG("PEK long button press\n");
+            screen->setOn(false);
+        }
 
         PMU->clearIrqStatus();
     }
@@ -451,7 +455,6 @@ bool Power::axpChipInit()
         // Set constant current charging current
         PMU->setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_450MA);
 
-
     } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
 
         // t-beam s3 core 

src/PowerFSM.cpp

@@ -337,7 +337,7 @@ void PowerFSM_setup()
 #ifdef ARCH_ESP32
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 
-    // See: https://github.com/meshtastic/Meshtastic-device/issues/1071
+    // See: https://github.com/meshtastic/firmware/issues/1071
     if (isRouter || config.power.is_power_saving) {
         powerFSM.add_timed_transition(&stateNB, &stateLS, getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, "Min wake timeout");
         powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout");

src/RedirectablePrint.cpp

@@ -44,11 +44,9 @@ size_t RedirectablePrint::vprintf(const char *format, va_list arg)
     static char printBuf[160];
 
     va_copy(copy, arg);
-    int len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
+    size_t len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
     va_end(copy);
 
-    if (len < 0) return 0;
-
     // If the resulting string is longer than sizeof(printBuf)-1 characters, the remaining characters are still counted for the return value
 
     if (len > sizeof(printBuf) - 1) {

src/buzz/buzz.cpp

@@ -1,5 +1,6 @@
 #include "buzz.h"
 #include "configuration.h"
+#include "NodeDB.h"
 
 #ifndef PIN_BUZZER
 
@@ -42,17 +43,19 @@ const int DURATION_1_8 = 125;  // 1/8 note
 const int DURATION_1_4 = 250;  // 1/4 note
 
 void playTones(const ToneDuration *tone_durations, int size) {
-  for (int i = 0; i < size; i++) {
-    const auto &tone_duration = tone_durations[i];
+  if (config.network.eth_enabled != true) {
+    for (int i = 0; i < size; i++) {
+      const auto &tone_duration = tone_durations[i];
 #ifdef M5STACK
-    Tone.tone(tone_duration.frequency_khz);
-    delay(tone_duration.duration_ms);
-    Tone.mute();
+      Tone.tone(tone_duration.frequency_khz);
+      delay(tone_duration.duration_ms);
+      Tone.mute();
 #else
-    tone(PIN_BUZZER, tone_duration.frequency_khz, tone_duration.duration_ms);
+      tone(PIN_BUZZER, tone_duration.frequency_khz, tone_duration.duration_ms);
 #endif
-    // to distinguish the notes, set a minimum time between them.
-    delay(1.3 * tone_duration.duration_ms);
+      // to distinguish the notes, set a minimum time between them.
+      delay(1.3 * tone_duration.duration_ms);
+    }
   }
 }