Merge 40e4fa55b2 into 72dd5bd88d

This reverts commit 5d48d2c0a7.

.github/workflows/main_matrix.yml

@@ -5,14 +5,20 @@ concurrency:
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
-    branches: [master, develop]
+    branches:
+      - master
+      - develop
+      - event/*
     paths-ignore:
       - "**.md"
       - version.properties
 
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
-    branches: [master, develop]
+    branches:
+      - master
+      - develop
+      - event/*
     paths-ignore:
       - "**.md"
       #- "**.yml"
@@ -32,12 +38,12 @@ jobs:
         name: Checkout base
       - id: jsonStep
         run: |
-          if [[ "${{ github.head_ref }}" == "" ]]; then
+          if [[ "$GITHUB_HEAD_REF" == "" ]]; then
             TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
           else  
             TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
           fi
-          echo "Name: ${{ github.ref_name }} Base: ${{ github.base_ref }} } Ref: ${{ github.ref }} Targets: $TARGETS"
+          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF Targets: $TARGETS"
           echo "${{matrix.arch}}=$(jq -cn --argjson environments "$TARGETS" '{board: $environments}')" >> $GITHUB_OUTPUT
     outputs:
       esp32: ${{ steps.jsonStep.outputs.esp32 }}
@@ -195,17 +201,6 @@ jobs:
       runs-on: ubuntu-24.04-arm
       push: false
 
-  after-checks:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'workflow_dispatch' }}
-    needs: [check]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
   gather-artifacts:
     permissions:
       contents: write
@@ -350,7 +345,7 @@ jobs:
           merge-multiple: true
           path: ./output/pio-deps-native-tft
 
-      - name: Zip linux sources
+      - name: Zip Linux sources
         working-directory: output
         run: |
           zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
@@ -360,7 +355,9 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add linux sources to release
+      - name: Add Linux sources to GtiHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
         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-tft-${{ steps.version.outputs.long }}.zip
@@ -418,9 +415,53 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add bins and debug elfs to release
+      - name: Add bins and debug elfs to GitHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
         run: |
           gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
           gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-firmware:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [release-firmware]
+    env:
+      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: firmware-{${{ env.targets }}}-${{ steps.version.outputs.long }}
+          merge-multiple: true
+          path: ./publish
+
+      - name: Publish firmware to meshtastic.github.io
+        uses: peaceiris/actions-gh-pages@v4
+        env:
+          # On event/* branches, use the event name as the destination prefix
+          DEST_PREFIX: ${{ contains(github.ref_name, 'event/') && format('{0}/', github.ref_name) || '' }}
+        with:
+          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
+          external_repository: meshtastic/meshtastic.github.io
+          publish_branch: master
+          publish_dir: ./publish
+          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ steps.version.outputs.long }}
+          keep_files: true
+          user_name: github-actions[bot]
+          user_email: github-actions[bot]@users.noreply.github.com
+          commit_message: ${{ steps.version.outputs.long }}
+          enable_jekyll: true

arch/esp32/esp32.ini

@@ -50,7 +50,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
   https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip
   # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^2.2.3
+  h2zero/NimBLE-Arduino@^1.4.3
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib

src/Power.cpp

@@ -295,6 +295,22 @@ class AnalogBatteryLevel : public HasBatteryLevel
             raw = raw / BATTERY_SENSE_SAMPLES;
             scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / pow(2, BATTERY_SENSE_RESOLUTION_BITS)) * raw;
 #endif
+#if defined(RAK11310)
+            float voltage_raw = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / 1023) * raw;
+            
+            LOG_INFO("[POWER DEBUG] AREF=%.2fV, ADC_RAW=%u, ADC_MULT=%.2f", 
+                     (double)AREF_VOLTAGE, 
+                     raw, 
+                     (double)operativeAdcMultiplier);
+            
+            scaled = (voltage_raw * 1.22f) - 0.1f;
+            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / 4096) * raw;
+            LOG_INFO("[POWER CORRECTION] Before=%.2fmV, After=%.2fmV", 
+                     (double)voltage_raw, 
+                     (double)scaled);
+#else
+            scaled = operativeAdcMultiplier * ((1000 * AREF_VOLTAGE) / 1023) * raw;
+#endif          
             adcDisable();
 
             if (!initial_read_done) {

src/graphics/Screen.cpp

@@ -56,10 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
 
-#if HAS_ETHERNET
-#include "mesh/eth/ethClient.h"
-#endif
-
 #ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #include "modules/StoreForwardModule.h"
@@ -236,42 +232,6 @@ static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
 #endif
 
-#if HAS_ETHERNET
-static void drawEthernetFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    display->setFont(FONT_SMALL);
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-
-    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
-        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-        display->setColor(BLACK);
-    }
-
-    display->setColor(WHITE);
-
-    // Adjust vertical position verticale ajustée - starts higher
-    int16_t y_offset = y + 2; // Reduces space at top
-
-    // Left Alignement (x + small offset)
-    int16_t x_offset = x + 2;
-
-    // Display is not centered, align left
-    display->drawString(x_offset, y_offset, "Ethernet Config:");
-    y_offset += FONT_HEIGHT_SMALL + 2; // Slightly reduced spacing
-
-    display->drawString(x_offset, y_offset, "IP: " + Ethernet.localIP().toString());
-    y_offset += FONT_HEIGHT_SMALL;
-
-    display->drawString(x_offset, y_offset, "Mask: " + Ethernet.subnetMask().toString());
-    y_offset += FONT_HEIGHT_SMALL;
-
-    display->drawString(x_offset, y_offset, "GW: " + Ethernet.gatewayIP().toString());
-    // y_offset += FONT_HEIGHT_SMALL;
-
-    // display->drawString(x_offset, y_offset, "DNS: " + Ethernet.dnsServerIP().toString());
-}
-#endif
-
 void Screen::drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message)
 {
     uint16_t x_offset = display->width() / 2;
@@ -2222,12 +2182,6 @@ void Screen::setFrames(FrameFocus focus)
     }
 #endif
 
-#if HAS_ETHERNET
-    if (Ethernet.hardwareStatus() != EthernetNoHardware) {
-        normalFrames[numframes++] = drawEthernetFrame;
-    }
-#endif
-
     fsi.frameCount = numframes; // Total framecount is used to apply FOCUS_PRESERVE
     LOG_DEBUG("Finished build frames. numframes: %d", numframes);
 

src/nimble/NimbleBluetooth.cpp

@@ -49,7 +49,7 @@ static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];
 
 class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
 {
-    virtual void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
+    virtual void onWrite(NimBLECharacteristic *pCharacteristic)
     {
         LOG_DEBUG("To Radio onwrite");
         auto val = pCharacteristic->getValue();
@@ -66,7 +66,7 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
 
 class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
 {
-    virtual void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
+    virtual void onRead(NimBLECharacteristic *pCharacteristic)
     {
         uint8_t fromRadioBytes[meshtastic_FromRadio_size];
         size_t numBytes = bluetoothPhoneAPI->getFromRadio(fromRadioBytes);
@@ -79,7 +79,7 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
 
 class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 {
-    virtual uint32_t onPassKeyDisplay()
+    virtual uint32_t onPassKeyRequest()
     {
         uint32_t passkey = config.bluetooth.fixed_pin;
 
@@ -125,7 +125,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         return passkey;
     }
 
-    virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo)
+    virtual void onAuthenticationComplete(ble_gap_conn_desc *desc)
     {
         LOG_INFO("BLE authentication complete");
 
@@ -138,9 +138,9 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         }
     }
 
-    virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
+    virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
     {
-        LOG_INFO("BLE disconnect. Reason %i", reason);
+        LOG_INFO("BLE disconnect");
 
         bluetoothStatus->updateStatus(
             new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED));
@@ -191,7 +191,7 @@ int NimbleBluetooth::getRssi()
     if (bleServer && isConnected()) {
         auto service = bleServer->getServiceByUUID(MESH_SERVICE_UUID);
         uint16_t handle = service->getHandle();
-        return NimBLEDevice::getClientByHandle(handle)->getRssi();
+        return NimBLEDevice::getClientByID(handle)->getRssi();
     }
     return 0; // FIXME figure out where to source this
 }
@@ -216,7 +216,6 @@ void NimbleBluetooth::setup()
 
     NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback();
     bleServer->setCallbacks(serverCallbacks, true);
-    bleServer->advertiseOnDisconnect(true);
     setupService();
     startAdvertising();
 }
@@ -260,7 +259,7 @@ void NimbleBluetooth::setupService()
     BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic)
         (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1);
 
-    NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->create2904();
+    NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904);
     batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
     batteryLevelDescriptor->setNamespace(1);
     batteryLevelDescriptor->setUnit(0x27ad);