Merge branch 'master' into master

2022-10-31 06:12:16 -05:00 · 2022-10-31 06:12:16 -05:00 · 760d463bf5
commit 760d463bf5
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@ -43,7 +43,7 @@ jobs:
          - board: m5stack-coreink
          - board: tbeam-s3-core
        # - board: pico
-          
+
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -133,11 +133,11 @@ jobs:
      - name: Upgrade platformio
        run: |
          pio upgrade
-          
+
      - name: Pull web ui
        uses: dsaltares/fetch-gh-release-asset@master
        with:
-          repo: "meshtastic/meshtastic-web"
+          repo: "meshtastic/web"
          file: "build.tar"
          target: "build.tar"
          token: ${{ secrets.GITHUB_TOKEN }}
@ -149,7 +149,7 @@ jobs:

      - name: Build ESP32
        run: bin/build-esp32.sh ${{ matrix.board }}
-         
+
      - name: Pull OTA Firmware
        uses: dsaltares/fetch-gh-release-asset@master
        with:
@ -157,7 +157,7 @@ jobs:
          file: "firmware.bin"
          target: "release/bleota.bin"
          token: ${{ secrets.GITHUB_TOKEN }}
-          
+
      - name: Get release version string
        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version
@ -394,7 +394,7 @@ jobs:
      # For diagnostics
      - name: Show artifacts
        run: ls -lR
-        
+
      - name: Device scripts permissions
        run: |
          chmod +x ./output/device-install.sh
@ -429,7 +429,7 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-          
+
      - name: Setup Python
        uses: actions/setup-python@v4
        with:
@ -443,7 +443,7 @@ jobs:
        with:
          name: firmware-${{ steps.version.outputs.version }}
          path: ./output
-      
+
      - name: Device scripts permissions
        run: |
          chmod +x ./output/device-install.sh
@ -456,7 +456,7 @@ jobs:
        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

@ -500,10 +500,9 @@ jobs:
      - name: Bump version.properties
        run: >-
          bin/bump_version.py
-          
+
      - name: Create version.properties pull request
        uses: peter-evans/create-pull-request@v3
        with:
          add-paths: |
            version.properties
-
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
 [submodule "protobufs"]
 	path = protobufs
-	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+	url = https://github.com/meshtastic/protobufs.git
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 # Meshtastic Firmware

-![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
-[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-device/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/repo/actions/workflows/main_matrix.yml)
-[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-device)](https://cla-assistant.io/meshtastic/Meshtastic-device)
+![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/main_matrix.yml)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware)
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

@ -10,10 +10,9 @@

 This repository contains the device firmware for the Meshtastic project.

-
 **[Building Instructions](https://meshtastic.org/docs/developers/Firmware/build)**
 **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**

 ## Stats

-![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image')
+![Alt](https://repobeats.axiom.co/api/embed/a92f097d9197ae853e780ec53d7d126e545629ab.svg "Repobeats analytics image")
--- a/bin/promote-release.sh
+++ b/bin/promote-release.sh
@ -9,9 +9,6 @@ VERSION=`bin/buildinfo.py long`
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"

-# Commented out per https://github.com/meshtastic/Meshtastic-device/issues/947
-#git push root "v${VERSION}" # push the tag
-
 git push origin "v${VERSION}" # push the tag

 echo "Tag ${VERSION} pushed to github, github actions should now be building the draft release.  If it seems good, click to publish it"
--- a/bin/regen-protos.sh
+++ b/bin/regen-protos.sh
@ -3,7 +3,7 @@
 set -e

 echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.6 to be located in the"
-echo "meshtastic-device root directory if the following step fails, you should download the correct"
+echo "firmware root directory if the following step fails, you should download the correct"
 echo "prebuilt binaries for your computer into nanopb-0.4.6"

 # the nanopb tool seems to require that the .options file be in the current directory!
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@ -337,7 +337,7 @@ void PowerFSM_setup()
 #ifdef ARCH_ESP32
    // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)

-    // See: https://github.com/meshtastic/Meshtastic-device/issues/1071
+    // See: https://github.com/meshtastic/firmware/issues/1071
    if (isRouter || config.power.is_power_saving) {
        powerFSM.add_timed_transition(&stateNB, &stateLS, getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, "Min wake timeout");
        powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout");
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@ -267,7 +267,7 @@ their nodes
 *
 * This function will also need to be implemented in GUI apps that talk to the radio.
 *
-* https://github.com/meshtastic/Meshtastic-device/issues/269
+* https://github.com/meshtastic/firmware/issues/269
 */
 const char *Channels::getPrimaryName()
 {
--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@ -74,7 +74,7 @@ class Channels
     *
     * This function will also need to be implemented in GUI apps that talk to the radio.
     *
-     * https://github.com/meshtastic/Meshtastic-device/issues/269
+     * https://github.com/meshtastic/firmware/issues/269
    */
    const char *getPrimaryName();

--- a/src/mesh/generated/portnums.pb.h
+++ b/src/mesh/generated/portnums.pb.h
@ -81,7 +81,7 @@ typedef enum _PortNum {
    PortNum_SIMULATOR_APP = 69, 
    /* Private applications should use portnums >= 256.
 To simplify initial development and testing you can use "PRIVATE_APP"
- in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/Meshtastic-device/blob/master/bin/regen-protos.sh)) */
+ in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */
    PortNum_PRIVATE_APP = 256, 
    /* ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */
    PortNum_ATAK_FORWARDER = 257, 
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@ -58,8 +58,6 @@ char contentTypes[][2][32] = {{".txt", "text/plain"},     {".html", "text/html"}
                              {".css", "text/css"},       {".ico", "image/vnd.microsoft.icon"},
                              {".svg", "image/svg+xml"},  {"", ""}};

-// const char *tarURL = "https://www.casler.org/temp/meshtastic-web.tar";
-// const char *tarURL = "https://api-production-871d.up.railway.app/mirror/webui";
 // const char *certificate = NULL; // change this as needed, leave as is for no TLS check (yolo security)

 // Our API to handle messages to and from the radio.
@ -75,8 +73,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
    ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio);
    ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);

-//    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
-//    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);

    ResourceNode *nodeAdmin = new ResourceNode("/admin", "GET", &handleAdmin);
    //    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
@ -160,7 +158,7 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Content-Type", "application/x-protobuf");
    res->setHeader("Access-Control-Allow-Origin", "*");
    res->setHeader("Access-Control-Allow-Methods", "GET");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");

    uint8_t txBuf[MAX_STREAM_BUF_SIZE];
    uint32_t len = 1;
@ -204,7 +202,7 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Access-Control-Allow-Headers", "Content-Type");
    res->setHeader("Access-Control-Allow-Origin", "*");
    res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");

    if (req->getMethod() == "OPTIONS") {
        res->setStatusCode(204); // Success with no content
@ -266,7 +264,7 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
            if (levels) {
 #ifdef ARCH_ESP32
                htmlListDir(fileList, file.path(), levels - 1);
-#else                
+#else
                htmlListDir(fileList, file.name(), levels - 1);
 #endif
                file.close();
@ -274,7 +272,7 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
        } else {
            std::map<char *, char *> thisFileMap;
            thisFileMap[strdup("size")] = strdup(String(file.size()).c_str());
-#ifdef ARCH_ESP32            
+#ifdef ARCH_ESP32
            thisFileMap[strdup("name")] = strdup(String(file.path()).substring(1).c_str());
 #else
            thisFileMap[strdup("name")] = strdup(String(file.name()).substring(1).c_str());
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@ -16,10 +16,10 @@
 /*

    Documentation:
-        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationModule.md
+        https://github.com/meshtastic/firmware/blob/master/docs/software/modules/ExternalNotificationModule.md

    This module supports:
-        https://github.com/meshtastic/Meshtastic-device/issues/654
+        https://github.com/meshtastic/firmware/issues/654


    Quick reference: