diff --git a/firmware/config/engines/dodge_stratus.cpp b/firmware/config/engines/dodge_stratus.cpp new file mode 100644 index 0000000000..c3af38cc44 --- /dev/null +++ b/firmware/config/engines/dodge_stratus.cpp @@ -0,0 +1,20 @@ +/** + * @file dodge_stratus.cpp + * + * set_engine_type 33 + * + * @date Sep 5, 2015 + * @author Andrey Belomutskiy, (c) 2012-2015 + */ + +#include "main.h" +#include "dodge_stratus.h" + +EXTERN_ENGINE +; + +void setDodgeStratus(DECLARE_ENGINE_PARAMETER_F) { + +} + + diff --git a/firmware/config/engines/dodge_stratus.h b/firmware/config/engines/dodge_stratus.h new file mode 100644 index 0000000000..d8b6376bbe --- /dev/null +++ b/firmware/config/engines/dodge_stratus.h @@ -0,0 +1,15 @@ +/** + * @file dodge_stratus.h + * + * @date Sep 5, 2015 + * @author Andrey Belomutskiy, (c) 2012-2015 + */ + +#ifndef CONFIG_ENGINES_DODGE_STRATUS_H_ +#define CONFIG_ENGINES_DODGE_STRATUS_H_ + +#include "engine.h" + +void setDodgeStratus(DECLARE_ENGINE_PARAMETER_F); + +#endif /* CONFIG_ENGINES_DODGE_STRATUS_H_ */ diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index a782d5df4d..763a07a0b7 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -27,5 +27,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/mitsubishi.cpp \ $(PROJECT_DIR)/config/engines/gm_2_2.cpp \ $(PROJECT_DIR)/config/engines/dodge_ram.cpp \ - $(PROJECT_DIR)/config/engines/vw.cpp + $(PROJECT_DIR)/config/engines/vw.cpp \ + $(PROJECT_DIR)/config/engines/dodge_stratus.cpp \ No newline at end of file diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index fac7b94dca..396a7d2fdf 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -92,6 +92,8 @@ case TEST_ENGINE: return "TEST_ENGINE"; case VW_ABA: return "VW_ABA"; +case DODGE_STRATUS: + return "DODGE_STRATUS"; } return NULL; } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 594127c247..56fae9abc0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -61,6 +61,7 @@ #include "gm_2_2.h" #include "dodge_ram.h" #include "vw.h" +#include "dodge_stratus.h" EXTERN_ENGINE; @@ -723,6 +724,9 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN case DODGE_RAM: setDodgeRam1996(PASS_ENGINE_PARAMETER_F); break; + case DODGE_STRATUS: + setDodgeStratus(PASS_ENGINE_PARAMETER_F); + break; case VW_ABA: setVwAba(PASS_ENGINE_PARAMETER_F); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 69c279321e..f44186f90c 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -101,7 +101,9 @@ typedef enum { VW_ABA = 32, - ET_UNUSED = 33, + DODGE_STRATUS = 33, + + ET_UNUSED = 34, Force_4b_engine_type = ENUM_32_BITS, } engine_type_e; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 7e958fe476..96e2f50bcf 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -174,6 +174,8 @@ const char* getConfigurationName(engine_type_e engineType) { return "Test"; case VW_ABA: return "VW_ABA"; + case DODGE_STRATUS: + return "DODGE_STRATUS"; case SACHS: return "SACHS"; case GM_2_2: diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index 0c15626d41..7852c8ebbe 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -74,7 +74,6 @@ public enum Sensor { IDLE_SWITCH("idle switch", SensorCategory.OTHERS), DEFAULT_FUEL("map fuel", SensorCategory.OPERATIONS, "ms", 0, 40), - T_CHARGE("T Charge", SensorCategory.OPERATIONS, "f", 0, 200), CHARTSIZE("CHARTSIZE", SensorCategory.OTHERS), CHART_STATUS("CHART_STATUS", SensorCategory.OTHERS), @@ -87,6 +86,8 @@ public enum Sensor { INJECTOR_3_DWELL("inj #3", SensorCategory.SNIFFING), INJECTOR_4_DWELL("inj #4", SensorCategory.SNIFFING), + T_CHARGE(SensorCategory.OPERATIONS, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140), + DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10), CURRENT_VE(SensorCategory.OPERATIONS, FieldType.FLOAT, 112, BackgroundColor.MUD), MAP_ACCEL_DELTA(SensorCategory.OPERATIONS, FieldType.FLOAT, 124, BackgroundColor.MUD), TPS_ACCEL_FUEL(SensorCategory.OPERATIONS, FieldType.FLOAT, 128, BackgroundColor.MUD), @@ -107,15 +108,19 @@ public enum Sensor { private final FieldType type; private final int offset; - Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color) { + Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color, double minValue, double maxValue) { name = name(); this.type = type; this.offset = offset; this.category = category; this.color = color; units = "n/a"; - minValue = 0; - maxValue = 100; + this.minValue = minValue; + this.maxValue = maxValue; + } + + Sensor(SensorCategory category, FieldType type, int offset, BackgroundColor color) { + this(category, type, offset, color, 0, 100); } Sensor(String name, SensorCategory category) {