Merge pull request #457 from sparkfun/release_candidate

Add LoRa support. Add ESP-NOW Broadcast.
sparkfun · Aug 29, 2024 · 2e26bee · 2e26bee
2 parents d0a99da + 55abf96
commit 2e26bee
Show file tree

Hide file tree

Showing 42 changed files with 2,736 additions and 1,280 deletions.
diff --git a/.github/workflows/compile-rtk-everywhere.yml b/.github/workflows/compile-rtk-everywhere.yml
@@ -6,7 +6,7 @@ on:
 env:
   FILENAME_PREFIX: RTK_Everywhere_Firmware
   FIRMWARE_VERSION_MAJOR: 1
-  FIRMWARE_VERSION_MINOR: 3
+  FIRMWARE_VERSION_MINOR: 4
   POINTPERFECT_LBAND_TOKEN: ${{ secrets.POINTPERFECT_LBAND_TOKEN }}
   POINTPERFECT_IP_TOKEN: ${{ secrets.POINTPERFECT_IP_TOKEN }}
   POINTPERFECT_LBAND_IP_TOKEN: ${{ secrets.POINTPERFECT_LBAND_IP_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
               echo "JSON_ENDING=-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
               echo "JSON_FILE_NAME=RTK-Everywhere-RC-Firmware.json" >> "$GITHUB_ENV"
               echo "ENABLE_DEVELOPER=true" >> "$GITHUB_ENV"
-              echo "DEBUG_LEVEL=debug" >> "$GITHUB_ENV"
+              echo "DEBUG_LEVEL=error" >> "$GITHUB_ENV"
           fi
 
       - name: Setup Arduino CLI
@@ -78,7 +78,7 @@ jobs:
         run: arduino-cli lib install
           [email protected]
           [email protected]
-          [email protected].4
+          [email protected].5
           "ESP32-OTA-Pull"@1.0.0
           [email protected]
           [email protected]

diff --git a/Firmware/RTK_Everywhere/AP-Config/index.html b/Firmware/RTK_Everywhere/AP-Config/index.html
@@ -1636,17 +1636,6 @@
                         </div>
                     </div>
 
-                    <div class="form-check">
-                        <div class="form-check mt-3">
-                            <label class="form-check-label" for="espnowBroadcast">Broadcast Override</label>
-                            <input class="form-check-input" type="checkbox" value="" id="espnowBroadcast" unchecked>
-                            <span class="tt" data-bs-placement="right"
-                                title="When true, overrides peers and sends all data via broadcast to all ESP32s in range that have ESP-Now enabled. Default: Disabled">
-                                <span class="icon-info-circle text-primary ms-2"></span>
-                            </span>
-                        </div>
-                    </div>
-
                 </div>
             </div>
         </div>
@@ -1710,14 +1699,25 @@
         <div class="collapse" id="collapseInstrumentConfig">
             <div class="card card-body">
 
-                <div id="tiltConfig" class="form-check mt-3">
-                    <label class="form-check-label" for="enableTiltCompensation">Enable Tilt
-                        Compensation</label>
-                    <input class="form-check-input" type="checkbox" value="" id="enableTiltCompensation">
-                    <span class="tt" data-bs-placement="right"
-                        title="Allow tilt compensation mode to be entered. Default: Enabled.">
-                        <span class="icon-info-circle text-primary ms-2"></span>
-                    </span>
+                <div id="tiltConfig">
+                    <div class="form-check mt-3">
+                        <label class="form-check-label" for="enableTiltCompensation">Enable Tilt
+                            Compensation</label>
+                        <input class="form-check-input" type="checkbox" value="" id="enableTiltCompensation">
+                        <span class="tt" data-bs-placement="right"
+                            title="Allow tilt compensation mode to be entered. Default: Enabled.">
+                            <span class="icon-info-circle text-primary ms-2"></span>
+                        </span>
+                    </div>
+
+                    <div class="form-check mt-3">
+                        <label class="form-check-label" for="outputTipAltitude">Output Tip Altitude</label>
+                        <input class="form-check-input" type="checkbox" value="" id="outputTipAltitude">
+                        <span class="tt" data-bs-placement="right"
+                            title="Output pole tip altitude instead of antenna altitude. Default: Disabled.">
+                            <span class="icon-info-circle text-primary ms-2"></span>
+                        </span>
+                    </div>
                 </div>
 
                 <div id="antennaPhaseCenter_mmConfig">

diff --git a/Firmware/RTK_Everywhere/Base.ino b/Firmware/RTK_Everywhere/Base.ino
@@ -12,6 +12,8 @@ void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
     for (int x = 0; x < dataLength; x++)
         espnowProcessRTCM(rtcmData[x]);
 
+    loraProcessRTCM(rtcmData, dataLength);
+
     rtcmLastPacketSent = millis();
     rtcmPacketsSent++;