diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 2efd0368fd..f1391acdd5 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -23,7 +23,7 @@ void setDodgeNeonEngineConfiguration(engine_configuration_s *engineConfiguration engineConfiguration->triggerConfig.triggerType = TT_DODGE_NEON_1995; - engineConfiguration->algorithm = LM_TPS; + engineConfiguration->algorithm = LM_ALPHA_N; // set_rpm_hard_limit 4000 engineConfiguration->rpmHardLimit = 4000; // yes, 4k. let's play it safe for now diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp index 5d97ba67c3..353804a551 100644 --- a/firmware/config/engines/honda_accord.cpp +++ b/firmware/config/engines/honda_accord.cpp @@ -47,7 +47,7 @@ static void setHondaAccordConfigurationCommon(engine_configuration_s *engineConf // engineConfiguration->algorithm = LM_SPEED_DENSITY; // I want to start with a simple Alpha-N - engineConfiguration->algorithm = LM_TPS; + engineConfiguration->algorithm = LM_ALPHA_N; setFuelLoadBin(engineConfiguration, 0, 100); setTimingLoadBin(engineConfiguration, 0, 100); diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 72028d58c8..631ee49c40 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -314,6 +314,13 @@ void setMiata1996(engine_configuration_s *engineConfiguration, board_configurati } } + // todo: extract an array16x16 type? extract a method? + for (int k = 0; k < AD_LOAD_COUNT; k++) { + for (int r = 0; r < AD_RPM_COUNT; r++) { + engineConfiguration->ignitionTable[k][r] = miata_maf_advance_table[k][r]; + } + } + // upside down boardConfiguration->triggerInputPins[0] = GPIOA_5; boardConfiguration->triggerInputPins[1] = GPIOC_6; diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp index 9a5450e764..43dd43d37e 100644 --- a/firmware/controllers/algo/enum_strings.cpp +++ b/firmware/controllers/algo/enum_strings.cpp @@ -98,7 +98,7 @@ const char * pinModeToString(pin_output_mode_e mode) { const char * algorithmToString(engine_load_mode_e mode) { switch(mode) { - case LM_TPS: + case LM_ALPHA_N: return "Alpha-N"; case LM_MAF: return "Maf"; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 156751b04e..347dfade7c 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -163,9 +163,8 @@ typedef enum { LM_MAF = 0, /** * Throttle Position Sensor value is used as engine load. http://en.wikipedia.org/wiki/Throttle_position_sensor - * That's know as Alpha N */ - LM_TPS = 1, + LM_ALPHA_N = 1, /** * raw Manifold Absolute Pressure sensor value is used as engine load http://en.wikipedia.org/wiki/MAP_sensor */ diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 9d5b140a70..3f8ecdb845 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -74,7 +74,7 @@ float getEngineLoadT(Engine *engine) { // SD engine load is used for timing lookup but not for fuel calculation case LM_MAP: return getMap(); - case LM_TPS: + case LM_ALPHA_N: return getTPS(); default: firmwareError("Unexpected engine load parameter: %d", engineConfiguration->algorithm); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 737fce515f..fe3408b3dd 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20140927; + return 20140928; }