diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index d2d07998e3..c3064995d2 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -34,5 +34,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/daihatsu.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ + $(PROJECT_DIR)/config/engines/lada_kalina.cpp \ $(PROJECT_DIR)/config/engines/ford_festiva.cpp \ No newline at end of file diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp new file mode 100644 index 0000000000..137878b163 --- /dev/null +++ b/firmware/config/engines/lada_kalina.cpp @@ -0,0 +1,16 @@ +/* + * @file lada_kalina.cpp + * + * set_engine_type 39 + * + * @date Jan 21, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + +#include "lada_kalina.h" + +EXTERN_ENGINE; + +void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) { + +} diff --git a/firmware/config/engines/lada_kalina.h b/firmware/config/engines/lada_kalina.h new file mode 100644 index 0000000000..ee9bf8336c --- /dev/null +++ b/firmware/config/engines/lada_kalina.h @@ -0,0 +1,15 @@ +/* + * @file lada_kalina.h + * + * @date Jan 21, 2016 + * @author Andrey Belomutskiy, (c) 2012-2016 + */ + +#ifndef CONFIG_ENGINES_LADA_KALINA_H_ +#define CONFIG_ENGINES_LADA_KALINA_H_ + +#include "engine.h" + +void setLadaKalina(DECLARE_ENGINE_PARAMETER_F); + +#endif /* CONFIG_ENGINES_LADA_KALINA_H_ */ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 0f4451ae45..e840279b73 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -38,6 +38,8 @@ case CHEVY_C20_1973: return "CHEVY C20"; case TOYOTA_JZS147: return "TOYOTA_JZS147"; +case LADA_KALINA: + return "LADA_KALINA"; case GM_2_2: return "GM_2_2"; case DODGE_RAM: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 2d53e3ec66..c51008de0a 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -71,6 +71,7 @@ #include "chevrolet_c20_1973.h" #include "toyota_jzs147.h" #include "ford_festiva.h" +#include "lada_kalina.h" EXTERN_ENGINE; @@ -704,6 +705,10 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case DODGE_NEON_2003: setDodgeNeonNGCEngineConfiguration(PASS_ENGINE_PARAMETER_F); break; + case LADA_KALINA: + setLadaKalina(PASS_ENGINE_PARAMETER_F); + break; + #endif /* EFI_SUPPORT_DODGE_NEON */ #if EFI_SUPPORT_FORD_ASPIRE || defined(__DOXYGEN__) case FORD_ASPIRE_1996: diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 18dcfcf709..df7c429f4b 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -113,7 +113,9 @@ typedef enum { TOYOTA_JZS147 = 38, - ET_UNUSED = 39, + LADA_KALINA = 39, + + ET_UNUSED = 40, Force_4b_engine_type = ENUM_32_BITS, } engine_type_e; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 20163c8a30..5d242848dd 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -600,6 +600,7 @@ page = 1 filter = deltaTps, "dTPS", deltaTps > , 50, , true + filter = VBatt, "VBatt", VBatt < , 12, , true ; filter = minTps, "Minimum TPS", TPS, > , 1, , true diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 25f17f883a..331ac2921d 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -132,7 +132,7 @@ public class AutoTest { msg = "2003 Neon running"; IoUtil.changeRpm(2000); chart = nextChart(); - x = 101.0; + x = 106.0; assertWave(true, msg, chart, EngineChart.SPARK_1, 0.13299999999999998, 0.02, EngineReport.RATIO, x + 180, x + 540); assertWaveNull(msg, chart, EngineChart.SPARK_2); assertWave(true, msg, chart, EngineChart.SPARK_3, 0.13299999999999998, 0.02, EngineReport.RATIO, x, x + 360); @@ -144,6 +144,7 @@ public class AutoTest { assertWave(true, msg, chart, EngineChart.INJECTOR_3, 0.208666666666667, 0.04, 0.2, x + 540); assertWave(true, msg, chart, EngineChart.INJECTOR_4, 0.208666666666667, 0.04, 0.2, x); + x = 105.0; sendCommand("enable trigger_only_front"); chart = nextChart(); assertWave(true, msg, chart, EngineChart.INJECTOR_1, 0.208666666666667, 0.04, 0.2, x + 360);