Merge branch 'master' into AddRAK12035VB_4.19.25

.github/workflows/main_matrix.yml

@@ -149,6 +149,7 @@ jobs:
     secrets: inherit
 
   test-native:
+    if: ${{ !contains(github.ref_name, 'event/') }}
     uses: ./.github/workflows/test_native.yml
 
   docker-deb-amd64:

.github/workflows/release_channels.yml

@@ -63,21 +63,17 @@ jobs:
         with:
           python-version: 3.x
 
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
-          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
-        id: version
-        env:
-          BUILD_LOCATION: local
-
       - name: Bump version.properties
         run: |
           # Bump version.properties
           chmod +x ./bin/bump_version.py
           ./bin/bump_version.py
 
+      - name: Get new release version string
+        run: |
+          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
+        id: new_version
+
       - name: Ensure debian deps are installed
         run: |
           sudo apt-get update -y --fix-missing
@@ -94,7 +90,7 @@ jobs:
           # Bump org.meshtastic.meshtasticd.metainfo.xml
           pip install -r bin/bump_metainfo/requirements.txt -q
           chmod +x ./bin/bump_metainfo/bump_metainfo.py
-          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.version.outputs.short }}"
+          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.new_version.outputs.short }}"
         env:
           PIP_DISABLE_PIP_VERSION_CHECK: 1
 

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <release version="2.6.8" date="2025-05-05">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.8</url>
+    </release>
     <release version="2.6.7" date="2025-04-28">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.7</url>
     </release>

debian/changelog

@@ -1,9 +1,13 @@
-meshtasticd (2.5.22.0) UNRELEASED; urgency=medium
+meshtasticd (2.6.8.0) UNRELEASED; urgency=medium
 
+  [ Austin Lane ]
   * Initial packaging
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
 
- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
+  [  ]
+  * GitHub Actions Automatic version bump
+
+ --  <github-actions[bot]@users.noreply.github.com>  Tue, 06 May 2025 01:32:49 +0000

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/b9e2ad1222db9f5a5080248b2f018c250f0efae5.zip
+	https://github.com/meshtastic/device-ui/archive/35576e131e250f259878ea81819a90df837d1307.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

renovate.json

@@ -71,7 +71,7 @@
   ],
   "packageRules": [
     {
-      "matchPackageNames": ["meshtastic/device-ui"],
+      "matchDepNames": ["meshtastic/device-ui"],
       "reviewers": ["mverch67"],
       "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
     }

src/mesh/Channels.cpp

@@ -345,7 +345,7 @@ void Channels::setChannel(const meshtastic_Channel &c)
 
 bool Channels::anyMqttEnabled()
 {
-#if USERPREFS_EVENT_MODE
+#if USERPREFS_EVENT_MODE && !MESHTASTIC_EXCLUDE_MQTT
     // Don't publish messages on the public MQTT broker if we are in event mode
     if (mqtt && mqtt->isUsingDefaultServer()) {
         return false;

userPrefs.jsonc

@@ -7,14 +7,14 @@
   // "USERPREFS_CHANNEL_0_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa1 }",
   // "USERPREFS_CHANNEL_0_UPLINK_ENABLED": "true",
   // "USERPREFS_CHANNEL_1_DOWNLINK_ENABLED": "false",
-  // "USERPREFS_CHANNEL_1_NAME": "Node Build Chat",
+  // "USERPREFS_CHANNEL_1_NAME": "NodeChat",
   // "USERPREFS_CHANNEL_1_PRECISION": "14",
-  // "USERPREFS_CHANNEL_1_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa2 }",
+  // "USERPREFS_CHANNEL_1_PSK": "{ 0x4e, 0x22, 0x1d, 0x8b, 0xc3, 0x09, 0x1b, 0xe2, 0x11, 0x9c, 0x89, 0x12, 0xf2, 0x25, 0x19, 0x5d, 0x15, 0x3e, 0x30, 0x7b, 0x86, 0xb6, 0xec, 0xc4, 0x6a, 0xc3, 0x96, 0x5e, 0x9e, 0x10, 0x9d, 0xd5 }",
   // "USERPREFS_CHANNEL_1_UPLINK_ENABLED": "false",
   // "USERPREFS_CHANNEL_2_DOWNLINK_ENABLED": "false",
-  // "USERPREFS_CHANNEL_2_NAME": "Equipment Exchange",
+  // "USERPREFS_CHANNEL_2_NAME": "YardSale",
   // "USERPREFS_CHANNEL_2_PRECISION": "14",
-  // "USERPREFS_CHANNEL_2_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa3 }",
+  // "USERPREFS_CHANNEL_2_PSK": "{ 0x15, 0x6f, 0xfe, 0x46, 0xd4, 0x56, 0x63, 0x8a, 0x54, 0x43, 0x13, 0xf2, 0xef, 0x6c, 0x63, 0x89, 0xf0, 0x06, 0x30, 0x52, 0xce, 0x36, 0x5e, 0xb1, 0xe8, 0xbb, 0x86, 0xe6, 0x26, 0x5b, 0x1d, 0x58 }",
   // "USERPREFS_CHANNEL_2_UPLINK_ENABLED": "false",
   // "USERPREFS_CONFIG_GPS_MODE": "meshtastic_Config_PositionConfig_GpsMode_ENABLED",
   // "USERPREFS_CONFIG_LORA_IGNORE_MQTT": "true",

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 7
+build = 8