Merge branch 'newparse-datalog' of https://github.com/fome-tech/fome-fw…

… into newparse-datalog
FOME-Tech · Nov 24, 2023 · 36c96b3 · 36c96b3
2 parents 06db493 + b62c6e1
commit 36c96b3
Show file tree

Hide file tree

Showing 769 changed files with 70,045 additions and 86,839 deletions.
diff --git a/.github/workflows/build-FOME-console.yaml b/.github/workflows/build-FOME-console.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
@@ -15,7 +15,82 @@ on:
         type: string
 
 jobs:
+  build-libopenblt-linux:
+    runs-on: ubuntu-latest-selfhost
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: cmake configure libopenblt
+      working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release ..
+
+    - name: make libopenblt
+      working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
+      run: make -j8
+
+    - name: cmake configure libopenblt_jni
+      working-directory: ./misc/libopenblt_jni/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release ..
+
+    - name: make libopenblt_jni
+      working-directory: ./misc/libopenblt_jni/build
+      run: make -j8
+
+    - name: coalesce
+      run: |
+        mkdir deliver
+        cp ./firmware/ext/openblt/Host/libopenblt.so deliver/
+        cp ./misc/libopenblt_jni/build/libopenblt_jni.so deliver/
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: libopenblt-linux
+        path: |
+          ./deliver/libopenblt.so
+          ./deliver/libopenblt_jni.so
+
+  build-libopenblt-macos:
+    runs-on: macos-13
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: cmake configure libopenblt
+      working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release ..
+
+    - name: make libopenblt
+      working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
+      run: make -j8
+
+    - name: cmake configure libopenblt_jni
+      working-directory: ./misc/libopenblt_jni/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release ..
+
+    - name: make libopenblt_jni
+      working-directory: ./misc/libopenblt_jni/build
+      run: make -j8
+
+    - name: coalesce
+      run: |
+        mkdir deliver
+        cp ./firmware/ext/openblt/Host/libopenblt.dylib deliver/
+        cp ./misc/libopenblt_jni/build/libopenblt_jni.dylib deliver/
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: libopenblt-macos
+        path: |
+          ./deliver/libopenblt.dylib
+          ./deliver/libopenblt_jni.dylib
+
   build-firmware:
+    needs: [build-libopenblt-linux, build-libopenblt-macos]
     runs-on: ubuntu-latest-selfhost
 
     strategy:
@@ -32,22 +107,26 @@ jobs:
           #   folder: config/boards/hellen/hellen81
           #   ini-file: fome_hellen81.ini
 
-          - build-target: alphax-2chan
-            folder: config/boards/hellen/alphax-2chan
-            ini-file: fome_alphax-2chan.ini
+          # - build-target: alphax-2chan
+          #   folder: config/boards/hellen/alphax-2chan
+          #   ini-file: fome_alphax-2chan.ini
 
-          - build-target: alphax-4chan
-            folder: config/boards/hellen/alphax-4chan
-            ini-file: fome_alphax-4chan.ini
+          # - build-target: alphax-4chan
+          #   folder: config/boards/hellen/alphax-4chan
+          #   ini-file: fome_alphax-4chan.ini
 
-          - build-target: alphax-8chan
-            folder: config/boards/hellen/alphax-8chan
-            ini-file: fome_alphax-8chan.ini
+          # - build-target: alphax-8chan
+          #   folder: config/boards/hellen/alphax-8chan
+          #   ini-file: fome_alphax-8chan.ini
 
           # - build-target: harley81
           #   folder: config/boards/hellen/harley81
           #   ini-file: fome_harley81.ini
 
+          - build-target: small-can-board
+            folder: config/boards/hellen/small-can-board
+            ini-file: rusefi_small-can-board.ini
+
           # - build-target: hellen88bmw
           #   folder: config/boards/hellen/hellen88bmw
           #   ini-file: fome_hellen88bmw.ini
@@ -84,9 +163,9 @@ jobs:
           #   folder: config/boards/hellen/hellen-honda-k
           #   ini-file: fome_hellen-honda-k.ini
 
-          - build-target: hellen154hyundai
-            folder: config/boards/hellen/hellen154hyundai
-            ini-file: fome_hellen154hyundai.ini
+          # - build-target: hellen154hyundai
+          #   folder: config/boards/hellen/hellen154hyundai
+          #   ini-file: fome_hellen154hyundai.ini
 
           # - build-target: frankenso_na6
           #   folder: config/boards/frankenso
@@ -156,13 +235,13 @@ jobs:
           #   folder: config/boards/f429-discovery
           #   ini-file: fome_f429-discovery.ini
 
-          # - build-target: core8
-          #   folder: config/boards/core8
-          #   ini-file: fome_core8.ini
+          - build-target: core8
+            folder: config/boards/core8
+            ini-file: fome_core8.ini
 
-          # - build-target: 48way
-          #   folder: config/boards/48way
-          #   ini-file: fome_48way.ini
+          - build-target: core48
+            folder: config/boards/core48
+            ini-file: fome_core48.ini
 
           # - build-target: atlas
           #   folder: config/boards/atlas
@@ -190,7 +269,7 @@ jobs:
           echo "full=true" >> $GITHUB_ENV
         fi
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
@@ -211,11 +290,6 @@ jobs:
       working-directory: ./firmware/
       run: ./gen_live_documentation.sh
 
-      # live_data_ids.h is generated above so order of operations is important here!
-    - name: Generate Enum Strings
-      working-directory: ./firmware/
-      run: ./gen_enum_to_string.sh
-
     - name: Generate Configs for build-target
       working-directory: ./firmware/
       # todo: we have code duplication with gen_config.sh here :(
@@ -266,19 +340,31 @@ jobs:
       # 'OS="Windows_NT"' allows us to build Windows executable on unix
       run: OS="Windows_NT" bash misc/jenkins/build_simulator.sh
 
+    - name: Download LibOpenBLT Tool (Linux)
+      uses: actions/download-artifact@v3
+      with:
+        name: libopenblt-linux
+        path: ./firmware/ext/openblt/Host/
+
+    - name: Download LibOpenBLT Tool (MacOS)
+      uses: actions/download-artifact@v3
+      with:
+        name: libopenblt-macos
+        path: ./firmware/ext/openblt/Host/
+
     - name: Package Bundle
       if: ${{ env.full == 'true' }}
       run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} "${{matrix.ini-file}}" ${{ toJSON(inputs.build_name) }}
 
-    - name: Upload INI to tunes.fome.tech
-      if: ${{ env.full == 'true' && env.upload == 'true' }}
-      uses: hyper-tuner/ini-upload-action@v1
-      with:
-        api-url: "${{ secrets.HYPER_TUNER_INI_UPLOAD_URL }}"
-        username: "${{ secrets.HYPER_TUNER_INI_UPLOAD_USERNAME }}"
-        password: "${{ secrets.HYPER_TUNER_INI_UPLOAD_PASSWORD }}"
-        path: ./firmware/tunerstudio/generated/${{matrix.ini-file}}
-        ecosystem: fome
+    # - name: Upload INI to tunes.fome.tech
+    #   if: ${{ env.full == 'true' && env.upload == 'true' }}
+    #   uses: hyper-tuner/ini-upload-action@v1
+    #   with:
+    #     api-url: "${{ secrets.HYPER_TUNER_INI_UPLOAD_URL }}"
+    #     username: "${{ secrets.HYPER_TUNER_INI_UPLOAD_USERNAME }}"
+    #     password: "${{ secrets.HYPER_TUNER_INI_UPLOAD_PASSWORD }}"
+    #     path: ./firmware/tunerstudio/generated/${{matrix.ini-file}}
+    #     ecosystem: fome
 
     # - name: Upload .ini files
     #   if: ${{ env.full == 'true' && env.upload == 'true' }}

diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Checkout Submodules
       run: |

diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml
@@ -11,7 +11,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 

diff --git a/.github/workflows/delete-all-artifacts.yaml b/.github/workflows/delete-all-artifacts.yaml
@@ -7,7 +7,7 @@ jobs:
     name: Delete Old Artifacts
     runs-on: ubuntu-latest-selfhost
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         id: artifact
         with:
           # Delete all artifacts

diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Checkout Submodules
       run: |
@@ -26,10 +26,6 @@ jobs:
         sudo ./add-ubuntu-latest-apt-mirrors.sh
         sudo apt-get install sshpass sshpass mtools
 
-    - name: Generate Enum Strings
-      working-directory: ./firmware/
-      run: ./gen_enum_to_string.sh
-
     - name: Generate Live Documentation
       working-directory: ./firmware/
       run: ./gen_live_documentation.sh
@@ -81,7 +77,7 @@ jobs:
     # We need to know what branch this is in order to push to the correct branch
     - name: Extract branch name
       shell: bash
-      run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+      run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
       id: extract_branch
 
     - name: Push configs

diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{matrix.runs-on}}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 

diff --git a/.github/workflows/readme.md b/.github/workflows/readme.md
@@ -1,29 +1,33 @@
 Here is a diagram of which configure scripts are used for which workflows.
 This is not a complete diagram of all workflows, nor does it show everything that these jobs do.
 
-```
-                                         Jenkins
-                                           +
-                                           v
-                                         run.bat
-      +------------+-----------------------+
-      |            |                       v
-      |            |                compile_and_upload.bat
-      |            |     +--------------+  +------------------------------+
-      |            |     |              v  v                              v
-      |            |     |              gen_config                      compile.sh
-      |            |     |        +--------+-------------------+            +
-      v            v     |        v        v                   v            v
-     Sim        Console  | ConfigKinetis   ConfigDefault    ConfigBoard   Firmware    Package
-      ^            ^     |       ^             ^ ^            ^    ^      ^  ^           ^
-      |            |     |       |             | |            |    |      |  |           |
-      |            |     |       |             | |            |    |      |  |           |
-      |            |     |       |             | |            |    +------+  |           |
-      |            |     |       |             | |            |    |         |           |
-      +---+--------+-------------+-------------+--------------+--------------+-----------+
-          |              |                       |                 |
-          +              +                       +                 +
-Firmware Push            Gen Config      Unit Tests       Firmware PR
-```
+For up-to-date information check the GitHib workflow actions (GHA) definition files *.yaml
+
+The workflows are triggered by events: push & pull_request
 
-https://github.com/rusefi/rusefi/wiki/Build-Server-and-Automation
+```mermaid
+flowchart TD
+    gha_firmware["Firmware"]
+    firmware_build[["build-firmware.yaml"]]
+    gha_Console["Console"]
+    Console_build[["build-FOME-console.yaml"]]
+    gha_Simulator["Simulator"]
+    Simulator_build[["build-simulator.yaml"]]
+    gha_generate_ECU_configs["Generate configs for all supported ECUs"]
+    generate_ECU_configs[["gen-configs.yaml"]]
+    gha_UnitTests["Unit tests"]
+    UnitTests_build[["build-unit-tests.yaml"]]
+    gha_Hardware_CI["Hardware Continous Integration"]
+    Hardware_CI[["hardware-ci.yaml"]]
+   
+
+    gha_firmware --> firmware_build
+    gha_generate_ECU_configs ---> generate_ECU_configs
+    gha_Console ---> Console_build
+    gha_Simulator ---> Simulator_build
+    gha_UnitTests ---> UnitTests_build
+    gha_Hardware_CI ---> Hardware_CI
+
+    
+    
+```
diff --git a/.github/workflows/set-date.yaml b/.github/workflows/set-date.yaml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.repository == 'FOME-Tech/fome-fw' }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Check last date
       run: if [ "$(git log -1 --pretty=%B)" = "Update date" ]; then echo "skip=true" >> $GITHUB_ENV; fi

diff --git a/.gitmodules b/.gitmodules
@@ -26,8 +26,8 @@
 	branch = rusefi_prod_2021_11_12
 [submodule "firmware/ext/openblt"]
 	path = firmware/ext/openblt
-	url = https://github.com/rusefi/openblt
-	branch = rusefi_prod
+	url = https://github.com/fome-tech/openblt
+	branch = master
 [submodule "misc/hex2dfu"]
 	path = misc/hex2dfu
 	url = https://github.com/rusefi/hex2dfu