From 98b9c7c89a203e0f0c3c94e7b8f0a846823f0644 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 13 Apr 2022 15:51:11 -0400 Subject: [PATCH] Set sensible default for dwell by voltage multiplier table #4067 --- firmware/controllers/algo/advance_map.h | 8 +++++--- firmware/controllers/algo/ignition_state.txt | 2 +- firmware/controllers/algo/ignition_state_generated.h | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h index aa5d0e1bb8..3aa126872a 100644 --- a/firmware/controllers/algo/advance_map.h +++ b/firmware/controllers/algo/advance_map.h @@ -5,6 +5,8 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ +#include "ignition_state_generated.h" + #pragma once angle_t getAdvance(int rpm, float engineLoad); @@ -15,6 +17,6 @@ void buildTimingMap(float advanceMax); angle_t getAdvanceCorrections(int rpm); size_t getMultiSparkCount(int rpm); -class IgnitonState : public ignition_state_state { -public: -} +class IgnitionState : public ignition_state_s { +//public: +}; diff --git a/firmware/controllers/algo/ignition_state.txt b/firmware/controllers/algo/ignition_state.txt index 97853181ab..312c399380 100644 --- a/firmware/controllers/algo/ignition_state.txt +++ b/firmware/controllers/algo/ignition_state.txt @@ -1,4 +1,4 @@ -struct_no_prefix ignition_state +struct_no_prefix ignition_state_s float baseDwell float voltageCorrection diff --git a/firmware/controllers/algo/ignition_state_generated.h b/firmware/controllers/algo/ignition_state_generated.h index 8e202557c2..f9614905fa 100644 --- a/firmware/controllers/algo/ignition_state_generated.h +++ b/firmware/controllers/algo/ignition_state_generated.h @@ -1,10 +1,10 @@ -// 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 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Wed Apr 13 15:46:00 EDT 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once #include "rusefi_types.h" -// start of ignition_state -struct ignition_state { +// start of ignition_state_s +struct ignition_state_s { /** * offset 0 */ @@ -17,4 +17,4 @@ struct ignition_state { }; // 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 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo\ignition_state.txt Wed Apr 13 15:46:00 EDT 2022