Merge pull request #126 from BlueAndi/Development

Development
BlueAndi · May 15, 2023 · 502f57d · 502f57d
2 parents 6924971 + a06f544
commit 502f57d
Show file tree

Hide file tree

Showing 626 changed files with 997,451 additions and 7,703 deletions.
diff --git a/.github/workflows/Development.yml b/.github/workflows/Development.yml
@@ -28,7 +28,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["esp32doit-devkit-v1-usb", "lilygo-ttgo-t-display-usb", "lilygo-t-display-s3-usb"]
+        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
@@ -51,6 +51,8 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
@@ -63,11 +65,15 @@ jobs:
     - name: Build ${{ matrix.environment }} filesystem image
       run: platformio run --environment ${{ matrix.environment }} --target buildfs
 
-  # Perform static checks and test
+  # Perform static checks
   check:
     # The type of runner that the job will run on.
     runs-on: ubuntu-latest
     needs: intro
+    strategy:
+      matrix:
+        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "wemos_lolin_s2_mini"]
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
@@ -88,17 +94,50 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade platformio
 
-    - name: Perform static checks on target esp32doit-devkit-v1-usb
-      run: platformio check --environment esp32doit-devkit-v1-usb
+    - name: Perform static checks on ${{ matrix.environment }}
+      run: platformio check --environment ${{ matrix.environment }}
+
+  # Perform tests
+  test:
+    # The type of runner that the job will run on.
+    runs-on: ubuntu-latest
+    needs: intro
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Cache pip
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Cache PlatformIO
+      uses: actions/cache@v3
+      with:
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
-    - name: Perform static checks on native environment
-      run: platformio check --environment test
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio
 
     - name: Run tests on native environment
       run: platformio test --environment test -vvv
@@ -128,17 +167,19 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade platformio
 
     - name: Set up graphviz
-      uses: ts-graphviz/setup-graphviz@v1
+      uses: ts-graphviz/setup-graphviz@v1.2.0
 
     - name: Set up doxygen and generate documentation
-      uses: mattnotmitt/doxygen-action@v1.1.0
+      uses: mattnotmitt/doxygen-action@v1.9.5
       with:
         working-directory: './doc/doxygen'
         doxyfile-path: './Doxyfile'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["esp32doit-devkit-v1-usb", "esp32-nodemcu-usb", "az-delivery-devkit-v4-usb", "lilygo-ttgo-t-display-usb", "lilygo-t-display-s3-usb", "adafruit_feather_esp32_v2-usb"]
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
@@ -53,6 +53,8 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
@@ -81,11 +83,15 @@ jobs:
           ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/littlefs.bin
         retention-days: 5
 
-  # Perform static checks and test
+  # Perform static checks
   check:
     # The type of runner that the job will run on.
     runs-on: ubuntu-latest
     needs: intro
+    strategy:
+      matrix:
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "wemos_lolin_s2_mini"]
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
@@ -106,17 +112,50 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade platformio
 
-    - name: Perform static checks on target esp32doit-devkit-v1-usb
-      run: platformio check --environment esp32doit-devkit-v1-usb
+    - name: Perform static checks on ${{ matrix.environment }}
+      run: platformio check --environment ${{ matrix.environment }}
 
-    - name: Perform static checks on native environment
-      run: platformio check --environment test
+  # Perform tests
+  test:
+    # The type of runner that the job will run on.
+    runs-on: ubuntu-latest
+    needs: intro
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Cache pip
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Cache PlatformIO
+      uses: actions/cache@v3
+      with:
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio
 
     - name: Run tests on native environment
       run: platformio test --environment test
@@ -146,17 +185,19 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
-
+      with:
+        python-version: '3.9'
+
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade platformio
 
     - name: Set up graphviz
-      uses: ts-graphviz/setup-graphviz@v1
+      uses: ts-graphviz/setup-graphviz@v1.2.0
 
     - name: Set up doxygen and generate documentation
-      uses: mattnotmitt/doxygen-action@v1.1.0
+      uses: mattnotmitt/doxygen-action@v1.9.5
       with:
         working-directory: './doc/doxygen'
         doxyfile-path: './Doxyfile'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["esp32doit-devkit-v1-usb", "esp32-nodemcu-usb", "az-delivery-devkit-v4-usb", "lilygo-ttgo-t-display-usb", "lilygo-t-display-s3-usb", "adafruit_feather_esp32_v2-usb"]
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
@@ -52,6 +52,8 @@ jobs:
 
     - name: Set up Python
       uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |
@@ -76,6 +78,8 @@ jobs:
           ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/firmware.bin
           ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/spiffs.bin
           ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/littlefs.bin
+          ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/bootloader.bin
+          ${{ github.workspace }}/.pio/build/${{ matrix.environment }}/partitions.bin
         retention-days: 5
 
   # Deploy release artifacts

diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,16 @@
+*.code-workspace
+__pycache__
+.DS_Store
 .pio
 .pioenvs
 .piolibdeps
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/settings.json
+data/js/pluginsSubMenu.js
+data/plugins/
 doc/html/
-out
 firmware.map
-upload.json
-*.code-workspace
-.DS_Store
+out
+src/Generated/
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 - 2022 Andreas Merkle <web@blue-andi.de>
+Copyright (c) 2019 - 2023 Andreas Merkle <web@blue-andi.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal