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

auto-sync

This commit is contained in:
rusEfi 2016-12-21 12:02:35 -05:00
parent 9c763ebec9
commit 483d870175
6 changed files with 176 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 21 11:35:20 EST 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1803,7 +1803,15 @@ typedef struct {
/**
* offset 2668
*/
int unused[95];
ThermistorConf auxTempSensor1;
/**
* offset 2700
*/
ThermistorConf auxTempSensor2;
/**
* offset 2732
*/
int unused[79];
/** total size 3048*/
} engine_configuration_s;
@ -2018,4 +2026,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 21 11:35:20 EST 2016

22
firmware/controllers/algo/rusefi_generated.h
View File

@ -897,7 +897,27 @@
#define postCrankingTargetClt_offset 2656
#define postCrankingFactor_offset 2660
#define postCrankingDurationSec_offset 2664
#define unused_offset 2668
#define auxTempSensor1_offset 2668
#define auxTempSensor1_config_offset 2668
#define auxTempSensor1_tempC_1_offset 2668
#define auxTempSensor1_tempC_2_offset 2672
#define auxTempSensor1_tempC_3_offset 2676
#define auxTempSensor1_resistance_1_offset 2680
#define auxTempSensor1_resistance_2_offset 2684
#define auxTempSensor1_resistance_3_offset 2688
#define auxTempSensor1_bias_resistor_offset 2692
#define auxTempSensor1_adcChannel_offset 2696
#define auxTempSensor2_offset 2700
#define auxTempSensor2_config_offset 2700
#define auxTempSensor2_tempC_1_offset 2700
#define auxTempSensor2_tempC_2_offset 2704
#define auxTempSensor2_tempC_3_offset 2708
#define auxTempSensor2_resistance_1_offset 2712
#define auxTempSensor2_resistance_2_offset 2716
#define auxTempSensor2_resistance_3_offset 2720
#define auxTempSensor2_bias_resistor_offset 2724
#define auxTempSensor2_adcChannel_offset 2728
#define unused_offset 2732
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

4
firmware/integration/rusefi_config.txt
View File

@ -766,7 +766,9 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
float postCrankingTargetClt;;"degC", 1, 0, 0, 100, 0
float postCrankingFactor;;"mult", 1, 0, 0, 100, 4
float postCrankingDurationSec;;"seconds", 1, 0, 0, 100, 2
int[95] unused;
ThermistorConf auxTempSensor1;
ThermistorConf auxTempSensor2;
int[79] unused;
end_struct

62
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 Dec 19 15:39:22 EST 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 21 11:35:20 EST 2016
pageSize = 16376
page = 1
@ -628,7 +628,23 @@ page = 1
postCrankingTargetClt = scalar, F32, 2656, "degC", 1, 0, 0, 100, 0
postCrankingFactor = scalar, F32, 2660, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2664, "seconds", 1, 0, 0, 100, 2
;skipping unused offset 2668
auxTempSensor1_tempC_1 = scalar, F32, 2668, "*C", 1, 0, -40, 200, 1
auxTempSensor1_tempC_2 = scalar, F32, 2672, "*C", 1, 0, -40, 200, 1
auxTempSensor1_tempC_3 = scalar, F32, 2676, "*C", 1, 0, -40, 200, 1
auxTempSensor1_resistance_1 = scalar, F32, 2680, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor1_resistance_2 = scalar, F32, 2684, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor1_resistance_3 = scalar, F32, 2688, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor1_bias_resistor = scalar, F32, 2692, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor1_adcChannel = bits, U32, 2696, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
auxTempSensor2_tempC_1 = scalar, F32, 2700, "*C", 1, 0, -40, 200, 1
auxTempSensor2_tempC_2 = scalar, F32, 2704, "*C", 1, 0, -40, 200, 1
auxTempSensor2_tempC_3 = scalar, F32, 2708, "*C", 1, 0, -40, 200, 1
auxTempSensor2_resistance_1 = scalar, F32, 2712, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor2_resistance_2 = scalar, F32, 2716, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor2_resistance_3 = scalar, F32, 2720, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor2_bias_resistor = scalar, F32, 2724, "Ohm", 1, 0, 0, 200000, 1
auxTempSensor2_adcChannel = bits, U32, 2728, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;skipping unused offset 2732
le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2
@ -1339,6 +1355,8 @@ fileVersion = { 20160702 }
subMenu = analogInputs, "Analog inputs"
subMenu = cltSensor, "CLT Sensor Settings"
subMenu = iatSensor, "IAT Sensor Settings"
subMenu = auxTempSensor1Sensor, "AuxTemp1 Sensor Settings"
subMenu = auxTempSensor2Sensor, "AuxTemp2 Sensor Settings"
subMenu = mapSettings, "MAP Sensor Settings"
subMenu = mafDecodingCurve, "MAF Sensor Settings"
subMenu = egoSettings, "EGO Sensor Settings"
@ -1585,6 +1603,46 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
panel = ignitionOutputs, West
panel = dwellCorrection, Center
; Engine->Aux1 Thermistor Settings
dialog = auxTempSensor1_thermistor, "aux1 Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."
field = "!Typical temperatures is -40°C, 0°C and 100°C"
field = ""
field = "Lowest temperature", auxTempSensor1_tempC_1
field = "Resistance @ LT", auxTempSensor1_resistance_1
field = ""
field = "Middle temperature", auxTempSensor1_tempC_2
field = "Resistance @ MT", auxTempSensor1_resistance_2
field = ""
field = "Highest temperature", auxTempSensor1_tempC_3
field = "Resistance @ HT", auxTempSensor1_resistance_3
dialog = auxTempSensor1Sensor_IO, "auxTempSensor1 Sensor I/O"
field = "auxTempSensor1 ADC input", auxTempSensor1_adcChannel
field = "Bias Resistor Value", auxTempSensor1_bias_resistor
dialog = auxTempSensor1Sensor, "", yAxis
panel = auxTempSensor1_thermistor, North
panel = auxTempSensor1Sensor_IO, South
; Engine->Aux2 Thermistor Settings
dialog = auxTempSensor2_thermistor, "aux1 Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."
field = "!Typical temperatures is -40°C, 0°C and 100°C"
field = ""
field = "Lowest temperature", auxTempSensor2_tempC_1
field = "Resistance @ LT", auxTempSensor2_resistance_1
field = ""
field = "Middle temperature", auxTempSensor2_tempC_2
field = "Resistance @ MT", auxTempSensor2_resistance_2
field = ""
field = "Highest temperature", auxTempSensor2_tempC_3
field = "Resistance @ HT", auxTempSensor2_resistance_3
dialog = auxTempSensor2Sensor_IO, "auxTempSensor2 Sensor I/O"
field = "auxTempSensor2 ADC input", auxTempSensor2_adcChannel
field = "Bias Resistor Value", auxTempSensor2_bias_resistor
dialog = auxTempSensor2Sensor, "", yAxis
panel = auxTempSensor2_thermistor, North
panel = auxTempSensor2Sensor_IO, South
; Engine->CLT Thermistor Settings
dialog = clt_thermistor, "CLT Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."

44
firmware/tunerstudio/rusefi.input
View File

@ -427,7 +427,7 @@ page = 1
useConstantDwellDuringCranking= bits, U32, 1488, [4:4], "false", "true"
isEngineChartEnabled = bits, U32, 1488, [5:5], "false", "true"
isCanEnabled = bits, U32, 1488, [6:6], "false", "true"
hasCltSensor = bits, U32, 1488, [7:7], "false", "true"
ltSensor = bits, U32, 1488, [7:7], "false", "true"
canReadEnabled = bits, U32, 1488, [8:8], "false", "true"
canWriteEnabled = bits, U32, 1488, [9:9], "false", "true"
hasVehicleSpeedSensor = bits, U32, 1488, [10:10], "false", "true"
@ -1299,6 +1299,8 @@ fileVersion = { 20160702 }
subMenu = analogInputs, "Analog inputs"
subMenu = cltSensor, "CLT Sensor Settings"
subMenu = iatSensor, "IAT Sensor Settings"
subMenu = auxTempSensor1Sensor, "AuxTemp1 Sensor Settings"
subMenu = auxTempSensor2Sensor, "AuxTemp2 Sensor Settings"
subMenu = mapSettings, "MAP Sensor Settings"
subMenu = mafDecodingCurve, "MAF Sensor Settings"
subMenu = egoSettings, "EGO Sensor Settings"
@ -1545,6 +1547,46 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
panel = ignitionOutputs, West
panel = dwellCorrection, Center
; Engine->Aux1 Thermistor Settings
dialog = auxTempSensor1_thermistor, "aux1 Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."
field = "!Typical temperatures is -40°C, 0°C and 100°C"
field = ""
field = "Lowest temperature", auxTempSensor1_tempC_1
field = "Resistance @ LT", auxTempSensor1_resistance_1
field = ""
field = "Middle temperature", auxTempSensor1_tempC_2
field = "Resistance @ MT", auxTempSensor1_resistance_2
field = ""
field = "Highest temperature", auxTempSensor1_tempC_3
field = "Resistance @ HT", auxTempSensor1_resistance_3
dialog = auxTempSensor1Sensor_IO, "auxTempSensor1 Sensor I/O"
field = "auxTempSensor1 ADC input", auxTempSensor1_adcChannel
field = "Bias Resistor Value", auxTempSensor1_bias_resistor
dialog = auxTempSensor1Sensor, "", yAxis
panel = auxTempSensor1_thermistor, North
panel = auxTempSensor1Sensor_IO, South
; Engine->Aux2 Thermistor Settings
dialog = auxTempSensor2_thermistor, "aux1 Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."
field = "!Typical temperatures is -40°C, 0°C and 100°C"
field = ""
field = "Lowest temperature", auxTempSensor2_tempC_1
field = "Resistance @ LT", auxTempSensor2_resistance_1
field = ""
field = "Middle temperature", auxTempSensor2_tempC_2
field = "Resistance @ MT", auxTempSensor2_resistance_2
field = ""
field = "Highest temperature", auxTempSensor2_tempC_3
field = "Resistance @ HT", auxTempSensor2_resistance_3
dialog = auxTempSensor2Sensor_IO, "auxTempSensor2 Sensor I/O"
field = "auxTempSensor2 ADC input", auxTempSensor2_adcChannel
field = "Bias Resistor Value", auxTempSensor2_bias_resistor
dialog = auxTempSensor2Sensor, "", yAxis
panel = auxTempSensor2_thermistor, North
panel = auxTempSensor2Sensor_IO, South
; Engine->CLT Thermistor Settings
dialog = clt_thermistor, "CLT Thermistor Settings"
field = "!Here is three pairs of thermistor temperature and his resistance."

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 19 15:39:22 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 21 11:35:20 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -901,7 +901,27 @@ public class Fields {
public static final int postCrankingTargetClt_offset = 2656;
public static final int postCrankingFactor_offset = 2660;
public static final int postCrankingDurationSec_offset = 2664;
public static final int unused_offset = 2668;
public static final int auxTempSensor1_offset = 2668;
public static final int auxTempSensor1_config_offset = 2668;
public static final int auxTempSensor1_tempC_1_offset = 2668;
public static final int auxTempSensor1_tempC_2_offset = 2672;
public static final int auxTempSensor1_tempC_3_offset = 2676;
public static final int auxTempSensor1_resistance_1_offset = 2680;
public static final int auxTempSensor1_resistance_2_offset = 2684;
public static final int auxTempSensor1_resistance_3_offset = 2688;
public static final int auxTempSensor1_bias_resistor_offset = 2692;
public static final int auxTempSensor1_adcChannel_offset = 2696;
public static final int auxTempSensor2_offset = 2700;
public static final int auxTempSensor2_config_offset = 2700;
public static final int auxTempSensor2_tempC_1_offset = 2700;
public static final int auxTempSensor2_tempC_2_offset = 2704;
public static final int auxTempSensor2_tempC_3_offset = 2708;
public static final int auxTempSensor2_resistance_1_offset = 2712;
public static final int auxTempSensor2_resistance_2_offset = 2716;
public static final int auxTempSensor2_resistance_3_offset = 2720;
public static final int auxTempSensor2_bias_resistor_offset = 2724;
public static final int auxTempSensor2_adcChannel_offset = 2728;
public static final int unused_offset = 2732;
public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1545,6 +1565,22 @@ public class Fields {
public static final Field POSTCRANKINGTARGETCLT = Field.create("POSTCRANKINGTARGETCLT", 2656, FieldType.FLOAT);
public static final Field POSTCRANKINGFACTOR = Field.create("POSTCRANKINGFACTOR", 2660, FieldType.FLOAT);
public static final Field POSTCRANKINGDURATIONSEC = Field.create("POSTCRANKINGDURATIONSEC", 2664, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_TEMPC_1 = Field.create("AUXTEMPSENSOR1_TEMPC_1", 2668, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_TEMPC_2 = Field.create("AUXTEMPSENSOR1_TEMPC_2", 2672, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_TEMPC_3 = Field.create("AUXTEMPSENSOR1_TEMPC_3", 2676, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_RESISTANCE_1 = Field.create("AUXTEMPSENSOR1_RESISTANCE_1", 2680, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_RESISTANCE_2 = Field.create("AUXTEMPSENSOR1_RESISTANCE_2", 2684, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_RESISTANCE_3 = Field.create("AUXTEMPSENSOR1_RESISTANCE_3", 2688, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_BIAS_RESISTOR = Field.create("AUXTEMPSENSOR1_BIAS_RESISTOR", 2692, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_ADCCHANNEL = Field.create("AUXTEMPSENSOR1_ADCCHANNEL", 2696, FieldType.INT, adc_channel_e);
public static final Field AUXTEMPSENSOR2_TEMPC_1 = Field.create("AUXTEMPSENSOR2_TEMPC_1", 2700, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_TEMPC_2 = Field.create("AUXTEMPSENSOR2_TEMPC_2", 2704, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_TEMPC_3 = Field.create("AUXTEMPSENSOR2_TEMPC_3", 2708, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_RESISTANCE_1 = Field.create("AUXTEMPSENSOR2_RESISTANCE_1", 2712, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_RESISTANCE_2 = Field.create("AUXTEMPSENSOR2_RESISTANCE_2", 2716, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_RESISTANCE_3 = Field.create("AUXTEMPSENSOR2_RESISTANCE_3", 2720, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_BIAS_RESISTOR = Field.create("AUXTEMPSENSOR2_BIAS_RESISTOR", 2724, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR2_ADCCHANNEL = Field.create("AUXTEMPSENSOR2_ADCCHANNEL", 2728, FieldType.INT, adc_channel_e);
public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT);
public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT);
public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);