Tweak

* Guard the assets

* Indicated legacy build-all

* Hopefully fixed

.github/workflows/main_matrix.yml

@@ -6,7 +6,6 @@ on:
     paths-ignore:
       - "**.md"
       - "**.yml"
-      - "version.properties"
 
   # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
   pull_request_target:
@@ -41,6 +40,7 @@ jobs:
           - board: station-g1
           - board: m5stack-core
           - board: m5stack-coreink
+        # - board: pico
           
     runs-on: ubuntu-latest
     steps:
@@ -125,7 +125,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio adafruit-nrfutil littlefs-python
-          pip install -U --pre meshtastic
 
       - name: Upgrade platformio
         run: |
@@ -196,7 +195,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio adafruit-nrfutil
-          pip install -U --pre meshtastic
 
       - name: Upgrade platformio
         run: |
@@ -218,6 +216,60 @@ jobs:
             release/*.elf
           retention-days: 90
 
+  build-rpi2040:
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        include:
+          - board: pico
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        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@v2
+        with:
+          python-version: 3.x
+
+      - name: Cache python libs
+        uses: actions/cache@v1
+        id: cache-pip # needed in if test
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip
+
+      - name: Upgrade python tools
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+
+      - name: Upgrade platformio
+        run: |
+          pio upgrade
+
+      - name: Build Raspberry Pi 2040
+        run: ./bin/build-rpi2040.sh ${{ matrix.board }}
+
+      - name: Get release version string
+        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
+          path: |
+            release/*.uf2
+            release/*.elf
+          retention-days: 90
+
   build-native:
     runs-on: ubuntu-latest
     steps:
@@ -289,7 +341,7 @@ jobs:
 
   gather-artifacts:
     runs-on: ubuntu-latest
-    needs: [build-esp32, build-nrf52, build-native]
+    needs: [build-esp32, build-nrf52, build-native, build-rpi2040]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -350,3 +402,88 @@ jobs:
           artifacts-branch: device
           artifacts-dir: pr
           artifacts: ./firmware-${{ steps.version.outputs.version }}.zip
+
+  release-artifacts:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [gather-artifacts, after-checks]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+          
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.x
+
+      - name: Get release version string
+        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        id: version
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: firmware-${{ steps.version.outputs.version }}
+          path: ./output
+
+      - name: Zip firmware
+        run: zip -j -r ./firmware-${{ steps.version.outputs.version }}.zip ./output
+
+      - uses: actions/download-artifact@v2
+        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
+
+      # For diagnostics
+      - name: Show artifacts
+        run: ls -lR
+
+      - name: Create release
+        uses: actions/create-release@v1
+        id: create_release
+        with:
+          draft: true
+          prerelease: true
+          release_name: Meshtastic Device ${{ steps.version.outputs.version }} alpha - Public Preview
+          tag_name: v${{ steps.version.outputs.version }}
+          body: |
+            Autogenerated by github action, developer should edit as required before publishing...
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Add bins to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./firmware-${{ steps.version.outputs.version }}.zip
+          asset_name: firmware-${{ steps.version.outputs.version }}.zip
+          asset_content_type: application/zip
+
+      - name: Add debug elfs to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./debug-elfs-${{ steps.version.outputs.version }}.zip
+          asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
+          asset_content_type: application/zip
+
+      - name: Bump version
+        run: >-
+          bin/bump_version.py
+          
+      - name: Commit updated version.py
+        id: commit_updated
+        run: |
+          git config --global user.name 'github-actions'
+          git config --global user.email 'bot@noreply.github.com'
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+          git add version.properties
+          git commit -m "bump version" && git push || echo "No changes to commit"
+          git log -n 1 --pretty=format:"%H" | tail -n 1 | awk '{print "::set-output name=sha::"$0}'
+

.github/workflows/release.yml

@@ -1,92 +0,0 @@
-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:
-  #  inputs:
-
-  # Only want to run if version.properties is bumped in master
-  push:
-    branches:
-      - master
-    paths:
-      - "version.properties"
-
-jobs:
-  release-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.x
-
-      # Will be available in steps.version.outputs.version
-      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
-        id: version
-      # Note: we don't use caches on release builds because we don't want to accidentally not have a virgin build machine
-
-      - name: Upgrade python tools
-        # We actually want to run this every time
-        # if: steps.cache-pip.outputs.cache-hit != 'true'
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio meshtastic adafruit-nrfutil littlefs-python
-
-      - name: Upgrade platformio
-        run: |
-          pio upgrade
-
-      - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          repo: "meshtastic/meshtastic-web"
-          file: "build.tar"
-          target: "build.tar"
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Unpack web ui
-        run: |
-          tar -xf build.tar -C data/static
-          rm build.tar
-
-      - name: Build everything
-        run: bin/build-all.sh
-
-      - name: Create release
-        uses: actions/create-release@v1
-        id: create_release
-        with:
-          draft: true
-          prerelease: true
-          release_name: ${{ steps.version.outputs.version }} alpha
-          tag_name: v${{ steps.version.outputs.version }}
-          body: |
-            Autogenerated by github action, developer should edit as required before publishing...
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Add bins to release
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release/archive/firmware-${{ steps.version.outputs.version }}.zip
-          asset_name: firmware-${{ steps.version.outputs.version }}.zip
-          asset_content_type: application/zip
-
-      - name: Add debug elfs to release
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
-          asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
-          asset_content_type: application/zip

bin/build-rpi2040.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -e
+
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
+
+OUTDIR=release/
+
+rm -f $OUTDIR/firmware*
+rm -r $OUTDIR/* || true
+
+# Make sure our submodules are current
+git submodule update 
+
+# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
+platformio lib update 
+
+echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
+rm -f .pio/build/$1/firmware.*
+
+# The shell vars the build tool expects to find
+export APP_VERSION=$VERSION
+
+basename=firmware-$1-$VERSION
+
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
+
+echo "Copying uf2 file"
+SRCBIN=.pio/build/$1/firmware.uf2
+cp $SRCBIN $OUTDIR/$basename.uf2
+
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/bump_version.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+"""Bump the version number"""
+
+lines = None
+
+with open('version.properties', 'r', encoding='utf-8') as f:
+    lines = f.readlines()
+
+with open('version.properties', 'w', encoding='utf-8') as f:
+    for line in lines:
+        if line.lstrip().startswith("build = "):
+            words = line.split(" = ")
+            ver = f'build = {int(words[1]) + 1}'
+            f.write(f'{ver}\n')
+        else:
+            f.write(line)

platformio.ini

@@ -65,7 +65,7 @@ lib_deps =
 
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
-build_src_filter = ${env.build_src_filter} -<portduino/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT 
 [networking_base]
@@ -92,7 +92,7 @@ lib_deps =
 extends = arduino_base
 platform = espressif32@3.5.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<nrf52/> -<stm32wl>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
 upload_speed = 115200
 debug_init_break = tbreak setup
 
@@ -101,7 +101,7 @@ debug_init_break = tbreak setup
 # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
 # -DUSE_NEW_ESP32_BLUETOOTH will enable the new NimBLE C++ api
 build_flags =
-  ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 
+  ${arduino_base.build_flags} -Wall -Wextra -Isrc/platform/esp32 -lnimble -std=c++11 
   -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
   -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH -DCONFIG_BT_NIMBLE_ENABLED -DCONFIG_NIMBLE_CPP_LOG_LEVEL=1
 lib_deps =
@@ -142,9 +142,9 @@ build_type = debug ; I'm debugging with ICE a lot now
 ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
-  -Isrc/nrf52
+  -Isrc/platform/nrf52
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<esp32/> -<stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040>
 lib_ignore =
   BluetoothOTA
 
@@ -165,3 +165,23 @@ board = nrf52840_dk
 [env:feather_nrf52832]
 extends = nrf52_base
 board = adafruit_feather_nrf52832
+
+; Common settings for rp2040 Processor based targets
+[rp2040_base]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+extends = arduino_base
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+build_flags = 
+  ${arduino_base.build_flags} -Wno-unused-variable 
+  -Isrc/platform/rp2040
+  -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>
+lib_ignore =
+  BluetoothOTA
+lib_deps =
+  ${arduino_base.lib_deps}
+  ${environmental_base.lib_deps}
+  https://github.com/kokke/tiny-AES-c.git

src/ButtonThread.h

@@ -132,7 +132,7 @@ class ButtonThread : public concurrency::OSThread
 #endif
         // If user button is held down for 5 seconds, shutdown the device.
         if ((millis() - longPressTime > 5 * 1000) && (longPressTime > 0)) {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
             if (axp192_found == true) {
                 setLed(false);
                 power->shutdown();

src/FSCommon.cpp

@@ -44,7 +44,7 @@ bool renameFile(const char* pathFrom, const char* pathTo)
 void listDir(const char * dirname, uint8_t levels)
 {
 #ifdef FSCom
-    File root = FSCom.open(dirname);
+    File root = FSCom.open(dirname, FILE_O_READ);
     if(!root){
         return;
     }
@@ -71,7 +71,7 @@ void listDir(const char * dirname, uint8_t levels)
 void rmDir(const char * dirname)
 {
 #ifdef FSCom
-    File file = FSCom.open(dirname);
+    File file = FSCom.open(dirname, FILE_O_READ);
     if(!file){
         return;
     }

src/FSCommon.h

@@ -13,6 +13,15 @@
 #define FILE_O_READ "r"
 #endif
 
+#if defined(ARCH_RP2040)
+// RP2040
+#include "LittleFS.h"
+#define FSCom LittleFS
+#define FSBegin() FSCom.begin()
+#define FILE_O_WRITE "w"
+#define FILE_O_READ "r"
+#endif
+
 #if defined(ARCH_ESP32)
 // ESP32 version
 #include "LITTLEFS.h"

src/Power.cpp

@@ -7,9 +7,7 @@
 #include "utils.h"
 #include "buzz/buzz.h"
 
-#ifdef TBEAM_V10
-// FIXME. nasty hack cleanup how we load axp192
-#undef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
 #include "axp20x.h"
 
 AXP20X_Class axp;
@@ -158,8 +156,21 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
 
+#ifndef BAT_FULLVOLT
+#define BAT_FULLVOLT 4200
+#endif 
+#ifndef BAT_EMPTYVOLT
+#define BAT_EMPTYVOLT 3270
+#endif 
+#ifndef BAT_CHARGINGVOLT
+#define BAT_CHARGINGVOLT 4210
+#endif 
+#ifndef BAT_NOBATVOLT
+#define BAT_NOBATVOLT 2230
+#endif 
+
     /// For heltecs with no battery connected, the measured voltage is 2204, so raising to 2230 from 2100
-    const float fullVolt = 4200, emptyVolt = 3270, chargingVolt = 4210, noBatVolt = 2230;
+    const float fullVolt = BAT_FULLVOLT, emptyVolt = BAT_EMPTYVOLT, chargingVolt = BAT_CHARGINGVOLT, noBatVolt = BAT_NOBATVOLT;
     float last_read_value = 0.0;
     uint32_t last_read_time_ms = 0;
 };
@@ -221,7 +232,7 @@ bool Power::setup()
 
 void Power::shutdown()
 {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     DEBUG_MSG("Shutting down\n");
     axp.setChgLEDMode(AXP20X_LED_OFF);
     axp.shutdown();
@@ -293,7 +304,7 @@ int32_t Power::runOnce()
 {
     readPowerStatus();
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     // 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
     axp.readIRQ();
@@ -343,7 +354,7 @@ int32_t Power::runOnce()
  */
 bool Power::axp192Init()
 {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     if (axp192_found) {
         if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
             batteryLevel = &axp;

src/PowerFSM.cpp

@@ -12,7 +12,7 @@
 static bool isPowered()
 {
     // Circumvent the battery sensing logic and assumes constant power if no battery pin or power mgmt IC
-    #if !defined(BATTERY_PIN) && !defined(AXP192_SLAVE_ADDRESS)
+    #if !defined(BATTERY_PIN) && !defined(HAS_AXP192)
         return true;
     #endif
 

src/configuration.h

@@ -81,7 +81,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define DISABLE_NTP
 
 // Disable the welcome screen and allow 
-#define DISABLE_WELCOME_UNSET
+//#define DISABLE_WELCOME_UNSET
 
 // -----------------------------------------------------------------------------
 // OLED & Input

src/cubecell/FS.h

@@ -1 +0,0 @@
-// Placeholder FIXME

src/detect/i2cScan.h

@@ -3,6 +3,10 @@
 #include <Wire.h>
 #include "mesh/generated/telemetry.pb.h"
 
+#ifdef HAS_AXP192
+#include "axp20x.h"
+#endif
+
 #if HAS_WIRE
 uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
     uint16_t value = 0x00;
@@ -110,7 +114,7 @@ void scanI2Cdevice(void)
                 screen_found = addr;
                 DEBUG_MSG("st7567 display found\n");
             }
-#ifdef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
             if (addr == AXP192_SLAVE_ADDRESS) {
                 axp192_found = true;
                 DEBUG_MSG("axp192 PMU found\n");

src/main.cpp

@@ -17,9 +17,9 @@
 #include "SPILock.h"
 #include "concurrency/OSThread.h"
 #include "concurrency/Periodic.h"
-#include "debug/axpDebug.h"
-#include "debug/einkScan.h"
-#include "debug/i2cScan.h"
+#include "detect/axpDebug.h"
+#include "detect/einkScan.h"
+#include "detect/i2cScan.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "modules/Modules.h"
@@ -35,7 +35,7 @@
 #include "mesh/http/WebServer.h"
 
 #ifdef USE_NEW_ESP32_BLUETOOTH
-#include "esp32/ESP32Bluetooth.h"
+#include "platform/esp32/ESP32Bluetooth.h"
 #else
 #include "nimble/BluetoothUtil.h"
 #endif
@@ -307,7 +307,7 @@ void setup()
     setupModules();
 
     // Do this after service.init (because that clears error_code)
-#ifdef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
     if (!axp192_found)
         RECORD_CRITICALERROR(CriticalErrorCode_NoAXP192); // Record a hardware fault for missing hardware
 #endif

src/mesh/NodeDB.cpp

@@ -297,7 +297,7 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 #ifdef FSCom
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
 
-    auto f = FSCom.open(filename);
+    auto f = FSCom.open(filename, FILE_O_READ);
 
     if (f) {
         DEBUG_MSG("Loading %s\n", filename);

src/mesh/generated/deviceonly.pb.h

@@ -165,7 +165,7 @@ extern const pb_msgdesc_t OEMStore_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define ChannelFile_size                         630
-#define DeviceState_size                         23728
+#define DeviceState_size                         23994
 #define OEMStore_size                            2106
 
 #ifdef __cplusplus

src/mesh/generated/mesh.pb.h

@@ -257,6 +257,11 @@ typedef struct _Location {
     uint32_t expire;
     /* If true, only allow the original sender to update the location. */
     bool locked;
+    /* Name of the location - max 30 chars */
+    char name[30];
+    /* *
+ Description of the location - max 100 chars */
+    char description[100];
 } Location;
 
 /* Debug output from the device.
@@ -737,7 +742,7 @@ extern "C" {
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
 #define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_default}
-#define Location_init_default                    {0, 0, 0, 0, 0}
+#define Location_init_default                    {0, 0, 0, 0, 0, "", ""}
 #define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0, false, DeviceMetrics_init_default}
 #define MyNodeInfo_init_default                  {0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -751,7 +756,7 @@ extern "C" {
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
 #define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_zero}
-#define Location_init_zero                       {0, 0, 0, 0, 0}
+#define Location_init_zero                       {0, 0, 0, 0, 0, "", ""}
 #define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0, false, DeviceMetrics_init_zero}
 #define MyNodeInfo_init_zero                     {0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -769,6 +774,8 @@ extern "C" {
 #define Location_longitude_i_tag                 3
 #define Location_expire_tag                      4
 #define Location_locked_tag                      5
+#define Location_name_tag                        6
+#define Location_description_tag                 7
 #define LogRecord_message_tag                    1
 #define LogRecord_time_tag                       2
 #define LogRecord_source_tag                     3
@@ -941,7 +948,9 @@ X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        2) \
 X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       3) \
 X(a, STATIC,   SINGULAR, UINT32,   expire,            4) \
-X(a, STATIC,   SINGULAR, BOOL,     locked,            5)
+X(a, STATIC,   SINGULAR, BOOL,     locked,            5) \
+X(a, STATIC,   SINGULAR, STRING,   name,              6) \
+X(a, STATIC,   SINGULAR, STRING,   description,       7)
 #define Location_CALLBACK NULL
 #define Location_DEFAULT NULL
 
@@ -1078,18 +1087,18 @@ extern const pb_msgdesc_t Compressed_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define Compressed_size                          243
-#define Data_size                                296
-#define FromRadio_size                           356
-#define Location_size                            24
+#define Data_size                                429
+#define FromRadio_size                           489
+#define Location_size                            156
 #define LogRecord_size                           81
-#define MeshPacket_size                          347
+#define MeshPacket_size                          480
 #define MyNodeInfo_size                          197
 #define NodeInfo_size                            281
 #define Position_size                            142
 #define RouteDiscovery_size                      40
 #define Routing_size                             42
 #define ToRadio_PeerInfo_size                    8
-#define ToRadio_size                             350
+#define ToRadio_size                             483
 #define User_size                                95
 
 #ifdef __cplusplus

src/platform/esp32/ESP32Bluetooth.cpp

@@ -109,9 +109,11 @@ class ESP32BluetoothServerCallback : public NimBLEServerCallbacks {
             screen->stopBluetoothPinScreen();
         }
     }
+    virtual void onDisconnect(NimBLEServer* pServer, ble_gap_conn_desc *desc) {
+        DEBUG_MSG("BLE disconnect\n");
+    }
 };
 
-
 static ESP32BluetoothToRadioCallback *toRadioCallbacks;
 static ESP32BluetoothFromRadioCallback *fromRadioCallbacks;
 
@@ -120,6 +122,9 @@ void ESP32Bluetooth::shutdown()
     // Shutdown bluetooth for minimum power draw
     DEBUG_MSG("Disable bluetooth\n");
     //Bluefruit.Advertising.stop();
+    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->reset();
+    pAdvertising->stop();
 }
 
 void ESP32Bluetooth::setup()
@@ -175,7 +180,7 @@ void ESP32Bluetooth::setup()
     bleServer = NimBLEDevice::createServer();
     
     ESP32BluetoothServerCallback *serverCallbacks = new ESP32BluetoothServerCallback();
-    bleServer->setCallbacks(serverCallbacks);
+    bleServer->setCallbacks(serverCallbacks, true);
 
     NimBLEService *bleService = bleServer->createService(MESH_SERVICE_UUID);
     //NimBLECharacteristic *pNonSecureCharacteristic = bleService->createCharacteristic("1234", NIMBLE_PROPERTY::READ );
@@ -208,9 +213,9 @@ void ESP32Bluetooth::setup()
     //ToRadioCharacteristic->setCallbacks()
 
     NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->reset();
     pAdvertising->addServiceUUID(MESH_SERVICE_UUID);
-    pAdvertising->start();
-
+    pAdvertising->start(0);
 }
 
 
@@ -228,7 +233,7 @@ void ESP32Bluetooth::clearBonds()
 
     //Bluefruit.Periph.clearBonds();
     //Bluefruit.Central.clearBonds();
-    
+    NimBLEDevice::deleteAllBonds();
 }
 
 void clearNVS() {

src/platform/nrf52/JLINK_MONITOR.c

@@ -1,120 +1,120 @@
-/*********************************************************************
-*                SEGGER Microcontroller GmbH & Co. KG                *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
- 
-----------------------------------------------------------------------
-File    : JLINK_MONITOR.c
-Purpose : Implementation of debug monitor for J-Link monitor mode debug on Cortex-M devices.
---------  END-OF-HEADER  ---------------------------------------------
-*/
-
-#include "JLINK_MONITOR.h"
-
-/*********************************************************************
-*
-*       Configuration
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Defines
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Types
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Static data
-*
-**********************************************************************
-*/
-
-volatile int MAIN_MonCnt;   // Incremented in JLINK_MONITOR_OnPoll() while CPU is in debug mode
-
-/*********************************************************************
-*
-*       Local functions
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Global functions
-*
-**********************************************************************
-*/
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnExit()
-* 
-*  Function description 
-*    Called from DebugMon_Handler(), once per debug exit.
-*    May perform some target specific operations to be done on debug mode exit.
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/ 
-void JLINK_MONITOR_OnExit(void) {
-  //
-  // Add custom code here
-  //
-//  BSP_ClrLED(0);
-}
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnEnter()
-* 
-*  Function description 
-*    Called from DebugMon_Handler(), once per debug entry.
-*    May perform some target specific operations to be done on debug mode entry
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/ 
-void JLINK_MONITOR_OnEnter(void) {
-  //
-  // Add custom code here
-  //
-//  BSP_SetLED(0);
-//  BSP_ClrLED(1);
-}
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnPoll()
-* 
-*  Function description 
-*    Called periodically from DebugMon_Handler(), to perform some actions that need to be performed periodically during debug mode.
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/
-void JLINK_MONITOR_OnPoll(void) {
-  //
-  // Add custom code here
-  //
-  MAIN_MonCnt++;
-//  BSP_ToggleLED(0);
-//  _Delay(500000);
-}
-
-/****** End Of File *************************************************/
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+ 
+----------------------------------------------------------------------
+File    : JLINK_MONITOR.c
+Purpose : Implementation of debug monitor for J-Link monitor mode debug on Cortex-M devices.
+--------  END-OF-HEADER  ---------------------------------------------
+*/
+
+#include "JLINK_MONITOR.h"
+
+/*********************************************************************
+*
+*       Configuration
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Defines
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Types
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Static data
+*
+**********************************************************************
+*/
+
+volatile int MAIN_MonCnt;   // Incremented in JLINK_MONITOR_OnPoll() while CPU is in debug mode
+
+/*********************************************************************
+*
+*       Local functions
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Global functions
+*
+**********************************************************************
+*/
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnExit()
+* 
+*  Function description 
+*    Called from DebugMon_Handler(), once per debug exit.
+*    May perform some target specific operations to be done on debug mode exit.
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/ 
+void JLINK_MONITOR_OnExit(void) {
+  //
+  // Add custom code here
+  //
+//  BSP_ClrLED(0);
+}
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnEnter()
+* 
+*  Function description 
+*    Called from DebugMon_Handler(), once per debug entry.
+*    May perform some target specific operations to be done on debug mode entry
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/ 
+void JLINK_MONITOR_OnEnter(void) {
+  //
+  // Add custom code here
+  //
+//  BSP_SetLED(0);
+//  BSP_ClrLED(1);
+}
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnPoll()
+* 
+*  Function description 
+*    Called periodically from DebugMon_Handler(), to perform some actions that need to be performed periodically during debug mode.
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/
+void JLINK_MONITOR_OnPoll(void) {
+  //
+  // Add custom code here
+  //
+  MAIN_MonCnt++;
+//  BSP_ToggleLED(0);
+//  _Delay(500000);
+}
+
+/****** End Of File *************************************************/

src/platform/nrf52/JLINK_MONITOR.h

@@ -1,27 +1,27 @@
-/*********************************************************************
-*                SEGGER Microcontroller GmbH & Co. KG                *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
- 
-----------------------------------------------------------------------
-File    : JLINK_MONITOR.h
-Purpose : Header file of debug monitor for J-Link monitor mode debug on Cortex-M devices.
---------  END-OF-HEADER  ---------------------------------------------
-*/
-
-#ifndef JLINK_MONITOR_H
-#define JLINK_MONITOR_H
-
-void JLINK_MONITOR_OnExit  (void);
-void JLINK_MONITOR_OnEnter (void);
-void JLINK_MONITOR_OnPoll  (void);
-
-#endif
-
-/****** End Of File *************************************************/
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+ 
+----------------------------------------------------------------------
+File    : JLINK_MONITOR.h
+Purpose : Header file of debug monitor for J-Link monitor mode debug on Cortex-M devices.
+--------  END-OF-HEADER  ---------------------------------------------
+*/
+
+#ifndef JLINK_MONITOR_H
+#define JLINK_MONITOR_H
+
+void JLINK_MONITOR_OnExit  (void);
+void JLINK_MONITOR_OnEnter (void);
+void JLINK_MONITOR_OnPoll  (void);
+
+#endif
+
+/****** End Of File *************************************************/

src/platform/nrf52/architecture.h

@@ -40,6 +40,8 @@
     #define HW_VENDOR HardwareModel_T_ECHO
 #elif defined(NORDIC_PCA10059)
     #define HW_VENDOR HardwareModel_NRF52840_PCA10059
+#elif defined(PRIVATE_HW)
+    #define HW_VENDOR HardwareModel_PRIVATE_HW
 #else
     #define HW_VENDOR HardwareModel_NRF52_UNKNOWN
 #endif

src/platform/rp2040/architecture.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#define ARCH_RP2040
+
+#if defined(PRIVATE_HW)
+    #define HW_VENDOR HardwareModel_PRIVATE_HW
+#endif

src/platform/rp2040/main-rp2040.cpp

@@ -0,0 +1,30 @@
+#include "configuration.h"
+#include <stdio.h>
+#include <pico/unique_id.h>
+
+void setBluetoothEnable(bool on)
+{
+    // not needed
+}
+
+void cpuDeepSleep(uint64_t msecs)
+{
+    // not needed
+}
+
+void updateBatteryLevel(uint8_t level)
+{
+    // not needed
+}
+
+void getMacAddr(uint8_t *dmac)
+{
+    pico_unique_board_id_t src;
+    pico_get_unique_board_id(&src);
+    dmac[5] = src.id[0];
+    dmac[4] = src.id[1];
+    dmac[3] = src.id[2];
+    dmac[2] = src.id[3];
+    dmac[1] = src.id[4];
+    dmac[0] = src.id[5];
+}

src/platform/rp2040/rp2040CryptoEngine.cpp

@@ -0,0 +1,36 @@
+#include "configuration.h"
+#include "CryptoEngine.h"
+#include "aes.hpp"
+
+class RP2040CryptoEngine : public CryptoEngine
+{
+  public:
+    RP2040CryptoEngine() {}
+
+    ~RP2040CryptoEngine() {}
+
+    /**
+     * Encrypt a packet
+     *
+     * @param bytes is updated in place
+     */
+    virtual void encrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes) override
+    {
+        if (key.length > 0) {
+            AES_ctx ctx;
+            initNonce(fromNode, packetNum);
+            AES_init_ctx_iv(&ctx, key.bytes, nonce);
+            AES_CTR_xcrypt_buffer(&ctx, bytes, numBytes);
+        }
+    }
+
+    virtual void decrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes) override
+    {
+        // For CTR, the implementation is the same
+        encrypt(fromNode, packetNum, numBytes, bytes);
+    }
+
+  private:
+};
+
+CryptoEngine *crypto = new RP2040CryptoEngine();

src/shutdown.h

@@ -35,7 +35,7 @@ void powerCommandsCheck()
 
     if (shutdownAtMsec && millis() > shutdownAtMsec) {
         DEBUG_MSG("Shutting down from admin command\n");
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
         if (axp192_found == true) {
             playShutdownMelody();
             power->shutdown();

src/sleep.cpp

@@ -21,7 +21,7 @@
 esp_sleep_source_t wakeCause; // the reason we booted this time
 #endif
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
 #include "axp20x.h"
 extern AXP20X_Class axp;
 #endif
@@ -80,7 +80,7 @@ void setLed(bool ledOn)
     digitalWrite(LED_PIN, ledOn ^ LED_INVERTED);
 #endif
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     if (axp192_found) {
         // blink the axp led
         axp.setChgLEDMode(ledOn ? AXP20X_LED_LOW_LEVEL : AXP20X_LED_OFF);
@@ -92,7 +92,7 @@ void setGPSPower(bool on)
 {
     DEBUG_MSG("Setting GPS power=%d\n", on);
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     if (axp192_found)
         axp.setPowerOutPut(AXP192_LDO3, on ? AXP202_ON : AXP202_OFF); // GPS main power
 #endif
@@ -187,7 +187,7 @@ void doDeepSleep(uint64_t msecToWake)
     digitalWrite(VEXT_ENABLE, 1); // turn off the display power
 #endif
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     if (axp192_found) {
         // Obsolete comment: from back when we we used to receive lora packets while CPU was in deep sleep.
         // We no longer do that, because our light-sleep current draws are low enough and it provides fast start/low cost

variants/pico/platformio.ini

@@ -0,0 +1,17 @@
+[env:pico]
+extends = rp2040_base
+board = pico
+upload_protocol = picotool
+
+# add our variants files to the include and src paths
+build_flags = ${rp2040_base.build_flags} 
+  -DPRIVATE_HW
+  -Ivariants/pico
+  -DARDUINO_AVR_NANO_EVERY
+  -DDEBUG_RP2040_WIRE
+  -DDEBUG_RP2040_SPI
+  -DDEBUG_RP2040_CORE
+  -DDEBUG_RP2040_PORT=Serial
+  -DUSE_TINYUSB
+lib_deps =
+  ${rp2040_base.lib_deps}

variants/pico/variant.h

@@ -0,0 +1,52 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#define CBC 0
+#define CTR 1
+#define ECB 0
+
+#define NO_GPS 1
+#define USE_SH1106 1
+#undef GPS_SERIAL_NUM
+
+// #define I2C_SDA 6
+// #define I2C_SCL 7
+
+#define BUTTON_PIN 17
+#define EXT_NOTIFY_OUT 4
+
+#define BATTERY_PIN 26
+// ratio of voltage divider = 3.0 (R17=200k, R18=100k)
+#define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+
+#define USE_RF95
+#define USE_SX1262
+
+#undef RF95_SCK
+#undef RF95_MISO
+#undef RF95_MOSI
+#undef RF95_NSS
+
+#define RF95_SCK 10
+#define RF95_MISO 12
+#define RF95_MOSI 11
+#define RF95_NSS 3
+
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 15
+#define LORA_DIO1 20
+#define LORA_DIO2 2
+#define LORA_DIO3 RADIOLIB_NC
+
+#ifdef USE_SX1262
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22
+#endif
+
+#include <Adafruit_TinyUSB.h>

variants/portduino/platformio.ini

@@ -2,10 +2,11 @@
 [portduino_base]
 build_src_filter = 
   ${env.build_src_filter} 
-  -<esp32/> 
+  -<platform/esp32/> 
   -<nimble/> 
-  -<nrf52/> 
-  -<stm32wl/> 
+  -<platform/nrf52/> 
+  -<platform/stm32wl/> 
+  -<platform/rp2040>
   -<mesh/http/> 
   -<modules/esp32>
   -<modules/Telemetry>
@@ -15,7 +16,7 @@ lib_deps =
   ${networking_base.lib_deps}
   rweather/Crypto
   https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
-build_flags = ${arduino_base.build_flags} -Isrc/portduino
+build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino
 
 [env:native]
 platform = https://github.com/meshtastic/platform-native.git 

variants/station-g1/variant.h

@@ -26,11 +26,16 @@
 //#define SX126X_E22 // Not really an E22 
 // Internally the module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
 // code)
+#define SX126X_MAX_POWER 16  //Ensure the PA does not exceed the saturation output power. More Info:https://uniteng.com/wiki/doku.php?id=meshtastic:station#rf_design_-_lora_station_edition_g1
 #endif
 
 #define BATTERY_PIN 35    // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define BATTERY_SENSE_SAMPLES 30  //Set the number of samples, It has an effect of increasing sensitivity.
-#define ADC_MULTIPLIER 2.15
+#define ADC_MULTIPLIER 6.45
+#define BAT_FULLVOLT 12600
+#define BAT_EMPTYVOLT 8200
+#define BAT_CHARGINGVOLT 12600
+#define BAT_NOBATVOLT 6690
 
 // different screen
 #define USE_SH1106

variants/tbeam/variant.h

@@ -34,4 +34,4 @@
 // Leave undefined to disable our PMU IRQ handler.  DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
 // and waking from light sleep
 // #define PMU_IRQ 35
-#define AXP192_SLAVE_ADDRESS 0x34
+#define HAS_AXP192

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 34
+build = 36