rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trying to save build. it's a useful PR overall but :(

This commit is contained in:
rusefi 2019-12-21 14:34:50 -05:00
parent 9201761358
commit 9f191f0dd8
11 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -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

1
firmware/controllers/generated/rusefi_generated.h
View File

@ -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

2
firmware/integration/rusefi_config.txt
View File

@ -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

4
firmware/tunerstudio/rusefi.ini
View File

@ -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

2
firmware/tunerstudio/rusefi.input
View File

@ -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

4
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -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

4
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -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

4
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -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

4
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -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

3
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -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;

2
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -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"),