Merge pull request #189 from sparkfun/Display_Refactoring

Update non-release build - artifact is a zip of the firmware, bootloader and partitions .bin's

Author: PaulZC

.github/workflows/non-release-build.yml

@@ -1,4 +1,4 @@
-name: Build RTK Everywhere (Non-Release)
+name: Non-Release Build
 on: 
   workflow_dispatch:
     branches: 
@@ -145,13 +145,21 @@ jobs:
           --build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_LBAND_PAID_TOKEN=$POINTPERFECT_LBAND_PAID_TOKEN\" \"-DPOINTPERFECT_LBAND_FREE_TOKEN=$POINTPERFECT_LBAND_FREE_TOKEN\" \"-DPOINTPERFECT_IP_PAID_TOKEN=$POINTPERFECT_IP_PAID_TOKEN\" \"-DPOINTPERFECT_IP_FREE_TOKEN=$POINTPERFECT_IP_FREE_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
           --export-binaries
 
-      - name: Rename binary
+      - name: Create artifact name
+        run: |
+          echo "ARTIFACT=${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}" >> $GITHUB_ENV
+
+      - name: Create artifact directory
         run: |
           cd Firmware/RTK_Everywhere/build/esp32.esp32.esp32/
-          mv RTK_Everywhere.ino.bin ${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}.bin
+          mkdir ${{ env.ARTIFACT }}
+          mv RTK_Everywhere.ino.bin ${{ env.ARTIFACT }}
+          mv RTK_Everywhere.ino.bootloader.bin ${{ env.ARTIFACT }}
+          mv RTK_Everywhere.ino.partitions.bin ${{ env.ARTIFACT }}
 
-      - name: Upload binary to action
+      - name: Upload artifact directory to action - avoid double-zip
         uses: actions/upload-artifact@v3
         with: 
-          name: ${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}
-          path: ./Firmware/RTK_Everywhere/build/esp32.esp32.esp32/${{ env.FILENAME_PREFIX }}${{ env.FILE_ENDING_UNDERSCORE }}.bin
+          name: ${{ env.ARTIFACT }}
+          path: Firmware/RTK_Everywhere/build/esp32.esp32.esp32/${{ env.ARTIFACT }}
+          retention-days: 7

.gitignore

@@ -1,3 +1,5 @@
+# Individual files - e.g. compiled binaries or local batch files - can be added to .git/info/exclude
+
 partitions.csv
 
 tokens.h

Firmware/RTK_Everywhere/form.h

@@ -26,7 +26,7 @@
 //  python main_js_zipper.py
 
 static const uint8_t main_js[] PROGMEM = {
-  0x1F, 0x8B, 0x08, 0x08, 0x5E, 0x6F, 0xEB, 0x65, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
+  0x1F, 0x8B, 0x08, 0x08, 0x70, 0x34, 0xF4, 0x65, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
   0x73, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0xEB, 0x7A, 0xDB, 0x38, 0x92, 0xE8, 0xFF,
   0x3C, 0x05, 0x46, 0xDB, 0xA7, 0x25, 0x4D, 0x64, 0x99, 0x92, 0x2F, 0xB9, 0x38, 0xF6, 0x1E, 0xDF,
   0x92, 0x78, 0x27, 0x76, 0xFC, 0x59, 0x4E, 0x77, 0x27, 0x3D, 0x39, 0x5E, 0x5A, 0x84, 0x65, 0x4E,
@@ -774,7 +774,7 @@ static const uint8_t main_js[] PROGMEM = {
 //  python index_html_zipper.py
 
 static const uint8_t index_html[] PROGMEM = {
-  0x1F, 0x8B, 0x08, 0x08, 0x5E, 0x6F, 0xEB, 0x65, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
+  0x1F, 0x8B, 0x08, 0x08, 0x70, 0x34, 0xF4, 0x65, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
   0x68, 0x74, 0x6D, 0x6C, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0xDB, 0x72, 0xDB, 0xC8,
   0x92, 0xE0, 0xBB, 0xBF, 0xA2, 0x86, 0xB3, 0xB3, 0x96, 0xE6, 0x88, 0x14, 0x49, 0x5D, 0x2C, 0xEB,
   0xD8, 0x8C, 0x90, 0x44, 0xC9, 0x56, 0x1C, 0x59, 0xE6, 0x8A, 0xF2, 0xE9, 0x6E, 0x6F, 0xEC, 0x76,