rename ignition_state -> ignition_controller

only:uaefi
This commit is contained in:
Matthew Kennedy 2024-12-24 04:55:42 -05:00 committed by rusefillc
parent acb6be4203
commit df28510e6b
6 changed files with 12 additions and 11 deletions

View File

@ -212,7 +212,7 @@ const idle_state_s* getLiveData(size_t) {
} }
template<> template<>
const ignition_state_s* getLiveData(size_t) { const ignition_controller_s* getLiveData(size_t) {
return &engine->ignitionState; return &engine->ignitionState;
} }

View File

@ -5,10 +5,10 @@
* @author Andrey Belomutskiy, (c) 2012-2020 * @author Andrey Belomutskiy, (c) 2012-2020
*/ */
#include "ignition_state_generated.h"
#pragma once #pragma once
#include "ignition_controller_generated.h"
angle_t getWrappedAdvance(float rpm, float engineLoad); angle_t getWrappedAdvance(float rpm, float engineLoad);
angle_t getCylinderIgnitionTrim(size_t cylinderNumber, float rpm, float ignitionLoad); angle_t getCylinderIgnitionTrim(size_t cylinderNumber, float rpm, float ignitionLoad);
/** /**
@ -23,7 +23,7 @@ angle_t getAdvanceCorrections(float engineLoad);
size_t getMultiSparkCount(float rpm); size_t getMultiSparkCount(float rpm);
void initIgnitionAdvanceControl(); void initIgnitionAdvanceControl();
class IgnitionState : public ignition_state_s { class IgnitionState : public ignition_controller_s {
public: public:
floatms_t getSparkDwell(float rpm); floatms_t getSparkDwell(float rpm);
}; };

View File

@ -1,6 +1,6 @@
! "units",scale,offset, min,max, digits,category ! "units",scale,offset, min,max, digits,category
struct_no_prefix ignition_state_s struct_no_prefix ignition_controller_s
float baseDwell;"Ignition: base dwell";"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@ float baseDwell;"Ignition: base dwell";"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@
floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@ floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@

View File

@ -6,6 +6,7 @@ DOCS_ENUMS_INPUTS = \
$(PROJECT_DIR)/controllers/engine_cycle/prime_injection.txt \ $(PROJECT_DIR)/controllers/engine_cycle/prime_injection.txt \
$(PROJECT_DIR)/controllers/trigger/trigger_central.txt \ $(PROJECT_DIR)/controllers/trigger/trigger_central.txt \
$(PROJECT_DIR)/controllers/trigger/trigger_state.txt \ $(PROJECT_DIR)/controllers/trigger/trigger_state.txt \
$(PROJECT_DIR)/controllers/algo/ignition_controller.txt \
$(PROJECT_DIR)/controllers/actuators/idle_state.txt \ $(PROJECT_DIR)/controllers/actuators/idle_state.txt \
$(PROJECT_DIR)/controllers/actuators/electronic_throttle.txt \ $(PROJECT_DIR)/controllers/actuators/electronic_throttle.txt \
$(PROJECT_DIR)/integration/LiveData.yaml \ $(PROJECT_DIR)/integration/LiveData.yaml \

View File

@ -28,7 +28,7 @@ Usages:
constexpr: "engine->fuelComputer" constexpr: "engine->fuelComputer"
conditional_compilation: "EFI_ENGINE_CONTROL" conditional_compilation: "EFI_ENGINE_CONTROL"
- name: ignition_state - name: ignition_controller
cppFileName: advance_map cppFileName: advance_map
java: IgnitionState.java java: IgnitionState.java
folder: controllers/algo folder: controllers/algo

View File

@ -1,10 +1,10 @@
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt // this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt
// by class com.rusefi.output.CHeaderConsumer // by class com.rusefi.output.CHeaderConsumer
// begin // begin
#pragma once #pragma once
#include "rusefi_types.h" #include "rusefi_types.h"
// start of ignition_state_s // start of ignition_controller_s
struct ignition_state_s { struct ignition_controller_s {
/** /**
* "Ignition: base dwell" * "Ignition: base dwell"
* units: ms * units: ms
@ -189,7 +189,7 @@ struct ignition_state_s {
offset 40 bit 31 */ offset 40 bit 31 */
bool unusedBit_15_31 : 1 {}; bool unusedBit_15_31 : 1 {};
}; };
static_assert(sizeof(ignition_state_s) == 44); static_assert(sizeof(ignition_controller_s) == 44);
// end // end
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt // this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt