From 25134644e6fb484e9b32292d98f4b62fa62ee164 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 9 Dec 2021 21:59:51 -0500 Subject: [PATCH] live data this --- firmware/controllers/trigger/trigger_decoder.h | 2 +- firmware/controllers/trigger/trigger_state.txt | 1 + .../controllers/trigger/trigger_state_generated.h | 11 ++++++++--- .../com/rusefi/config/generated/TriggerState.java | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h index 385c0ed064..178e54e1c9 100644 --- a/firmware/controllers/trigger/trigger_decoder.h +++ b/firmware/controllers/trigger/trigger_decoder.h @@ -161,7 +161,7 @@ private: trigger_event_e curSignal; trigger_event_e prevSignal; int64_t totalEventCountBase; - uint32_t totalRevolutionCounter; + bool isFirstEvent; }; diff --git a/firmware/controllers/trigger/trigger_state.txt b/firmware/controllers/trigger/trigger_state.txt index c88d6ddcf5..f9f5564b41 100644 --- a/firmware/controllers/trigger/trigger_state.txt +++ b/firmware/controllers/trigger/trigger_state.txt @@ -1,3 +1,4 @@ struct_no_prefix trigger_state_s float currentGap; + uint32_t totalRevolutionCounter;Crank revolution counter end_struct diff --git a/firmware/controllers/trigger/trigger_state_generated.h b/firmware/controllers/trigger/trigger_state_generated.h index 5d7539ce34..cc989721c6 100644 --- a/firmware/controllers/trigger/trigger_state_generated.h +++ b/firmware/controllers/trigger/trigger_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Oct 17 01:13:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Thu Dec 09 21:55:23 EST 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -9,8 +9,13 @@ struct trigger_state_s { * offset 0 */ float currentGap = (float)0; - /** total size 4*/ + /** + * Crank revolution counter + * offset 4 + */ + uint32_t totalRevolutionCounter = (uint32_t)0; + /** total size 8*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Oct 17 01:13:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Thu Dec 09 21:55:23 EST 2021 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index b8254309a3..c9f97afe02 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,13 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sun Oct 17 01:13:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Thu Dec 09 21:55:23 EST 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerState { public static final Field CURRENTGAP = Field.create("CURRENTGAP", 0, FieldType.FLOAT); + public static final Field TOTALREVOLUTIONCOUNTER = Field.create("TOTALREVOLUTIONCOUNTER", 4, FieldType.INT); public static final Field[] VALUES = { CURRENTGAP, + TOTALREVOLUTIONCOUNTER, }; }