Merge pull request #33 from mp-se/dev

Merge 1.0 beta 1
mp-se · Aug 10, 2024 · 887893a · 887893a
2 parents 09b6d8f + c0b366c
commit 887893a
Show file tree

Hide file tree

Showing 80 changed files with 1,006 additions and 5,417 deletions.
diff --git a/.github/workflows/pio-build.yaml b/.github/workflows/pio-build.yaml
@@ -13,6 +13,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Checkout UI
+        run: |
+          echo "Checkout UI"
+          git clone https://github.com/mp-se/kegmon-ui kegmon-ui 
+          cp kegmon-ui/dist/css/app.css.gz html/
+          cp kegmon-ui/dist/js/app.js.gz html/
+          cp kegmon-ui/dist/index.html html/
+
       - name: Setup PlatformIO
         uses: n-vr/setup-platformio-action@v1.0.1    
 
@@ -31,13 +39,13 @@ jobs:
           verbose: true
           disable-auto-clean: false
 
-
       - uses: EndBug/add-and-commit@v9 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
         if: ${{ github.event_name != 'pull_request' }}
         with:
-          add: 'bin'
+          add: 'bin html'
           author_name: GitHub Action
           author_email: mp-se@noreply.github.com
           default_author: github_actor
           message: 'GitHub Action Build'
           pathspec_error_handling: ignore
+
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Magnus
+Copyright (c) 2022-2024 Magnus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/bin/firmware32s2.bin b/bin/firmware32s2.bin
diff --git a/bin/firmware32s3.bin b/bin/firmware32s3.bin
diff --git a/bin/littlefs.bin b/bin/littlefs.bin
diff --git a/diagram.json b/diagram.json
diff --git a/html/about.htm b/html/about.htm
diff --git a/html/about.min.htm b/html/about.min.htm
diff --git a/html/app.css.gz b/html/app.css.gz
diff --git a/html/app.js.gz b/html/app.js.gz