.github/workflows/main_matrix.yml

@@ -135,12 +135,6 @@ jobs:
       build_location: local
     secrets: inherit
 
-  package-pio-deps-native:
-    uses: ./.github/workflows/package_pio_deps.yml
-    with:
-      pio_env: native
-    secrets: inherit
-
   test-native:
     uses: ./.github/workflows/test_native.yml
 
@@ -285,10 +279,7 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
-    needs:
-      - gather-artifacts
-      - build-debian-src
-      - package-pio-deps-native
+    needs: [gather-artifacts, build-debian-src]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -324,27 +315,17 @@ jobs:
           merge-multiple: true
           path: ./output/debian-src
 
-      - name: Download native pio deps
-        uses: actions/download-artifact@v4
-        with:
-          pattern: platformio-deps-native-${{ steps.version.outputs.long }}
-          merge-multiple: true
-          path: ./output/pio-deps-native
-
-      - name: Zip linux sources
+      - name: Zip source deb
         working-directory: output
-        run: |
-          zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -j -9 -r ./platformio-deps-native-${{ steps.version.outputs.long }}.zip ./pio-deps-native
+        run: zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
 
       # For diagnostics
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add linux sources to release
+      - name: Add source deb to release
         run: |
           gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/package_pio_deps.yml

@@ -1,64 +0,0 @@
-name: Package PlatformIO Library Dependencies
-# trunk-ignore-all(checkov/CKV_GHA_7): Allow workflow_dispatch inputs for testing
-
-on:
-  workflow_call:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-  workflow_dispatch:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-
-permissions:
-  contents: write
-  packages: write
-
-jobs:
-  pkg-pio-libdeps:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Install deps
-        shell: bash
-        run: |
-          pip install platformio
-
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - name: Fetch libdeps
-        shell: bash
-        run: |-
-          platformio pkg install -e ${{ inputs.pio_env }}
-          platformio pkg install -e ${{ inputs.pio_env }} -t platformio/tool-scons@4.40502.0
-        env:
-          PLATFORMIO_LIBDEPS_DIR: pio/libdeps
-          PLATFORMIO_PACKAGES_DIR: pio/packages
-          PLATFORMIO_CORE_DIR: pio/core
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
-          overwrite: true
-          path: |
-            pio/*

protobufs

@@ -1 +1 @@
-Subproject commit 068646653e8375fc145988026ad242a3cf70f7ab
+Subproject commit b80785b16bc0d243b97917998706e7bf209cd9d0

src/graphics/Screen.cpp

@@ -1489,21 +1489,22 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
                 bearingToOther -= myHeading;
             screen->drawNodeHeading(display, compassX, compassY, compassDiam, bearingToOther);
 
-            float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2 * PI : bearingToOther;
+            float bearingToOtherDegrees = (bearingToOther < 0) ? bearingToOther + 2*PI : bearingToOther;
             bearingToOtherDegrees = bearingToOtherDegrees * 180 / PI;
 
             if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
                 if (d < (2 * MILES_TO_FEET))
                     snprintf(distStr, sizeof(distStr), "%.0fft   %.0f°", d * METERS_TO_FEET, bearingToOtherDegrees);
                 else
-                    snprintf(distStr, sizeof(distStr), "%.1fmi   %.0f°", d * METERS_TO_FEET / MILES_TO_FEET,
-                             bearingToOtherDegrees);
+                    snprintf(distStr, sizeof(distStr), "%.1fmi   %.0f°", d * METERS_TO_FEET / MILES_TO_FEET, bearingToOtherDegrees);
             } else {
                 if (d < 2000)
                     snprintf(distStr, sizeof(distStr), "%.0fm   %.0f°", d, bearingToOtherDegrees);
                 else
                     snprintf(distStr, sizeof(distStr), "%.1fkm   %.0f°", d / 1000, bearingToOtherDegrees);
             }
+
+
         }
     }
     if (!hasNodeHeading) {
@@ -2648,12 +2649,13 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
             display->drawString(x + 1, y, String("USB"));
     }
 
-    //    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);
+    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);
 
-    //    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
-    //    if (config.display.heading_bold)
-    //        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
+    if (config.display.heading_bold)
+        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
 
+    // Line 2
     uint32_t currentMillis = millis();
     uint32_t seconds = currentMillis / 1000;
     uint32_t minutes = seconds / 60;
@@ -2666,9 +2668,6 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     display->setColor(WHITE);
 
-    // Setup string to assemble analogClock string
-    std::string analogClock = "";
-
     // Show uptime as days, hours, minutes OR seconds
     std::string uptime = screen->drawTimeDelta(days, hours, minutes, seconds);
 
@@ -2685,36 +2684,17 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
         int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
 
-        char timebuf[12];
-
-        if (config.display.use_12h_clock) {
-            std::string meridiem = "am";
-            if (hour >= 12) {
-                if (hour > 12)
-                    hour -= 12;
-                meridiem = "pm";
-            }
-            if (hour == 00) {
-                hour = 12;
-            }
-            snprintf(timebuf, sizeof(timebuf), "%d:%02d:%02d%s", hour, min, sec, meridiem.c_str());
-        } else {
-            snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d", hour, min, sec);
-        }
-        analogClock += timebuf;
+        char timebuf[10];
+        snprintf(timebuf, sizeof(timebuf), " %02d:%02d:%02d", hour, min, sec);
+        uptime += timebuf;
     }
 
-    // Line 1
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
-
-    // Line 2
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, analogClock.c_str());
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, uptime.c_str());
 
     // Display Channel Utilization
     char chUtil[13];
     snprintf(chUtil, sizeof(chUtil), "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-
 #if HAS_GPS
     if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
         // Line 3
@@ -2847,4 +2827,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN

src/mesh/generated/meshtastic/module_config.pb.h

@@ -347,7 +347,7 @@ typedef struct _meshtastic_ModuleConfig_TelemetryConfig {
     bool health_screen_enabled;
 } meshtastic_ModuleConfig_TelemetryConfig;
 
-/* Canned Messages Module Config */
+/* TODO: REPLACE */
 typedef struct _meshtastic_ModuleConfig_CannedMessageConfig {
     /* Enable the rotary encoder #1. This is a 'dumb' encoder sending pulses on both A and B pins while rotating. */
     bool rotary1_enabled;