From c7dd1631c4b87f430f35dbaec9f2d1d9b2d36257 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 21 Dec 2019 14:34:50 -0500 Subject: [PATCH] trying to save build. it's a useful PR overall but :( --- firmware/integration/rusefi_config.txt | 2 ++ firmware/tunerstudio/rusefi.input | 2 +- .../models/src/com/rusefi/config/generated/Fields.java | 3 ++- java_console/models/src/com/rusefi/core/Sensor.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) 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.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/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"),