mirror of https://github.com/rusefi/rusefi-1.git
fresh auto-genenrated
This commit is contained in:
rusefi
parent
d2569a1d11
commit
b6c2eceb3b
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 04 10:21:45 EDT 2018
|
||||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Sep 25 15:46:46 EDT 2018
|
||||
// begin
|
||||
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
|
||||
#define ENGINE_CONFIGURATION_GENERATED_H_
|
||||
|
|
@ -1425,7 +1425,7 @@ typedef struct {
|
|||
bool useAdvanceCorrectionsForCranking : 1;
|
||||
/**
|
||||
offset 1484 bit 19 */
|
||||
bool unused_1484_bit_19 : 1;
|
||||
bool useTPSAdvanceTable : 1;
|
||||
/**
|
||||
offset 1484 bit 20 */
|
||||
bool unused_1484_bit_20 : 1;
|
||||
|
|
@ -2144,7 +2144,39 @@ typedef struct {
|
|||
/**
|
||||
* offset 3516
|
||||
*/
|
||||
int unusedEnd[741];
|
||||
ignition_tps_table_t ignitionTpsTable;
|
||||
/**
|
||||
* offset 4028
|
||||
*/
|
||||
float ignitionTpsBins[IGN_TPS_COUNT];
|
||||
/**
|
||||
* offset 4092
|
||||
*/
|
||||
float tChargeAirCoefMin;
|
||||
/**
|
||||
* offset 4096
|
||||
*/
|
||||
float tChargeAirCoefMax;
|
||||
/**
|
||||
* offset 4100
|
||||
*/
|
||||
float tChargeAirFlowMax;
|
||||
/**
|
||||
* offset 4104
|
||||
*/
|
||||
float tChargeAirIncrLimit;
|
||||
/**
|
||||
* offset 4108
|
||||
*/
|
||||
float tChargeAirDecrLimit;
|
||||
/**
|
||||
* offset 4112
|
||||
*/
|
||||
tChargeMode_e tChargeMode;
|
||||
/**
|
||||
* offset 4116
|
||||
*/
|
||||
int unusedEnd[591];
|
||||
/** total size 6480*/
|
||||
} engine_configuration_s;
|
||||
|
||||
|
|
@ -2390,4 +2422,4 @@ typedef struct {
|
|||
|
||||
#endif
|
||||
// end
|
||||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 04 10:21:45 EDT 2018
|
||||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Sep 25 15:46:46 EDT 2018
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#define DWELL_CURVE_SIZE 8
|
||||
#define CRANKING_CURVE_SIZE 8
|
||||
#define IGN_LOAD_COUNT 16
|
||||
#define IGN_TPS_COUNT 16
|
||||
#define IGN_RPM_COUNT 16
|
||||
#define INJECTION_PIN_COUNT 12
|
||||
#define IGNITION_PIN_COUNT 12
|
||||
|
|
@ -68,6 +69,7 @@
|
|||
#define sensor_chart_e_enum "none", "trigger", "MAP", "RPM ACCEL", "DETAILED RPM", "INVALID"
|
||||
#define ego_sensor_e_enum "BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom"
|
||||
#define pin_mode_e_enum "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35"
|
||||
#define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation"
|
||||
#define engineConfiguration_offset 0
|
||||
#define engineConfiguration_offset_hex 0
|
||||
#define engineType_offset 0
|
||||
|
|
@ -964,8 +966,8 @@
|
|||
#define useSeparateAdvanceForCranking_offset_hex 5cc
|
||||
#define useAdvanceCorrectionsForCranking_offset 1484
|
||||
#define useAdvanceCorrectionsForCranking_offset_hex 5cc
|
||||
#define unused_1484_bit_19_offset 1484
|
||||
#define unused_1484_bit_19_offset_hex 5cc
|
||||
#define useTPSAdvanceTable_offset 1484
|
||||
#define useTPSAdvanceTable_offset_hex 5cc
|
||||
#define unused_1484_bit_20_offset 1484
|
||||
#define unused_1484_bit_20_offset_hex 5cc
|
||||
#define unused_1484_bit_21_offset 1484
|
||||
|
|
@ -1568,8 +1570,24 @@
|
|||
#define iacCoastingBins_offset_hex d3c
|
||||
#define iacCoasting_offset 3452
|
||||
#define iacCoasting_offset_hex d7c
|
||||
#define unusedEnd_offset 3516
|
||||
#define unusedEnd_offset_hex dbc
|
||||
#define ignitionTpsTable_offset 3516
|
||||
#define ignitionTpsTable_offset_hex dbc
|
||||
#define ignitionTpsBins_offset 4028
|
||||
#define ignitionTpsBins_offset_hex fbc
|
||||
#define tChargeAirCoefMin_offset 4092
|
||||
#define tChargeAirCoefMin_offset_hex ffc
|
||||
#define tChargeAirCoefMax_offset 4096
|
||||
#define tChargeAirCoefMax_offset_hex 1000
|
||||
#define tChargeAirFlowMax_offset 4100
|
||||
#define tChargeAirFlowMax_offset_hex 1004
|
||||
#define tChargeAirIncrLimit_offset 4104
|
||||
#define tChargeAirIncrLimit_offset_hex 1008
|
||||
#define tChargeAirDecrLimit_offset 4108
|
||||
#define tChargeAirDecrLimit_offset_hex 100c
|
||||
#define tChargeMode_offset 4112
|
||||
#define tChargeMode_offset_hex 1010
|
||||
#define unusedEnd_offset 4116
|
||||
#define unusedEnd_offset_hex 1014
|
||||
#define cltCrankingCorrBins_offset 6480
|
||||
#define cltCrankingCorrBins_offset_hex 1950
|
||||
#define cltCrankingCorr_offset 6512
|
||||
|
|
|
|||
|
|
@ -63,7 +63,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 Wed Aug 29 10:38:55 EDT 2018
|
||||
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Sep 25 15:46:46 EDT 2018
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -500,7 +500,7 @@ page = 1
|
|||
useFixedBaroCorrFromMap = bits, U32, 1484, [16:16], "false", "true"
|
||||
useSeparateAdvanceForCranking= bits, U32, 1484, [17:17], "false", "true"
|
||||
useAdvanceCorrectionsForCranking= bits, U32, 1484, [18:18], "false", "true"
|
||||
unused_1484_bit_19 = bits, U32, 1484, [19:19], "false", "true"
|
||||
useTPSAdvanceTable = bits, U32, 1484, [19:19], "false", "true"
|
||||
unused_1484_bit_20 = bits, U32, 1484, [20:20], "false", "true"
|
||||
unused_1484_bit_21 = bits, U32, 1484, [21:21], "false", "true"
|
||||
engineChartSize = scalar, U32, 1488, "count", 1, 0, 0, 300, 0
|
||||
|
|
@ -787,7 +787,15 @@ page = 1
|
|||
coastingFuelCutMap = scalar, S16, 3386, "kPa", 1, 0, 0, 250, 0
|
||||
iacCoastingBins = array, F32, 3388, [16], "C", 1, 0, -100.0, 250.0, 2
|
||||
iacCoasting = array, F32, 3452, [16], "%", 1, 0, 0.0, 100.0, 2
|
||||
;no TS info - skipping unusedEnd offset 3516
|
||||
ignitionTpsTable = array, S16, 3516, [16x16],"deg", 0.01, 0, -20, 90, 2
|
||||
ignitionTpsBins = array, F32, 4028, [16], "TPS", 1, 0.0, 0, 100.0, 2
|
||||
tChargeAirCoefMin = scalar, F32, 4092, "Min tCharge Coeff.", 1, 0, 0.0, 1.0, 4
|
||||
tChargeAirCoefMax = scalar, F32, 4096, "Max tCharge Coeff.", 1, 0, 0.0, 1.0, 4
|
||||
tChargeAirFlowMax = scalar, F32, 4100, "Max Air Flow, kg/h", 1, 0, 0.0, 1000.0, 1
|
||||
tChargeAirIncrLimit = scalar, F32, 4104, "tChange Increment Limit, deg/sec", 1, 0, 0.0, 100.0, 1
|
||||
tChargeAirDecrLimit = scalar, F32, 4108, "tChange Decrement Limit, deg/sec", 1, 0, 0.0, 100.0, 1
|
||||
tChargeMode = bits, U32, 4112, [0:0], "RPM+TPS (Default)", "Air Mass Interpolation"
|
||||
;no TS info - skipping unusedEnd offset 4116
|
||||
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
|
||||
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
|
||||
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2
|
||||
|
|
@ -1477,6 +1485,15 @@ fileVersion = { 20171101 }
|
|||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
upDownLabel = "(RICHER)", "(LEANER)"
|
||||
|
||||
table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1
|
||||
; constant, variable
|
||||
xBins = ignitionRpmBins, RPMValue
|
||||
yBins = ignitionTpsBins, TPSValue
|
||||
|
||||
zBins = ignitionTpsTable
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
upDownLabel = "(RICHER)", "(LEANER)"
|
||||
|
||||
table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1
|
||||
; constant, variable
|
||||
xBins = ignitionIatCorrRpmBins, RPMValue
|
||||
|
|
@ -1850,7 +1867,8 @@ menuDialog = main
|
|||
subMenu = dwellSettings, "Dwell time"
|
||||
subMenu = ignitionCylExtra, "Ignition Cylinder Extra"
|
||||
subMenu = std_separator
|
||||
subMenu = ignitionTableTbl, "Ignition Advance Table"
|
||||
subMenu = ignitionTableTbl, "Ignition Advance Table", 0, {useTPSAdvanceTable == 0}
|
||||
subMenu = ignitionTpsTableTbl, "Ignition Advance TPS-based Table", 0, {useTPSAdvanceTable == 1}
|
||||
subMenu = std_separator
|
||||
subMenu = cltTimingCorrCurve, "Warmup timing correction"
|
||||
subMenu = ignitionIatCorrTableTbl, "Ignition IAT correction Table"
|
||||
|
|
@ -2022,7 +2040,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
|
|||
panel = fuelTableGaugesPanel
|
||||
panel = fuelTableRight
|
||||
|
||||
dialog = tChargeSettings, "tCharge Settings"
|
||||
dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings"
|
||||
field = "We use these coefficients to approximate air/fuel charge temperate"
|
||||
field = "based on CLT and IAT, depending on RPM and TPM"
|
||||
field = "minRPM minTPS", tChargeMinRpmMinTps
|
||||
|
|
@ -2030,6 +2048,22 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
|
|||
field = "maxRPM minTPS", tChargeMaxRpmMinTps
|
||||
field = "maxRPM maxTPS", tChargeMaxRpmMaxTps
|
||||
|
||||
dialog = tChargeGeneralSettings, ""
|
||||
field = "tCharge Mode", tChargeMode
|
||||
field = "tChange Increment Limit, deg/sec", tChargeAirIncrLimit
|
||||
field = "tChange Decrement Limit, deg/sec", tChargeAirDecrLimit
|
||||
field = ""
|
||||
|
||||
dialog = tChargeAirInterpSettings, "Air Interpolation Mode Settings"
|
||||
field = "Min tCharge Coeff.", tChargeAirCoefMin
|
||||
field = "Max tCharge Coeff.", tChargeAirCoefMax
|
||||
field = "Max Air Flow, kg/h", tChargeAirFlowMax
|
||||
|
||||
dialog = tChargeSettings, "tCharge Settings"
|
||||
panel = tChargeGeneralSettings
|
||||
panel = tChargeRpmTpsSettings, { tChargeMode == 0}
|
||||
panel = tChargeAirInterpSettings, { tChargeMode == 1}
|
||||
|
||||
dialog = baseInjection, "General"
|
||||
field = "Enabled", isInjectionEnabled
|
||||
field = "Mode", injectionMode, {isInjectionEnabled == 1}
|
||||
|
|
@ -2042,6 +2076,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
|
|||
field = "#Wasted spark with individual coils"
|
||||
field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2}
|
||||
field = "Timing Mode", timingMode, {isIgnitionEnabled == 1}
|
||||
field = "Use TPS-based Advance Table", useTPSAdvanceTable, {isIgnitionEnabled == 1 && fuelAlgorithm == LM_SPEED_DENSITY}
|
||||
field = "#Use fixed timing while validating with a timing gun"
|
||||
field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.rusefi.config;
|
||||
|
||||
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Aug 14 12:37:04 EDT 2018
|
||||
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Sep 25 15:46:46 EDT 2018
|
||||
public class Fields {
|
||||
public static final int LE_COMMAND_LENGTH = 200;
|
||||
public static final int BLOCKING_FACTOR = 400;
|
||||
|
|
@ -26,6 +26,7 @@ public class Fields {
|
|||
public static final int DWELL_CURVE_SIZE = 8;
|
||||
public static final int CRANKING_CURVE_SIZE = 8;
|
||||
public static final int IGN_LOAD_COUNT = 16;
|
||||
public static final int IGN_TPS_COUNT = 16;
|
||||
public static final int IGN_RPM_COUNT = 16;
|
||||
public static final int INJECTION_PIN_COUNT = 12;
|
||||
public static final int IGNITION_PIN_COUNT = 12;
|
||||
|
|
@ -652,7 +653,7 @@ public class Fields {
|
|||
public static final int useFixedBaroCorrFromMap_offset = 1484;
|
||||
public static final int useSeparateAdvanceForCranking_offset = 1484;
|
||||
public static final int useAdvanceCorrectionsForCranking_offset = 1484;
|
||||
public static final int unused_1484_bit_19_offset = 1484;
|
||||
public static final int useTPSAdvanceTable_offset = 1484;
|
||||
public static final int unused_1484_bit_20_offset = 1484;
|
||||
public static final int unused_1484_bit_21_offset = 1484;
|
||||
public static final int engineChartSize_offset = 1488;
|
||||
|
|
@ -1036,7 +1037,20 @@ public class Fields {
|
|||
public static final int coastingFuelCutMap_offset = 3386;
|
||||
public static final int iacCoastingBins_offset = 3388;
|
||||
public static final int iacCoasting_offset = 3452;
|
||||
public static final int unusedEnd_offset = 3516;
|
||||
public static final int ignitionTpsTable_offset = 3516;
|
||||
public static final int ignitionTpsBins_offset = 4028;
|
||||
public static final int tChargeAirCoefMin_offset = 4092;
|
||||
public static final int tChargeAirCoefMax_offset = 4096;
|
||||
public static final int tChargeAirCoefMax_offset_hex = 1000;
|
||||
public static final int tChargeAirFlowMax_offset = 4100;
|
||||
public static final int tChargeAirFlowMax_offset_hex = 1004;
|
||||
public static final int tChargeAirIncrLimit_offset = 4104;
|
||||
public static final int tChargeAirIncrLimit_offset_hex = 1008;
|
||||
public static final int tChargeAirDecrLimit_offset = 4108;
|
||||
public static final int tChargeMode_offset = 4112;
|
||||
public static final int tChargeMode_offset_hex = 1010;
|
||||
public static final int unusedEnd_offset = 4116;
|
||||
public static final int unusedEnd_offset_hex = 1014;
|
||||
public static final int cltCrankingCorrBins_offset = 6480;
|
||||
public static final int cltCrankingCorrBins_offset_hex = 1950;
|
||||
public static final int cltCrankingCorr_offset = 6512;
|
||||
|
|
@ -1604,7 +1618,7 @@ public class Fields {
|
|||
public static final Field USEFIXEDBAROCORRFROMMAP = Field.create("USEFIXEDBAROCORRFROMMAP", 1484, FieldType.BIT, 16);
|
||||
public static final Field USESEPARATEADVANCEFORCRANKING = Field.create("USESEPARATEADVANCEFORCRANKING", 1484, FieldType.BIT, 17);
|
||||
public static final Field USEADVANCECORRECTIONSFORCRANKING = Field.create("USEADVANCECORRECTIONSFORCRANKING", 1484, FieldType.BIT, 18);
|
||||
public static final Field UNUSED_1484_BIT_19 = Field.create("UNUSED_1484_BIT_19", 1484, FieldType.BIT, 19);
|
||||
public static final Field USETPSADVANCETABLE = Field.create("USETPSADVANCETABLE", 1484, FieldType.BIT, 19);
|
||||
public static final Field UNUSED_1484_BIT_20 = Field.create("UNUSED_1484_BIT_20", 1484, FieldType.BIT, 20);
|
||||
public static final Field UNUSED_1484_BIT_21 = Field.create("UNUSED_1484_BIT_21", 1484, FieldType.BIT, 21);
|
||||
public static final Field ENGINECHARTSIZE = Field.create("ENGINECHARTSIZE", 1488, FieldType.INT);
|
||||
|
|
@ -1866,6 +1880,14 @@ public class Fields {
|
|||
public static final Field COASTINGFUELCUTCLT = Field.create("COASTINGFUELCUTCLT", 3382, FieldType.INT);
|
||||
public static final Field PIDEXTRAFORLOWRPM = Field.create("PIDEXTRAFORLOWRPM", 3384, FieldType.INT);
|
||||
public static final Field COASTINGFUELCUTMAP = Field.create("COASTINGFUELCUTMAP", 3386, FieldType.INT);
|
||||
public static final Field IGNITIONTPSTABLE = Field.create("IGNITIONTPSTABLE", 3516, FieldType.INT);
|
||||
public static final Field TCHARGEAIRCOEFMIN = Field.create("TCHARGEAIRCOEFMIN", 4092, FieldType.FLOAT);
|
||||
public static final Field TCHARGEAIRCOEFMAX = Field.create("TCHARGEAIRCOEFMAX", 4096, FieldType.FLOAT);
|
||||
public static final Field TCHARGEAIRFLOWMAX = Field.create("TCHARGEAIRFLOWMAX", 4100, FieldType.FLOAT);
|
||||
public static final Field TCHARGEAIRINCRLIMIT = Field.create("TCHARGEAIRINCRLIMIT", 4104, FieldType.FLOAT);
|
||||
public static final Field TCHARGEAIRDECRLIMIT = Field.create("TCHARGEAIRDECRLIMIT", 4108, FieldType.FLOAT);
|
||||
public static final String[] tChargeMode_e = {"RPM+TPS (Default)", "Air Mass Interpolation"};
|
||||
public static final Field TCHARGEMODE = Field.create("TCHARGEMODE", 4112, FieldType.INT, tChargeMode_e);
|
||||
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
|
||||
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
|
||||
public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);
|
||||
|
|
|
|||
Loading…
Reference in New Issue