diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index 6467ed6789..f405202178 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -16,4 +16,5 @@ LDS_trigger_central, LDS_trigger_state, LDS_wall_fuel_state, LDS_idle_state, +LDS_ignition_state, } live_data_e; diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h index 18664bb2b0..aa5d0e1bb8 100644 --- a/firmware/controllers/algo/advance_map.h +++ b/firmware/controllers/algo/advance_map.h @@ -14,3 +14,7 @@ float getInitialAdvance(int rpm, float map, float advanceMax); void buildTimingMap(float advanceMax); angle_t getAdvanceCorrections(int rpm); size_t getMultiSparkCount(int rpm); + +class IgnitonState : public ignition_state_state { +public: +} diff --git a/firmware/controllers/algo/ignition_state_generated.h b/firmware/controllers/algo/ignition_state_generated.h new file mode 100644 index 0000000000..8e202557c2 --- /dev/null +++ b/firmware/controllers/algo/ignition_state_generated.h @@ -0,0 +1,20 @@ +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Wed Apr 13 15:35:05 EDT 2022 +// by class com.rusefi.output.CHeaderConsumer +// begin +#pragma once +#include "rusefi_types.h" +// start of ignition_state +struct ignition_state { + /** + * offset 0 + */ + float baseDwell = (float)0; + /** + * offset 4 + */ + float voltageCorrection = (float)0; + /** total size 8*/ +}; + +// end +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Wed Apr 13 15:35:05 EDT 2022 diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index 6e077667c2..00704bcaa2 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -15,3 +15,4 @@ Usages: trigger_state: [ "TriggerState.java", "controllers/trigger" ] wall_fuel_state: [ "WallFuelState.java", "controllers/algo" ] idle_state: [ "IdleState.java", "controllers/actuators" ] + ignition_state: [ "IgnitionState.java", "controllers/algo" ] diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java new file mode 100644 index 0000000000..87b4c47cc2 --- /dev/null +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java @@ -0,0 +1,15 @@ +package com.rusefi.config.generated; + +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Wed Apr 13 15:35:05 EDT 2022 + +// by class com.rusefi.output.FileJavaFieldsConsumer +import com.rusefi.config.*; + +public class IgnitionState { + public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT); + public static final Field VOLTAGECORRECTION = Field.create("VOLTAGECORRECTION", 4, FieldType.FLOAT); + public static final Field[] VALUES = { + BASEDWELL, + VOLTAGECORRECTION, + }; +}