Merge branch 'master' into fix_software_calibration

awawa-dev · Apr 4, 2023 · 5950b22 · 5950b22
2 parents 93bad08 + 6f86cdc
commit 5950b22
Show file tree

Hide file tree

Showing 131 changed files with 555 additions and 509 deletions.
diff --git a/.github/workflows/image-builder-from-repo.yml b/.github/workflows/image-builder-from-repo.yml
@@ -90,7 +90,7 @@ jobs:
       run: |
         IMAGE=SD-card-image-${{ github.event.inputs.tags }}-${{ github.event.inputs.architecture }}
         cp ${{ env.workspace_dir }}/*.img $IMAGE.img
-        echo "::set-output name=image::$IMAGE"
+        echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # artifact upload will take care of zipping for us
     - uses: actions/upload-artifact@v1      

diff --git a/.github/workflows/image-builder.yml b/.github/workflows/image-builder.yml
@@ -91,7 +91,7 @@ jobs:
       run: |
         IMAGE=SD-card-image-${{ github.event.inputs.tags }}-${{ github.event.inputs.architecture }}
         cp ${{ env.workspace_dir }}/*.img $IMAGE.img
-        echo "::set-output name=image::$IMAGE"
+        echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # artifact upload will take care of zipping for us
     - uses: actions/upload-artifact@v1      

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -51,7 +51,7 @@ jobs:
         shell: cmake -P {0}
         run: |
           string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
+          file(APPEND "$ENV{GITHUB_OUTPUT}" "timestamp=${current_date}")
 
        # download cache
       - name: ccache cache files
@@ -110,7 +110,7 @@ jobs:
         shell: cmake -P {0}
         run: |
             string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
-            message("::set-output name=timestamp::${current_date}")
+            file(APPEND "$ENV{GITHUB_OUTPUT}" "timestamp=${current_date}")
 
       # Download cache
       - name: ccache cache files
@@ -242,7 +242,7 @@ jobs:
 
       # Download artifacts from previous build process
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 

diff --git a/assets/webconfig/css/bootstrap.min.css b/assets/webconfig/css/bootstrap.min.css
diff --git a/assets/webconfig/js/lib/bootstrap.min.js b/assets/webconfig/js/lib/bootstrap.min.js
diff --git a/assets/webconfig/js/lib/dialog.min.js b/assets/webconfig/js/lib/dialog.min.js