Merge branch 'dev'

Author: mp-se

.github/workflows/pio-build.yaml

@@ -4,22 +4,33 @@ on:
   pull_request:
   push:
     branches: 
+      - '2.0.0-fwk'
       - dev
 
 jobs:
   pio-build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-    
+      - name: Checkout 
+        uses: actions/checkout@v4
+
+      - name: Checkout UI
+        run: |
+          echo "Checkout UI"
+          git clone https://github.com/mp-se/gravitymon-ui gravitymon-ui 
+          cp gravitymon-ui/dist/css/app.css.gz html/
+          cp gravitymon-ui/dist/js/app.js.gz html/
+          cp gravitymon-ui/dist/index.html html/
+
       - name: Setup PlatformIO
         uses: n-vr/setup-platformio-action@v1.0.1    
 
       - name: PlatformIO Run
         uses: karniv00l/platformio-run-action@v1
         with:
-          environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32c3v1-release,gravity32lite-release"
+          #environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32c3v1-release,gravity32lite-release"
+          environments: "gravity-release,gravity32-release,gravity32c3-release,gravity32s2-release,gravity32s3-release,gravity32lite-release"
           #targets: ""
           #project-dir: "./some_dir"
           #project-conf: "./some_dir/custom.ini"
@@ -30,7 +41,7 @@ jobs:
 
       - uses: EndBug/add-and-commit@v9 # You can change this to use a specific version. https://github.com/marketplace/actions/add-commit
         with:
-          add: 'bin'
+          add: 'bin html'
           author_name: GitHub Action
           author_email: mp-se@noreply.github.com
           default_author: github_actor

.github/workflows/pre-commit.yaml

@@ -6,15 +6,16 @@ on:
     branches: 
       - master
       - dev
+      - '2.0.0-fwk'
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4 
+    - uses: actions/setup-python@v5
     - name: clang format support
       run: |
         sudo apt update
         sudo apt install clang-format cppcheck
-    - uses: pre-commit/action@v3.0.0
+    - uses: pre-commit/action@v3.0.1

.gitignore

@@ -1,11 +1,15 @@
-.pio/*
-.vscode/*
+.pio
+.vscode
+.env
+__pycache__
+_build
+env
 *.map
 src_docs/_build/*
 .env/*
 *.pyc
 *.json
-*.txt
 gcov/*.gcno
 gcov/*.gcov
 gcov/*.gcda
+.DS_Store

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-22 Magnus
+Copyright (c) 2021-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

_.env

@@ -0,0 +1,3 @@
+export GITHUB_REPOSITORY=mp-se/gravitymon@master
+export GITHUB_TOKEN="$(gh auth token)"
+export SECRETS_GITHUB_TOKEN="$(gh auth token)"

bin/boot32.bin

@@ -1 +1 @@
-{ "project":"gravmon", "version":"1.4.1",  "html": [ ] }
+{ "project":"gravmon", "version":"2.0.0",  "html": [ ] }