diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index db417c176f..a95758e839 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1596,6 +1596,7 @@ #define PROTOCOL_WA_CHANNEL_3 "input3" #define PROTOCOL_WA_CHANNEL_4 "input4" #define RPM_1_BYTE_PACKING_MULT 50 +#define RPM_2_BYTE_PACKING_MULT 1 #define rpmHardLimit_offset 416 #define rpmHardLimit_offset_hex 1a0 #define runningLedPin_offset 1813 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 33bf7951c1..1ce35898bf 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1596,6 +1596,7 @@ #define PROTOCOL_WA_CHANNEL_3 "input3" #define PROTOCOL_WA_CHANNEL_4 "input4" #define RPM_1_BYTE_PACKING_MULT 50 +#define RPM_2_BYTE_PACKING_MULT 1 #define rpmHardLimit_offset 416 #define rpmHardLimit_offset_hex 1a0 #define runningLedPin_offset 1813 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ad3a66ea47..58102cdcba 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -128,6 +128,8 @@ struct_no_prefix engine_configuration_s #define RPM_1_BYTE_PACKING_MULT 50 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 +#define RPM_2_BYTE_PACKING_MULT 1 + #define MAGIC_30_PACKING_MULT 30 #define MAGIC_300_PACKING_MULT 300 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 74e2686545..1dce13aab8 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:51 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 14:32:57 EST 2019 pageSize = 20000 page = 1 @@ -1282,7 +1282,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / 1, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index b1e8659def..a2c99d10dc 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -196,7 +196,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / @@RPM_2_BYTE_PACKING_MULT@@, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 7736fbfe71..01f09d5fed 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:57 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 14:33:03 EST 2019 pageSize = 20000 page = 1 @@ -1282,7 +1282,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / 1, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index f591542be6..9d6667e8e0 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 12:00:03 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 14:33:09 EST 2019 pageSize = 20000 page = 1 @@ -1282,7 +1282,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / 1, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 9fcdb09b07..67b0ea28cc 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 11:59:54 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 14:33:00 EST 2019 pageSize = 20000 page = 1 @@ -1282,7 +1282,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / 1, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 2a2a67b842..3133d0a7c0 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 12:00:00 EST 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 14:33:06 EST 2019 pageSize = 20000 page = 1 @@ -1282,7 +1282,7 @@ fileVersion = { 20190701 } ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ; RPM, vss - RPMValue = scalar, U16, 4, "RPM", 0.25, 0.00000 + RPMValue = scalar, U16, 4, "RPM", 1 / 1, 0.00000 rpmAcceleration = scalar, S16, 6, "dRpm", 0.01, 0 speedToRpmRatio = scalar, S16, 8, "value", 0.01, 0 vehicleSpeedKph = scalar, U16, 10, "kph", 0.01, 0.0 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 9a453f992b..913632fb1d 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 13:27:26 EST 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 21 14:32:57 EST 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1063,6 +1063,7 @@ public class Fields { public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; public static final int RPM_1_BYTE_PACKING_MULT = 50; + public static final int RPM_2_BYTE_PACKING_MULT = 1; public static final int rpmHardLimit_offset = 416; public static final int runningLedPin_offset = 1813; public static final int runningLedPin_offset_hex = 715; diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index 99737d20c8..54a860ff9a 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -22,7 +22,7 @@ public enum Sensor { */ // RPM, vss - RPM("RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 4, 0.25, BackgroundColor.RED, 0, 8000, "/min"), + RPM("RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 4, 1 / RPM_2_BYTE_PACKING_MULT, BackgroundColor.RED, 0, 8000, "/min"), SPEED2RPM("SpeedToRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 6, 0.01, BackgroundColor.MUD, 0, 5, "RPM/kph"), VSS("VSS", SensorCategory.OPERATIONS, FieldType.UINT8, 8, 0.01, BackgroundColor.BLUE, 0, 150, "kph"),