From 15d3172bb7e8de0b83bc8bca68e6baf158dc8869 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 16 Apr 2022 20:34:17 -0400 Subject: [PATCH] logging of live data structs was: data points #3614 better solution for total model buffer size --- .github/workflows/build-firmware.yaml | 23 ++++++++++++----------- firmware/gen_config_common.sh | 1 + firmware/integration/rusefi_config.txt | 1 - 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml index d075a420bb..e4b34ca52d 100644 --- a/.github/workflows/build-firmware.yaml +++ b/.github/workflows/build-firmware.yaml @@ -243,6 +243,18 @@ jobs: sudo apt-get install zip sudo apt-get install dosfstools + - name: Generate Live Documentation + if: ${{ env.skip != 'true' }} + working-directory: ./firmware/ + run: bash gen_live_documentation.sh + + # live_data_ids.h is generated above so order of operations is important here! + - name: Generate Enum Strings + if: ${{ env.skip != 'true' }} + working-directory: ./firmware/ + run: bash gen_enum_to_string.sh + + # depends on gen_live_documentation.sh for instance TS_TOTAL_OUTPUT_SIZE - name: Generate Default config if: ${{ env.skip != 'true' }} # todo: why do we even need this 'gen_config_default.sh' here?! @@ -269,17 +281,6 @@ jobs: bash gen_config_board.sh ${{matrix.folder}} ${{matrix.build-target}} ${{matrix.ini-file}} fi - - name: Generate Live Documentation - if: ${{ env.skip != 'true' }} - working-directory: ./firmware/ - run: bash gen_live_documentation.sh - - # live_data_ids.h is generated above so order of operations is important here! - - name: Generate Enum Strings - if: ${{ env.skip != 'true' }} - working-directory: ./firmware/ - run: bash gen_enum_to_string.sh - # Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path - name: Download & Install GCC if: ${{ env.skip != 'true' }} diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index f6dea7c304..3a4678e75c 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -11,4 +11,5 @@ COMMON_GEN_CONFIG=" -triggerFolder ../unit_tests \ -with_c_defines false \ -initialize_to_zero false \ + -prepend console/binary/generated/total_live_data_generated.h \ -definition integration/rusefi_config.txt" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 640a18ab4b..164778d289 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -85,7 +85,6 @@ ! this is here so that rusEFI console can access it, too ! #define TS_OUTPUT_SIZE 640 -#define TS_TOTAL_OUTPUT_SIZE 1000 ! ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version