From 4e91b721c366f68680a1a971c2f298fa578b14ed Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 12 Jun 2017 18:22:25 -0400 Subject: [PATCH] stepper and linear termistors --- .../engine_configuration_generated_structures.h | 10 +++++----- firmware/controllers/algo/rusefi_generated.h | 12 ++++++------ firmware/integration/rusefi_config.txt | 6 +++--- firmware/tunerstudio/rusefi.ini | 11 +++++++---- firmware/tunerstudio/rusefi.input | 3 +++ .../models/src/com/rusefi/config/Fields.java | 14 +++++++------- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 39b9beaf0b..999d513e6a 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 18:21:38 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -668,7 +668,7 @@ typedef struct { /** * offset 582 */ - int16_t unusedHere; + int16_t idleStepperPulseDuration; /** * offset 584 */ @@ -1222,7 +1222,7 @@ typedef struct { bool silentTriggerError : 1; /** offset 1488 bit 7 */ - bool unusedBit__2 : 1; + bool useLinearCltSensor : 1; /** offset 1488 bit 8 */ bool canReadEnabled : 1; @@ -1231,7 +1231,7 @@ typedef struct { bool canWriteEnabled : 1; /** offset 1488 bit 10 */ - bool unusedBit_123 : 1; + bool useLinearIatSensor : 1; /** offset 1488 bit 11 */ bool unusedbit_9 : 1; @@ -2118,4 +2118,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 18:21:38 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index d683e1bbf2..8a3f22aa8c 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -679,8 +679,8 @@ #define unused1_offset_hex 4b0 #define idlePidDeactivationTpsThreshold_offset 1204 #define idlePidDeactivationTpsThreshold_offset_hex 4b4 -#define unusedHere_offset 1206 -#define unusedHere_offset_hex 4b6 +#define idleStepperPulseDuration_offset 1206 +#define idleStepperPulseDuration_offset_hex 4b6 #define nb2ratioFrom_offset 1208 #define nb2ratioFrom_offset_hex 4b8 #define nb2ratioTo_offset 1212 @@ -851,14 +851,14 @@ #define isEngineChartEnabled_offset_hex 5d0 #define silentTriggerError_offset 1488 #define silentTriggerError_offset_hex 5d0 -#define unusedBit__2_offset 1488 -#define unusedBit__2_offset_hex 5d0 +#define useLinearCltSensor_offset 1488 +#define useLinearCltSensor_offset_hex 5d0 #define canReadEnabled_offset 1488 #define canReadEnabled_offset_hex 5d0 #define canWriteEnabled_offset 1488 #define canWriteEnabled_offset_hex 5d0 -#define unusedBit_123_offset 1488 -#define unusedBit_123_offset_hex 5d0 +#define useLinearIatSensor_offset 1488 +#define useLinearIatSensor_offset_hex 5d0 #define unusedbit_9_offset 1488 #define unusedbit_9_offset_hex 5d0 #define unusedbit_10_offset 1488 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 94732bfe44..5424b0a626 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -527,7 +527,7 @@ custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UA uart_device_e consoleUartDevice; int unused1; int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0 - int16_t unusedHere; + int16_t idleStepperPulseDuration;;"ms", 1, 0, 0, 1000.0, 0 float nb2ratioFrom;;"value", 1, 0, 0, 1000, 5 float nb2ratioTo;;"value", 1, 0, 0, 1000, 5 @@ -593,10 +593,10 @@ bit vvtDisplayInverted bit useConstantDwellDuringCranking bit isEngineChartEnabled;This options enables data for 'engine sniffer' tab in console, which comes at some CPU price bit silentTriggerError - bit unusedBit__2 + bit useLinearCltSensor bit canReadEnabled bit canWriteEnabled - bit unusedBit_123 + bit useLinearIatSensor bit unusedbit_9 bit unusedbit_10 bit isAlternatorControlEnabled diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 302392a821..08a1edfa2c 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 18:21:38 EDT 2017 pageSize = 16376 page = 1 @@ -345,7 +345,7 @@ page = 1 consoleUartDevice = bits,U32, 1196, [0:1], "Off", "UART1", "UART2", "UART3" ;skipping unused1 offset 1200 idlePidDeactivationTpsThreshold = scalar, S16, 1204, "%", 1, 0, 0, 100.0, 0 -;skipping unusedHere offset 1206 + idleStepperPulseDuration = scalar, S16, 1206, "ms", 1, 0, 0, 1000.0, 0 nb2ratioFrom = scalar, F32, 1208, "value", 1, 0, 0, 1000, 5 nb2ratioTo = scalar, F32, 1212, "value", 1, 0, 0, 1000, 5 triggerErrorPin = bits, U32, 1216, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -431,10 +431,10 @@ page = 1 useConstantDwellDuringCranking= bits, U32, 1488, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1488, [5:5], "false", "true" silentTriggerError = bits, U32, 1488, [6:6], "false", "true" - unusedBit__2 = bits, U32, 1488, [7:7], "false", "true" + useLinearCltSensor = bits, U32, 1488, [7:7], "false", "true" canReadEnabled = bits, U32, 1488, [8:8], "false", "true" canWriteEnabled = bits, U32, 1488, [9:9], "false", "true" - unusedBit_123 = bits, U32, 1488, [10:10], "false", "true" + useLinearIatSensor = bits, U32, 1488, [10:10], "false", "true" unusedbit_9 = bits, U32, 1488, [11:11], "false", "true" unusedbit_10 = bits, U32, 1488, [12:12], "false", "true" isAlternatorControlEnabled= bits, U32, 1488, [13:13], "false", "true" @@ -1792,6 +1792,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin + field = "Idle Stepper Pulse", idleStepperPulseDuration field = "Fuel Pump Pin", fuelPumpPin field = "ETB Dir #1", etbDirectionPin1 field = "ETB Dir #2", etbDirectionPin2 @@ -1872,6 +1873,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "" field = "Highest temperature", clt_tempC_3 field = "Resistance @ HT", clt_resistance_3 + field = "Is linear?", useLinearCltSensor dialog = cltSensor_IO, "CLT Sensor I/O" field = "CLT ADC input", clt_adcChannel field = "Bias Resistor Value", clt_bias_resistor @@ -1895,6 +1897,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" dialog = iatSensor_IO, "IAT Sensor I/O" field = "IAT ADC input", iat_adcChannel field = "Bias Resistor Value", iat_bias_resistor + field = "Is linear?", useLinearIatSensor dialog = iatSensor, "", yAxis panel = iat_thermistor, North panel = iatSensor_IO, South diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index c1c0ef3f83..aae11fdb46 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1028,6 +1028,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin + field = "Idle Stepper Pulse", idleStepperPulseDuration field = "Fuel Pump Pin", fuelPumpPin field = "ETB Dir #1", etbDirectionPin1 field = "ETB Dir #2", etbDirectionPin2 @@ -1108,6 +1109,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "" field = "Highest temperature", clt_tempC_3 field = "Resistance @ HT", clt_resistance_3 + field = "Is linear?", useLinearCltSensor dialog = cltSensor_IO, "CLT Sensor I/O" field = "CLT ADC input", clt_adcChannel field = "Bias Resistor Value", clt_bias_resistor @@ -1131,6 +1133,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" dialog = iatSensor_IO, "IAT Sensor I/O" field = "IAT ADC input", iat_adcChannel field = "Bias Resistor Value", iat_bias_resistor + field = "Is linear?", useLinearIatSensor dialog = iatSensor, "", yAxis panel = iat_thermistor, North panel = iatSensor_IO, South diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 151fbf8ce6..98c60c1b7c 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 based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 18:21:38 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -511,7 +511,7 @@ public class Fields { public static final int consoleUartDevice_offset = 1196; public static final int unused1_offset = 1200; public static final int idlePidDeactivationTpsThreshold_offset = 1204; - public static final int unusedHere_offset = 1206; + public static final int idleStepperPulseDuration_offset = 1206; public static final int nb2ratioFrom_offset = 1208; public static final int nb2ratioTo_offset = 1212; public static final int triggerErrorPin_offset = 1216; @@ -627,10 +627,10 @@ public class Fields { public static final int useConstantDwellDuringCranking_offset = 1488; public static final int isEngineChartEnabled_offset = 1488; public static final int silentTriggerError_offset = 1488; - public static final int unusedBit__2_offset = 1488; + public static final int useLinearCltSensor_offset = 1488; public static final int canReadEnabled_offset = 1488; public static final int canWriteEnabled_offset = 1488; - public static final int unusedBit_123_offset = 1488; + public static final int useLinearIatSensor_offset = 1488; public static final int unusedbit_9_offset = 1488; public static final int unusedbit_10_offset = 1488; public static final int isAlternatorControlEnabled_offset = 1488; @@ -1387,7 +1387,7 @@ public class Fields { public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 1196, FieldType.INT); public static final Field UNUSED1 = Field.create("UNUSED1", 1200, FieldType.INT); public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 1204, FieldType.INT); - public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 1206, FieldType.INT); + public static final Field IDLESTEPPERPULSEDURATION = Field.create("IDLESTEPPERPULSEDURATION", 1206, FieldType.INT); public static final Field NB2RATIOFROM = Field.create("NB2RATIOFROM", 1208, FieldType.FLOAT); public static final Field NB2RATIOTO = Field.create("NB2RATIOTO", 1212, FieldType.FLOAT); public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e); @@ -1474,10 +1474,10 @@ public class Fields { public static final Field USECONSTANTDWELLDURINGCRANKING = Field.create("USECONSTANTDWELLDURINGCRANKING", 1488, FieldType.BIT, 4); public static final Field ISENGINECHARTENABLED = Field.create("ISENGINECHARTENABLED", 1488, FieldType.BIT, 5); public static final Field SILENTTRIGGERERROR = Field.create("SILENTTRIGGERERROR", 1488, FieldType.BIT, 6); - public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7); + public static final Field USELINEARCLTSENSOR = Field.create("USELINEARCLTSENSOR", 1488, FieldType.BIT, 7); public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8); public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9); - public static final Field UNUSEDBIT_123 = Field.create("UNUSEDBIT_123", 1488, FieldType.BIT, 10); + public static final Field USELINEARIATSENSOR = Field.create("USELINEARIATSENSOR", 1488, FieldType.BIT, 10); public static final Field UNUSEDBIT_9 = Field.create("UNUSEDBIT_9", 1488, FieldType.BIT, 11); public static final Field UNUSEDBIT_10 = Field.create("UNUSEDBIT_10", 1488, FieldType.BIT, 12); public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13);