OpenEVSE · jeremypoulter · May 12, 2023 · May 9, 2023 · May 9, 2023 · May 9, 2023
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -8,10 +8,6 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
-      v1_ref:
-        required: true
-        description: The branch/tag for the v1 UI
-        default: master
       v2_ref:
         required: true
         description: The branch/tag for the v2 UI
@@ -59,13 +55,9 @@ jobs:
           - openevse_esp32-poe-iso
           - openevse_esp32-heltec-wifi-lora-v2
         gui:
-          - name: gui-v1
-            repo: OpenEVSE/openevse_wifi_gui
-            build_flags: ""
-            ref: ${{ inputs.v1_ref }}
           - name: gui-v2
-            repo: KipK/openevse-gui-v2
-            build_flags: "-D DISABLE_WIFI_PORTAL -D WEB_SERVER_ROOT_PAGE_INDEX"
+            repo: OpenEVSE/openevse-gui-v2
+            build_flags: ""
             ref: ${{ inputs.v2_ref }}
 
     steps:
@@ -129,7 +121,7 @@ jobs:
     - name: Upload output to GitHub
       uses: actions/upload-artifact@v3
       with:
-        name: ${{ matrix.env }}_${{ matrix.gui.name }}.bin
+        name: ${{ matrix.env }}.bin
         path: .pio/build/${{ matrix.env }}/firmware.bin
 
   release:
@@ -161,18 +153,7 @@ jobs:
         prerelease: true
         title: Development Build
         files: |
-          *gui-v1.bin
-
-    - name: Upload assets to the v2 GUI release
-      if: github.ref_name == 'master'
-      uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: v2_gui
-        prerelease: true
-        title: V2 GUI pre-release
-        files: |
-          *gui-v2.bin
+          *.bin
 
     - name: Upload assets to release
       if: startsWith(github.ref_name, 'v')

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "gui"]
-	path = gui
-	url = https://github.com/openevse/openevse_wifi_gui
+[submodule "gui-v2"]
+	path = gui-v2
+	url = https://github.com/OpenEVSE/openevse-gui-v2
 	branch = master
diff --git a/gui b/gui
diff --git a/gui-v2 b/gui-v2
diff --git a/scripts/extra_script.py b/scripts/extra_script.py
@@ -178,7 +178,7 @@ def process_html_app(source, dest, env):
 
     gui_name = environ.get("GUI_NAME")
     if gui_name in (None, ""): 
-        gui_name = "gui"
+        gui_name = "gui-v2"
 
     gui_dir = join(env.subst("$PROJECT_DIR"), gui_name)
     dist_dir = join(gui_dir, "dist")

diff --git a/src/web_static/web_server.assets_components_3dc157ab_js_gz.h b/src/web_static/web_server.assets_components_3dc157ab_js_gz.h
diff --git a/src/web_static/web_server.assets_components_a2a8801e_css_gz.h b/src/web_static/web_server.assets_components_a2a8801e_css_gz.h
@@ -0,0 +1,62 @@
+static const char CONTENT_COMPONENTS_A2A8801E_CSS_GZ[] PROGMEM = {
+  0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0xc5, 0x56, 0xed, 0x6e, 0x9b, 0x30, 
+  0x14, 0xfd, 0xbf, 0xa7, 0xa8, 0x34, 0x55, 0x6a, 0xa5, 0x82, 0x08, 0x0d, 0x09, 0x31, 0x0f, 0x33, 
+  0x19, 0x30, 0xe0, 0xc6, 0xd8, 0xcc, 0x36, 0x84, 0x26, 0xca, 0xbb, 0xcf, 0x36, 0x06, 0x12, 0x43, 
+  0x96, 0xfd, 0x9b, 0x22, 0x35, 0xe0, 0xdc, 0xcf, 0x73, 0xef, 0x39, 0xae, 0x5f, 0xb3, 0x1c, 0x12, 
+  0x5f, 0x74, 0x88, 0x48, 0xe4, 0x6d, 0x7e, 0xc7, 0xbb, 0x5d, 0x7e, 0xbc, 0x34, 0x4c, 0x60, 0x89, 
+  0x19, 0x05, 0x05, 0xee, 0x51, 0x9e, 0x48, 0xd6, 0x80, 0x28, 0x78, 0x4d, 0x08, 0x2a, 0xa4, 0x79, 
+  0x90, 0x1c, 0x52, 0x51, 0x30, 0x5e, 0x03, 0xf3, 0x44, 0xa0, 0x44, 0x6f, 0x9e, 0xfa, 0xe1, 0x43, 
+  0xff, 0x79, 0x4f, 0x4e, 0x38, 0x97, 0x15, 0xd8, 0x04, 0x41, 0x77, 0x4a, 0x2a, 0x84, 0xcb, 0x4a, 
+  0x9a, 0x97, 0x2a, 0x39, 0x7b, 0x98, 0xe6, 0xa8, 0x07, 0xf1, 0xd5, 0x37, 0x79, 0xbd, 0x8c, 0x51, 
+  0x89, 0xa8, 0x74, 0xf3, 0xd7, 0x90, 0x97, 0x98, 0x02, 0xd8, 0x4a, 0x96, 0xb0, 0x0e, 0xf1, 0x82, 
+  0xb0, 0x93, 0xf7, 0xed, 0xbc, 0xf7, 0xa0, 0xc2, 0x79, 0x8e, 0x68, 0x52, 0xc3, 0xde, 0xb3, 0x69, 
+  0x62, 0x55, 0x9c, 0x7e, 0x1d, 0x2a, 0x38, 0x04, 0xaf, 0x6e, 0xa2, 0x02, 0x2f, 0x92, 0x0d, 0xb6, 
+  0xea, 0x87, 0xd1, 0xe8, 0xea, 0x57, 0x88, 0x34, 0x93, 0x59, 0x5f, 0xb2, 0x90, 0xa9, 0x64, 0x3a, 
+  0xf1, 0x65, 0xee, 0x5c, 0x64, 0x90, 0xa0, 0xb7, 0x8d, 0x1f, 0xbe, 0x5f, 0x7d, 0xca, 0x24, 0x2e, 
+  0x70, 0x06, 0x35, 0x66, 0x8e, 0xdf, 0xe5, 0xa6, 0x7e, 0x91, 0x71, 0x46, 0xc8, 0x0d, 0x24, 0xaa, 
+  0x3c, 0x17, 0x81, 0xa5, 0x97, 0xe9, 0xda, 0xfa, 0xdc, 0x55, 0x99, 0x32, 0x9e, 0x23, 0x2e, 0x26, 
+  0x57, 0x98, 0xe2, 0x86, 0xd1, 0x79, 0x78, 0x1c, 0xa9, 0xc1, 0xe0, 0x0e, 0x25, 0x83, 0xa1, 0xc7, 
+  0x61, 0x8e, 0x5b, 0xa1, 0xf2, 0x36, 0xbd, 0x3d, 0x02, 0x9b, 0xa6, 0x7f, 0x11, 0x8c, 0xe0, 0xfc, 
+  0x85, 0x97, 0xe9, 0x5b, 0x14, 0x7c, 0x6c, 0xf6, 0x87, 0x8f, 0x70, 0x13, 0xbe, 0xdf, 0xa3, 0x98, 
+  0xd4, 0x98, 0xda, 0xb7, 0x30, 0xd0, 0xee, 0xcb, 0x72, 0x54, 0xc4, 0xde, 0x13, 0xf8, 0x8c, 0x69, 
+  0x09, 0xec, 0x91, 0xa7, 0x8e, 0x1c, 0x2c, 0xdd, 0x12, 0x61, 0xaa, 0xb2, 0xb7, 0x12, 0x25, 0xdc, 
+  0xc4, 0xdb, 0xab, 0xd0, 0x7a, 0xd9, 0xf4, 0x77, 0x0a, 0xb3, 0x63, 0xc9, 0x59, 0x4b, 0x73, 0x95, 
+  0x82, 0x30, 0x0e, 0x7e, 0x16, 0x45, 0x71, 0xf5, 0x25, 0x2c, 0xfd, 0xb4, 0x9d, 0xf0, 0x3a, 0xe5, 
+  0x34, 0x6b, 0x76, 0x0f, 0x7b, 0x06, 0x81, 0x8d, 0xe8, 0x6d, 0xd5, 0xc3, 0x90, 0x44, 0xf5, 0x6c, 
+  0x37, 0xf4, 0x53, 0x1d, 0x3e, 0x88, 0x68, 0xc7, 0xbd, 0x2c, 0x22, 0x40, 0xdb, 0x7c, 0x17, 0xea, 
+  0xb9, 0xb5, 0x54, 0xe6, 0xec, 0x44, 0xff, 0xa1, 0x12, 0x29, 0x59, 0x0d, 0x36, 0x91, 0x4a, 0x56, 
+  0xf1, 0xd1, 0xfc, 0x78, 0x8c, 0xc3, 0x34, 0xbc, 0xd8, 0xd1, 0xe8, 0x12, 0x1f, 0xcf, 0x62, 0x19, 
+  0x73, 0x20, 0x88, 0x71, 0x0b, 0xc6, 0x17, 0x9b, 0x27, 0x98, 0x76, 0x4a, 0xc1, 0xef, 0x64, 0x7b, 
+  0xb6, 0x1a, 0x3b, 0x05, 0xcd, 0xd8, 0x67, 0x10, 0xac, 0x8f, 0xc0, 0xec, 0x82, 0x9d, 0xbf, 0xd6, 
+  0x82, 0xb5, 0xcd, 0xac, 0x21, 0xa6, 0xce, 0x62, 0xdb, 0x0a, 0x34, 0xaa, 0x03, 0x0d, 0xbc, 0x14, 
+  0x55, 0xb0, 0xc3, 0x2a, 0xaa, 0xb6, 0x54, 0x0e, 0xf7, 0xab, 0xe2, 0x56, 0xfc, 0x60, 0x53, 0x62, 
+  0x3d, 0x41, 0x5d, 0xe7, 0x53, 0x3f, 0x23, 0x5e, 0xa3, 0xdb, 0x6e, 0xdd, 0xed, 0x09, 0xc9, 0xbd, 
+  0x86, 0x61, 0xd5, 0xd4, 0x34, 0xc3, 0x82, 0x9e, 0x53, 0x1e, 0x5e, 0xb2, 0x96, 0x0b, 0xd5, 0x46, 
+  0x8e, 0x0a, 0xd8, 0x12, 0x99, 0x58, 0x23, 0x0f, 0x75, 0xaa, 0x7d, 0x01, 0x28, 0xa3, 0xe8, 0xea, 
+  0x77, 0x90, 0xb4, 0x68, 0xa2, 0x01, 0xd9, 0xa6, 0x87, 0x50, 0xae, 0x29, 0x8f, 0x50, 0xf3, 0x57, 
+  0xcc, 0x57, 0xb9, 0xd7, 0x8d, 0x07, 0x81, 0x33, 0xf3, 0x36, 0x0d, 0x19, 0x71, 0xb0, 0x07, 0x03, 
+  0x32, 0xfa, 0xe4, 0xea, 0x13, 0x98, 0x22, 0xe2, 0x86, 0x58, 0x8e, 0x5f, 0x63, 0x11, 0xea, 0xc5, 
+  0xf4, 0x05, 0x22, 0x28, 0x9b, 0xa6, 0xf5, 0xcd, 0x9a, 0x68, 0x1b, 0x5d, 0x66, 0x11, 0x08, 0xa3, 
+  0x40, 0x5b, 0xe9, 0xc1, 0x3a, 0x36, 0x8b, 0xa0, 0x2a, 0x96, 0x54, 0x17, 0xc2, 0x23, 0xb3, 0x69, 
+  0x20, 0xac, 0x81, 0x19, 0x96, 0xdf, 0x60, 0x33, 0x10, 0xf4, 0x73, 0x66, 0xa8, 0x5e, 0xc3, 0xf1, 
+  0xaa, 0xd8, 0x3a, 0x2b, 0xaa, 0x57, 0x2e, 0xc7, 0xa2, 0x21, 0xf0, 0x1b, 0x60, 0x4a, 0x30, 0x45, 
+  0x5e, 0x4a, 0x58, 0x76, 0xb4, 0x94, 0x0e, 0xe3, 0x59, 0x9d, 0xcc, 0xf3, 0x8d, 0xd0, 0xe9, 0x49, 
+  0xb8, 0xdc, 0x5a, 0x08, 0xf0, 0x39, 0xde, 0x97, 0x61, 0x61, 0xd1, 0x0e, 0x77, 0x37, 0x62, 0xb7, 
+  0x09, 0x0c, 0x04, 0xd6, 0xfe, 0x17, 0xcc, 0xeb, 0x19, 0x0b, 0xeb, 0x35, 0xde, 0x42, 0x66, 0x2b, 
+  0x57, 0x6f, 0x38, 0x6b, 0x38, 0x03, 0x1b, 0x19, 0x3d, 0xbd, 0xd1, 0xd7, 0x83, 0x7e, 0x1f, 0xe5, 
+  0x7f, 0x9c, 0xef, 0x74, 0xc1, 0x1d, 0xa2, 0xd7, 0x71, 0x49, 0x56, 0x2b, 0x1e, 0x2e, 0x15, 0x2c, 
+  0xd1, 0xbc, 0x3f, 0x45, 0x87, 0x9a, 0xa0, 0x9a, 0x6e, 0x14, 0xd0, 0x61, 0x81, 0x53, 0x82, 0x16, 
+  0xc2, 0x37, 0x1a, 0x8e, 0xca, 0xf9, 0x37, 0x91, 0xb4, 0xb6, 0x4f, 0x55, 0x52, 0xbb, 0x51, 0x58, 
+  0x23, 0x37, 0xc7, 0xdc, 0x6f, 0x6c, 0x14, 0x1a, 0xf5, 0xd2, 0x83, 0x04, 0x97, 0x14, 0x64, 0x48, 
+  0x93, 0x67, 0x38, 0x99, 0x4a, 0x46, 0x84, 0xe0, 0x46, 0x60, 0x61, 0x02, 0xae, 0xc4, 0x53, 0x1c, 
+  0xe2, 0x42, 0x2a, 0x46, 0x48, 0xa9, 0xe9, 0xab, 0x7d, 0x67, 0x0e, 0xb7, 0x4d, 0x83, 0x78, 0x06, 
+  0x85, 0xea, 0x98, 0x30, 0xb5, 0x44, 0xb4, 0x9c, 0x79, 0x71, 0x3c, 0x46, 0xfb, 0xf3, 0x65, 0x95, 
+  0xb1, 0xa2, 0xa1, 0x7c, 0x69, 0xe8, 0x12, 0xc8, 0x90, 0xd0, 0xfb, 0x7c, 0x19, 0x30, 0x4a, 0x27, 
+  0x87, 0x2f, 0xb4, 0x3f, 0xfd, 0xe6, 0xa0, 0x60, 0x59, 0x2b, 0x2e, 0xac, 0x95, 0x7a, 0x51, 0x4d, 
+  0xe0, 0x35, 0x51, 0x8d, 0xf4, 0x67, 0xa8, 0x6e, 0x4a, 0x79, 0x2a, 0x2a, 0x12, 0xd4, 0x2b, 0xb4, 
+  0xb1, 0xaa, 0x67, 0x33, 0xc7, 0x2e, 0x2b, 0x5d, 0xbf, 0x07, 0xac, 0x7c, 0x18, 0xfe, 0x9e, 0x95, 
+  0x53, 0xa2, 0xe0, 0x8e, 0x92, 0x7f, 0x21, 0x60, 0x74, 0xc3, 0x98, 0x70, 0xfb, 0x9c, 0x80, 0x37, 
+  0x78, 0x80, 0x53, 0xa5, 0x16, 0xd7, 0xe5, 0xfb, 0x3f, 0xfc, 0xb3, 0x72, 0x8f, 0x00, 0x93, 0x5f, 
+  0x3d, 0x69, 0x9f, 0x22, 0xe0, 0x9a, 0xdd, 0x01, 0xfc, 0xbf, 0xd4, 0xe8, 0xc7, 0x1f, 0x80, 0x5f, 
+  0x12, 0x38, 0x90, 0x0b, 0x00, 0x00, 0x00 };
+static const char CONTENT_COMPONENTS_A2A8801E_CSS_GZ_ETAG[] PROGMEM = "06e4ac9078f29eac334f16cec80e03fe95037939797bcad3918d0e755afdfc1c";