From 4991c4fe94e18f949fa9840b3a450165182acf85 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 28 Dec 2024 09:46:03 -0500 Subject: [PATCH] SD card is missing "ETB average duty0" field #6720 only:prep --- firmware/controllers/trigger/trigger_state.txt | 6 +++--- firmware/integration/LiveData.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/trigger/trigger_state.txt b/firmware/controllers/trigger/trigger_state.txt index c49eaf7cee..49a030b90d 100644 --- a/firmware/controllers/trigger/trigger_state.txt +++ b/firmware/controllers/trigger/trigger_state.txt @@ -1,10 +1,10 @@ ! same live data is used for crank and cam decoders, so we usually have 1+4 of these struct_no_prefix trigger_state_s - uint32_t synchronizationCounter;sync: trigger wheel sync counter + uint32_t synchronizationCounter;sync: wheel sync counter uint32_t vvtToothDurations0;;"us", 1, 0, 0, 100000, 3 - float vvtCurrentPosition;"sync: Primary Cam Position";"", 1, 0, -10000, 10000, 3 - float[4 iterate] vvtToothPosition;"sync: Cam Tooth Position";"", 1, 0, -10000, 10000, 3 + float vvtCurrentPosition;"sync: Primary Position";"", 1, 0, -10000, 10000, 3 + float[4 iterate] vvtToothPosition;"sync: Cam Position";"", 1, 0, -10000, 10000, 3 float triggerSyncGapRatio;@@GAUGE_NAME_TRG_GAP@@;"", 1, 0, -10000, 10000, 3 uint8_t triggerStateIndex diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index 9479d27bf7..35be672004 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -124,7 +124,7 @@ Usages: java: FanControl.java folder: controllers/actuators output_name: [ "fan1", "fan2" ] - constexpr: "engine->module()" + constexpr: ["engine->module()", "engine->module()"] isPtr: true - name: fuel_pump_control @@ -172,7 +172,7 @@ Usages: folder: controllers/trigger prepend: integration/rusefi_config_shared.txt output_name: [ "trg", "vvt1i", "vvt1e", "vvt2i", "vvt2e" ] - constexpr: "engine->triggerCentral.triggerState" + constexpr: [ "engine->triggerCentral.triggerState", "engine->triggerCentral.vvtState[0][0]","engine->triggerCentral.vvtState[0][1]","engine->triggerCentral.vvtState[1][0]","engine->triggerCentral.vvtState[1][1]"] - name: trigger_state_primary cppFileName: trigger_decoder