rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring - enum has more usages now

This commit is contained in:
rusefillc 2021-12-26 14:53:27 -05:00
parent 7322fc345e
commit 8f68e8e646
14 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -2928,7 +2928,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1735 * offset 1735
*/ */
afr_override_e afrOverrideMode; load_override_e afrOverrideMode;
/** /**
* offset 1736 * offset 1736
*/ */
@ -3057,7 +3057,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1752 * offset 1752
*/ */
afr_override_e ignOverrideMode; load_override_e ignOverrideMode;
/** /**
* Select which fuel pressure sensor measures the pressure of the fuel at your injectors. * Select which fuel pressure sensor measures the pressure of the fuel at your injectors.
* offset 1753 * offset 1753

14
firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
View File

@ -42,13 +42,13 @@
#define afr_alignmentFill_afr_offset 569 #define afr_alignmentFill_afr_offset 569
#define afr_hwChannel_offset 568 #define afr_hwChannel_offset 568
#define afr_offset 568 #define afr_offset 568
#define afr_override_e_AFR_AccPedal 3 #define load_override_e_AFR_AccPedal 3
#define afr_override_e_AFR_CylFilling 4 #define load_override_e_AFR_CylFilling 4
#define afr_override_e_AFR_MAP 1 #define load_override_e_AFR_MAP 1
#define afr_override_e_AFR_None 0 #define load_override_e_AFR_None 0
#define afr_override_e_AFR_Tps 2 #define load_override_e_AFR_Tps 2
#define afr_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling" #define load_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling"
#define afr_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" #define load_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"
#define afr_sensor_s_size 20 #define afr_sensor_s_size 20
#define afr_type_offset 700 #define afr_type_offset 700
#define afr_v1_offset 572 #define afr_v1_offset 572

4
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -2928,7 +2928,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1735 * offset 1735
*/ */
afr_override_e afrOverrideMode; load_override_e afrOverrideMode;
/** /**
* offset 1736 * offset 1736
*/ */
@ -3057,7 +3057,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1752 * offset 1752
*/ */
afr_override_e ignOverrideMode; load_override_e ignOverrideMode;
/** /**
* Select which fuel pressure sensor measures the pressure of the fuel at your injectors. * Select which fuel pressure sensor measures the pressure of the fuel at your injectors.
* offset 1753 * offset 1753

14
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -42,13 +42,13 @@
#define afr_alignmentFill_afr_offset 569 #define afr_alignmentFill_afr_offset 569
#define afr_hwChannel_offset 568 #define afr_hwChannel_offset 568
#define afr_offset 568 #define afr_offset 568
#define afr_override_e_AFR_AccPedal 3 #define load_override_e_AFR_AccPedal 3
#define afr_override_e_AFR_CylFilling 4 #define load_override_e_AFR_CylFilling 4
#define afr_override_e_AFR_MAP 1 #define load_override_e_AFR_MAP 1
#define afr_override_e_AFR_None 0 #define load_override_e_AFR_None 0
#define afr_override_e_AFR_Tps 2 #define load_override_e_AFR_Tps 2
#define afr_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling" #define load_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling"
#define afr_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" #define load_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"
#define afr_sensor_s_size 20 #define afr_sensor_s_size 20
#define afr_type_offset 700 #define afr_type_offset 700
#define afr_v1_offset 572 #define afr_v1_offset 572

4
firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -2928,7 +2928,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1735 * offset 1735
*/ */
afr_override_e afrOverrideMode; load_override_e afrOverrideMode;
/** /**
* offset 1736 * offset 1736
*/ */
@ -3057,7 +3057,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1752 * offset 1752
*/ */
afr_override_e ignOverrideMode; load_override_e ignOverrideMode;
/** /**
* Select which fuel pressure sensor measures the pressure of the fuel at your injectors. * Select which fuel pressure sensor measures the pressure of the fuel at your injectors.
* offset 1753 * offset 1753

14
firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
View File

@ -50,13 +50,13 @@
#define afr_alignmentFill_afr_offset 569 #define afr_alignmentFill_afr_offset 569
#define afr_hwChannel_offset 568 #define afr_hwChannel_offset 568
#define afr_offset 568 #define afr_offset 568
#define afr_override_e_AFR_AccPedal 3 #define load_override_e_AFR_AccPedal 3
#define afr_override_e_AFR_CylFilling 4 #define load_override_e_AFR_CylFilling 4
#define afr_override_e_AFR_MAP 1 #define load_override_e_AFR_MAP 1
#define afr_override_e_AFR_None 0 #define load_override_e_AFR_None 0
#define afr_override_e_AFR_Tps 2 #define load_override_e_AFR_Tps 2
#define afr_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling" #define load_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling"
#define afr_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" #define load_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"
#define afr_sensor_s_size 20 #define afr_sensor_s_size 20
#define afr_type_offset 700 #define afr_type_offset 700
#define afr_v1_offset 572 #define afr_v1_offset 572

2
firmware/controllers/algo/auto_generated_commonenum.cpp
View File

@ -57,7 +57,7 @@ case Force_4_bytes_size_adc_channel_mode:
} }
return NULL; return NULL;
} }
const char *getAfr_override_e(afr_override_e value){ const char *getload_override_e(load_override_e value){
switch(value) { switch(value) {
case AFR_AccPedal: case AFR_AccPedal:
return "AFR_AccPedal"; return "AFR_AccPedal";

2
firmware/controllers/algo/auto_generated_commonenum.h
View File

@ -9,7 +9,7 @@ const char *getInjectorNonlinearMode(InjectorNonlinearMode value);
const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value); const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
const char *getPidAutoTune_Peak(PidAutoTune_Peak value); const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
const char *getAdc_channel_mode_e(adc_channel_mode_e value); const char *getAdc_channel_mode_e(adc_channel_mode_e value);
const char *getAfr_override_e(afr_override_e value); const char *getload_override_e(load_override_e value);
const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value); const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
const char *getAntiLagActivationMode_e(antiLagActivationMode_e value); const char *getAntiLagActivationMode_e(antiLagActivationMode_e value);
const char *getBoostType_e(boostType_e value); const char *getBoostType_e(boostType_e value);

2
firmware/controllers/algo/fuel/fuel_computer.cpp
View File

@ -59,7 +59,7 @@ float FuelComputer::getTargetLambdaLoadAxis(float defaultLoad) const {
return getLoadOverride(defaultLoad, engineConfiguration->afrOverrideMode); return getLoadOverride(defaultLoad, engineConfiguration->afrOverrideMode);
} }
float getLoadOverride(float defaultLoad, afr_override_e overrideMode) { float getLoadOverride(float defaultLoad, load_override_e overrideMode) {
switch(overrideMode) { switch(overrideMode) {
case AFR_None: return defaultLoad; case AFR_None: return defaultLoad;
// MAP default to 200kpa - failed MAP goes rich // MAP default to 200kpa - failed MAP goes rich

2
firmware/controllers/algo/fuel/fuel_computer.h
View File

@ -33,5 +33,5 @@ private:
const ValueProvider3D* const m_lambdaTable; const ValueProvider3D* const m_lambdaTable;
}; };
float getLoadOverride(float defaultLoad, afr_override_e overrideMode); float getLoadOverride(float defaultLoad, load_override_e overrideMode);
constexpr float fuelDensity = 0.72; // g/cc constexpr float fuelDensity = 0.72; // g/cc

2
firmware/controllers/algo/rusefi_enums.h
View File

@ -607,7 +607,7 @@ typedef enum __attribute__ ((__packed__)) {
AFR_Tps = 2, AFR_Tps = 2,
AFR_AccPedal = 3, AFR_AccPedal = 3,
AFR_CylFilling = 4, AFR_CylFilling = 4,
} afr_override_e; } load_override_e;
typedef enum __attribute__ ((__packed__)) { typedef enum __attribute__ ((__packed__)) {
// todo: rename to HB_None? // todo: rename to HB_None?

4
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -2928,7 +2928,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1735 * offset 1735
*/ */
afr_override_e afrOverrideMode; load_override_e afrOverrideMode;
/** /**
* offset 1736 * offset 1736
*/ */
@ -3057,7 +3057,7 @@ struct engine_configuration_s {
* Advanced users only: If you aren't sure you need this, you probably don't need this. * Advanced users only: If you aren't sure you need this, you probably don't need this.
* offset 1752 * offset 1752
*/ */
afr_override_e ignOverrideMode; load_override_e ignOverrideMode;
/** /**
* Select which fuel pressure sensor measures the pressure of the fuel at your injectors. * Select which fuel pressure sensor measures the pressure of the fuel at your injectors.
* offset 1753 * offset 1753

14
firmware/controllers/generated/rusefi_generated.h
View File

@ -42,13 +42,13 @@
#define afr_alignmentFill_afr_offset 569 #define afr_alignmentFill_afr_offset 569
#define afr_hwChannel_offset 568 #define afr_hwChannel_offset 568
#define afr_offset 568 #define afr_offset 568
#define afr_override_e_AFR_AccPedal 3 #define load_override_e_AFR_AccPedal 3
#define afr_override_e_AFR_CylFilling 4 #define load_override_e_AFR_CylFilling 4
#define afr_override_e_AFR_MAP 1 #define load_override_e_AFR_MAP 1
#define afr_override_e_AFR_None 0 #define load_override_e_AFR_None 0
#define afr_override_e_AFR_Tps 2 #define load_override_e_AFR_Tps 2
#define afr_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling" #define load_override_e_auto_enum "AFR_None", "AFR_MAP", "AFR_Tps", "AFR_AccPedal", "AFR_CylFilling"
#define afr_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" #define load_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"
#define afr_sensor_s_size 20 #define afr_sensor_s_size 20
#define afr_type_offset 700 #define afr_type_offset 700
#define afr_v1_offset 572 #define afr_v1_offset 572

8
firmware/integration/rusefi_config.txt
View File

@ -1196,9 +1196,9 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
can_baudrate_e can2BaudRate; can_baudrate_e can2BaudRate;
#define afr_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %" #define load_override_e_enum "None", "MAP", "TPS", "Acc Pedal", "Cyl Filling %"
custom afr_override_e 1 bits, U08, @OFFSET@, [0:2], @@afr_override_e_enum@@ custom load_override_e 1 bits, U08, @OFFSET@, [0:2], @@load_override_e_enum@@
afr_override_e afrOverrideMode;+Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this. load_override_e afrOverrideMode;+Override the Y axis (load) value used for the AFR table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this.
uint32_t unused1736;;"", 1, 0, 0, 536870911, 0 uint32_t unused1736;;"", 1, 0, 0, 536870911, 0
bit unused1740b0 bit unused1740b0
@ -1214,7 +1214,7 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
brain_pin_e can2RxPin;set_can2_rx_pin X brain_pin_e can2RxPin;set_can2_rx_pin X
pin_output_mode_e starterControlPinMode; pin_output_mode_e starterControlPinMode;
adc_channel_e wastegatePositionSensor; adc_channel_e wastegatePositionSensor;
afr_override_e ignOverrideMode;+Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this. load_override_e ignOverrideMode;+Override the Y axis (load) value used for the ignition table.\nAdvanced users only: If you aren't sure you need this, you probably don't need this.
custom injector_pressure_type_e 1 bits, U08, @OFFSET@, [0:0], "Low", "High" custom injector_pressure_type_e 1 bits, U08, @OFFSET@, [0:0], "Low", "High"