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

LM_ALPHA_N_2 rename

This commit is contained in:
rusefi 2020-11-27 15:44:31 -05:00
parent a3a49b02ed
commit 89eaae8234
14 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp
View File

@ -806,8 +806,8 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) { switch(value) {
case Force_4_bytes_size_engine_load_mode: case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode"; return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N_2: case LM_ALPHA_N:
return "LM_ALPHA_N_2"; return "LM_ALPHA_N";
case LM_MOCK: case LM_MOCK:
return "LM_MOCK"; return "LM_MOCK";
case LM_REAL_MAF: case LM_REAL_MAF:

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

@ -362,7 +362,7 @@
#define enableVerboseCan2Tx_offset 2116 #define enableVerboseCan2Tx_offset 2116
#define enableVerboseCanTx_offset 744 #define enableVerboseCanTx_offset 744
#define engine_configuration_s_size 6000 #define engine_configuration_s_size 6000
#define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N_2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
#define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID"
#define ENGINE_MAKE_BMW "BMW" #define ENGINE_MAKE_BMW "BMW"
#define ENGINE_MAKE_GM "GM" #define ENGINE_MAKE_GM "GM"

4
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -602,8 +602,8 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) { switch(value) {
case Force_4_bytes_size_engine_load_mode: case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode"; return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N_2: case LM_ALPHA_N:
return "LM_ALPHA_N_2"; return "LM_ALPHA_N";
case LM_MOCK: case LM_MOCK:
return "LM_MOCK"; return "LM_MOCK";
case LM_REAL_MAF: case LM_REAL_MAF:

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

@ -362,7 +362,7 @@
#define enableVerboseCan2Tx_offset 2116 #define enableVerboseCan2Tx_offset 2116
#define enableVerboseCanTx_offset 744 #define enableVerboseCanTx_offset 744
#define engine_configuration_s_size 6000 #define engine_configuration_s_size 6000
#define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N_2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
#define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID"
#define ENGINE_MAKE_BMW "BMW" #define ENGINE_MAKE_BMW "BMW"
#define ENGINE_MAKE_GM "GM" #define ENGINE_MAKE_GM "GM"

1
firmware/config/engines/bmw_m73.cpp
View File

@ -93,6 +93,7 @@ void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
strcpy(CONFIG(engineCode), "M73"); strcpy(CONFIG(engineCode), "M73");
engineConfiguration->specs.firingOrder = FO_1_7_5_11_3_9_6_12_2_8_4_10; engineConfiguration->specs.firingOrder = FO_1_7_5_11_3_9_6_12_2_8_4_10;
CONFIG(isFasterEngineSpinUpEnabled) = true; CONFIG(isFasterEngineSpinUpEnabled) = true;
CONFIG(fuelAlgorithm) = LM_ALPHA_N;
engineConfiguration->vvtMode = VVT_FIRST_HALF; engineConfiguration->vvtMode = VVT_FIRST_HALF;

2
firmware/config/engines/bmw_m73_mre.cpp
View File

@ -120,7 +120,7 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(crankingTimingAngle) = 30; CONFIG(crankingTimingAngle) = 30;
// I am too lazy to add MAP sensor // I am too lazy to add MAP sensor
engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2; engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
// set cranking_fuel 15 // set cranking_fuel 15
engineConfiguration->cranking.baseFuel = 15; engineConfiguration->cranking.baseFuel = 15;

2
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -74,7 +74,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/** /**
* Algorithm Alpha-N setting * Algorithm Alpha-N setting
*/ */
setAlgorithm(LM_ALPHA_N_2 PASS_CONFIG_PARAMETER_SUFFIX); setAlgorithm(LM_ALPHA_N PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX); setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
/** /**

2
firmware/config/engines/dodge_neon.cpp
View File

@ -108,7 +108,7 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_DODGE_NEON_1995; engineConfiguration->trigger.type = TT_DODGE_NEON_1995;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2; engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
// engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4 // engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
// engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4 // engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4

4
firmware/config/engines/honda_600.cpp
View File

@ -48,7 +48,7 @@ static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM; engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2; engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
// upside down wiring // upside down wiring
engineConfiguration->triggerInputPins[0] = GPIOA_5; engineConfiguration->triggerInputPins[0] = GPIOA_5;
@ -132,7 +132,7 @@ void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->injectionPins[3] = GPIOB_8; // #4 engineConfiguration->injectionPins[3] = GPIOB_8; // #4
setDefaultCustomMaps(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultCustomMaps(PASS_CONFIG_PARAMETER_SIGNATURE);
setAlgorithm(LM_ALPHA_N_2 PASS_CONFIG_PARAMETER_SUFFIX); setAlgorithm(LM_ALPHA_N PASS_CONFIG_PARAMETER_SUFFIX);
engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED;
engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED;

4
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -748,8 +748,8 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) { switch(value) {
case Force_4_bytes_size_engine_load_mode: case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode"; return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N_2: case LM_ALPHA_N:
return "LM_ALPHA_N_2"; return "LM_ALPHA_N";
case LM_MOCK: case LM_MOCK:
return "LM_MOCK"; return "LM_MOCK";
case LM_REAL_MAF: case LM_REAL_MAF:

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

@ -168,7 +168,7 @@ AirmassModelBase* getAirmassModel(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
switch (CONFIG(fuelAlgorithm)) { switch (CONFIG(fuelAlgorithm)) {
case LM_SPEED_DENSITY: return &sdAirmass; case LM_SPEED_DENSITY: return &sdAirmass;
case LM_REAL_MAF: return &mafAirmass; case LM_REAL_MAF: return &mafAirmass;
case LM_ALPHA_N_2: return &alphaNAirmass; case LM_ALPHA_N: return &alphaNAirmass;
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
case LM_MOCK: return engine->mockAirmassModel; case LM_MOCK: return engine->mockAirmassModel;
#endif #endif

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

@ -456,8 +456,7 @@ typedef enum {
*/ */
LM_REAL_MAF = 4, LM_REAL_MAF = 4,
// todo: rename after LM_ALPHA_N is removed LM_ALPHA_N = 5,
LM_ALPHA_N_2 = 5,
// This mode is for unit testing only, so that tests don't have to rely on a particular real airmass mode // This mode is for unit testing only, so that tests don't have to rely on a particular real airmass mode
LM_MOCK = 100, LM_MOCK = 100,

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

@ -362,7 +362,7 @@
#define enableVerboseCan2Tx_offset 2116 #define enableVerboseCan2Tx_offset 2116
#define enableVerboseCanTx_offset 744 #define enableVerboseCanTx_offset 744
#define engine_configuration_s_size 6000 #define engine_configuration_s_size 6000
#define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N_2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK"
#define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "INVALID"
#define ENGINE_MAKE_BMW "BMW" #define ENGINE_MAKE_BMW "BMW"
#define ENGINE_MAKE_GM "GM" #define ENGINE_MAKE_GM "GM"

2
firmware/controllers/math/engine_math.cpp
View File

@ -67,7 +67,7 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
switch (engineConfiguration->fuelAlgorithm) { switch (engineConfiguration->fuelAlgorithm) {
case LM_SPEED_DENSITY: case LM_SPEED_DENSITY:
return getMap(PASS_ENGINE_PARAMETER_SIGNATURE); return getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
case LM_ALPHA_N_2: case LM_ALPHA_N:
return Sensor::get(SensorType::Tps1).value_or(0); return Sensor::get(SensorType::Tps1).value_or(0);
case LM_REAL_MAF: case LM_REAL_MAF:
return getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE); return getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE);