diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 1c07f84717..5785f15b73 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -558,6 +558,7 @@ typedef enum { * You would use this value if you want to see a detailed graph of your trigger events */ SC_TRIGGER = 1, SC_MAP = 2, + SC_RPM_ACCEL = 3, Internal_ForceMyEnumIntSize_sensor_chart = ENUM_32_BITS, } sensor_chart_e; diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 21d83ef076..87500ef4d1 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -252,7 +252,7 @@ static int findAngleIndex(float angleOffset DECLARE_ENGINE_PARAMETER_S) { */ while (true) { middle = (left + right) / 2; - float eventAngle = TRIGGER_SHAPE(eventAngles[middle]); + angle_t eventAngle = TRIGGER_SHAPE(eventAngles[middle]); if (middle == left) { return middle; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f8f5239340..0ea162d149 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -460,7 +460,7 @@ custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, brain_pin_e joystickCPin; brain_pin_e joystickDPin; -#define sensor_chart_e_enum "none", "trigger", "MAP", "INVALID" +#define sensor_chart_e_enum "none", "trigger", "MAP", "RPM ACCEL", "INVALID" custom sensor_chart_e 4 bits, S32, @OFFSET@, [0:1], @@sensor_chart_e_enum@@ sensor_chart_e sensorChartMode; diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 7e1a42778b..1bc022412f 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar Sat Sep 12 14:31:14 EDT 2015 +// this file was generated automatically by ConfigDefinition.jar Sat Sep 12 17:18:32 EDT 2015 public class Fields { public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT); public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT); @@ -320,7 +320,7 @@ public class Fields { public static final Field JOYSTICKBPIN = new Field("JOYSTICKBPIN", 1396, FieldType.INT, brain_pin_e); public static final Field JOYSTICKCPIN = new Field("JOYSTICKCPIN", 1400, FieldType.INT, brain_pin_e); public static final Field JOYSTICKDPIN = new Field("JOYSTICKDPIN", 1404, FieldType.INT, brain_pin_e); - public static final String[] sensor_chart_e = {"none", "trigger", "MAP", "INVALID"}; + public static final String[] sensor_chart_e = {"none", "trigger", "MAP", "RPM ACCEL", "INVALID"}; public static final Field SENSORCHARTMODE = new Field("SENSORCHARTMODE", 1408, FieldType.INT, sensor_chart_e); public static final Field MAFSENSORTYPE = new Field("MAFSENSORTYPE", 1412, FieldType.INT); public static final Field VEHICLESPEEDSENSORINPUTPIN = new Field("VEHICLESPEEDSENSORINPUTPIN", 1416, FieldType.INT, brain_input_pin_e);