Update version.properties

try to reset values on nrf using nodeDB methods

.github/workflows/main_matrix.yml

@@ -1,8 +1,8 @@
-name: Continuous Integration
+name: Continuous Integration PR Checks (1.2 Legacy)
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
-    branches: [ master ]
+    branches: [ 1.2-legacy ]
     paths-ignore:
       - '**.md'
       - '**.yml'
@@ -10,7 +10,7 @@ on:
       
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
-    branches: [ master ]
+    branches: [ 1.2-legacy ]
     paths-ignore:
       - '**.md'
       - '**.yml'
@@ -76,6 +76,16 @@ jobs:
 
     - name: Check ${{ matrix.board }}
       run: bin/check-all.sh ${{ matrix.board }}
+      
+  after-checks:
+    runs-on: ubuntu-latest
+    needs: [check]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
   build-esp32:
     strategy:
@@ -321,12 +331,15 @@ jobs:
           name: debug-elfs-${{ steps.version.outputs.version }}.zip
           path: ./*.elf
           retention-days: 90
-
+          
       - name: Create request artifacts
         if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
         uses: gavv/pull-request-artifacts@v1.0.0
         with:
           commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts-branch: artifacts
+          artifacts-token: ${{ secrets.ARTIFACTS_TOKEN }}
+          artifacts-repo: meshtastic/artifacts
+          artifacts-branch: device
+          artifacts-dir: pr
           artifacts: ./firmware-${{ steps.version.outputs.version }}.zip

.github/workflows/release.yml

@@ -1,13 +1,13 @@
 name: Make Release
 on:
   # Can optionally take parameters from the github UI, more info here https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/#:~:text=You%20can%20now%20create%20workflows,the%20workflow%20is%20run%20on.
-  workflow_dispatch:
+  #workflow_dispatch:
   #  inputs:
 
   # Only want to run if version.properties is bumped in master
   push:
     branches:
-      - master
+      - 1.2-legacy
     paths:
     - 'version.properties'
 

platformio.ini

@@ -78,7 +78,7 @@ debug_tool = jlink
 
 lib_deps =
   https://github.com/meshtastic/esp8266-oled-ssd1306.git#d90231dedbb2f52bd7a32fb8ed8edec52cf4a8cb ; ESP8266_SSD1306 
-  https://github.com/meshtastic/OneButton.git#3bcba9492d01e2a8a86f46700ab16f96dd2cf1f5 ; OneButton library for non-blocking button debounce
+  mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
   https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
@@ -264,4 +264,4 @@ monitor_port = /dev/ttyUSB0
 monitor_speed = 115200 
 
 # For experimenting with RAM sizes
-# board_build.ldscript = linker/nrf52840_s140_sim832.ld
+# board_build.ldscript = linker/nrf52840_s140_sim832.ld

src/mesh/MeshService.cpp

@@ -71,17 +71,7 @@ int MeshService::handleFromRadio(const MeshPacket *mp)
     printPacket("Forwarding to phone", mp);
     nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
 
-    fromNum++;
+    sendToPhone((MeshPacket *)mp);
-
-    if (toPhoneQueue.numFree() == 0) {
-        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
-        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
-        if (d)
-            releaseToPool(d);
-    }
-
-    MeshPacket *copied = packetPool.allocCopy(*mp);
-    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
 
     return 0;
 }
@@ -161,12 +151,16 @@ bool MeshService::cancelSending(PacketId id)
     return router->cancelSending(nodeDB.getNodeNum(), id);
 }
 
-void MeshService::sendToMesh(MeshPacket *p, RxSource src)
+void MeshService::sendToMesh(MeshPacket *p, RxSource src, bool ccToPhone)
 {
     nodeDB.updateFrom(*p); // update our local DB for this packet (because phone might have sent position packets etc...)
 
     // Note: We might return !OK if our fifo was full, at that point the only option we have is to drop it
     router->sendLocal(p, src);
+
+    if (ccToPhone) {
+        sendToPhone(p);
+    }
 }
 
 void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
@@ -213,6 +207,20 @@ NodeInfo *MeshService::refreshMyNodeInfo()
     return node;
 }
 
+void MeshService::sendToPhone(MeshPacket *p) {
+    if (toPhoneQueue.numFree() == 0) {
+        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
+        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
+        if (d)
+            releaseToPool(d);
+    }
+
+    MeshPacket *copied = packetPool.allocCopy(*p);
+    perhapsDecode(copied);
+    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
+    fromNum++;
+}
+
 int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 {
     // Update our local node info with our position (even if we don't decide to update anyone else)

src/mesh/MeshService.h

@@ -75,7 +75,7 @@ class MeshService
     /// Send a packet into the mesh - note p must have been allocated from packetPool.  We will return it to that pool after
     /// sending. This is the ONLY function you should use for sending messages into the mesh, because it also updates the nodedb
     /// cache
-    void sendToMesh(MeshPacket *p, RxSource src = RX_SRC_LOCAL);
+    void sendToMesh(MeshPacket *p, RxSource src = RX_SRC_LOCAL, bool ccToPhone = false);
 
     /** Attempt to cancel a previously sent packet from this _local_ node.  Returns true if a packet was found we could cancel */
     bool cancelSending(PacketId id);
@@ -83,6 +83,9 @@ class MeshService
     /// Pull the latest power and time info into my nodeinfo
     NodeInfo *refreshMyNodeInfo();
 
+    /// Send a packet to the phone
+    void sendToPhone(MeshPacket *p);
+
   private:
     /// Called when our gps position has changed - updates nodedb and sends Location message out into the mesh
     /// returns 0 to allow futher processing

src/mesh/NodeDB.cpp

@@ -97,14 +97,17 @@ bool NodeDB::resetRadioConfig()
         nvs_flash_erase();
 #endif
 #ifdef NRF52_SERIES
-    Bluefruit.begin();
+        FS.rmdir_r("/prefs");
 
-    DEBUG_MSG("Clearing bluetooth bonds!\n");
+        Bluefruit.begin();
-    bond_print_list(BLE_GAP_ROLE_PERIPH);
+
-    bond_print_list(BLE_GAP_ROLE_CENTRAL);
+        DEBUG_MSG("Clearing bluetooth bonds!\n");
+        bond_print_list(BLE_GAP_ROLE_PERIPH);
+        bond_print_list(BLE_GAP_ROLE_CENTRAL);
+
+        Bluefruit.Periph.clearBonds();
+        Bluefruit.Central.clearBonds();
 
-    Bluefruit.Periph.clearBonds();
-    Bluefruit.Central.clearBonds();
 #endif
         didFactoryReset = true;
     }

src/mesh/PhoneAPI.h

@@ -58,7 +58,7 @@ class PhoneAPI
 
     // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
     // Unregisters our observer.  A closed connection **can** be reopened by calling init again.
-    void close();
+    virtual void close();
 
     /**
      * Handle a ToRadio protobuf

src/mesh/Router.cpp

@@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
-    assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
+    //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
 
     // Try to find a channel that works with this hash
     for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {

src/mesh/http/ContentHandler.cpp

@@ -755,7 +755,7 @@ void handleUpdateSPIFFS(HTTPRequest *req, HTTPResponse *res)
         if (!TARUnpacker->tarStreamExpander(streamptr, streamSize, SPIFFS, "/static")) {
             res->printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
             Serial.printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
-
+            client->stop();
             return;
         } else {
             /*
@@ -773,6 +773,7 @@ void handleUpdateSPIFFS(HTTPRequest *req, HTTPResponse *res)
     } else {
         res->printf("Failed to establish http connection\n");
         Serial.println("Failed to establish http connection");
+        client->stop();
         return;
     }
 

src/plugins/PositionPlugin.cpp

@@ -121,7 +121,9 @@ void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
     p->priority = MeshPacket_Priority_BACKGROUND;
     prevPacketId = p->id;
 
-    service.sendToMesh(p);
+    
+    //send to the mesh, and the phone
+    service.sendToMesh(p, RX_SRC_LOCAL, true);
 }
 
 int32_t PositionPlugin::runOnce()

suppressions.txt

@@ -36,3 +36,7 @@ cstyleCast
 // ignore stuff that is not ours
 *:.pio/*
 *:*/libdeps/*
+
+// these two caused issues
+missingOverride
+virtualCallInConstructor

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 55
+build = 58