opening the door to boost controller!

This commit is contained in:
rusefi 2020-01-31 14:23:15 -05:00
parent d63dae9301
commit c2f0a30397
19 changed files with 426 additions and 84 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:13:50 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Jan 31 14:19:03 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1676,7 +1676,31 @@ struct engine_configuration_s {
/**
* offset 988
*/
int unusedAtOldBoardConfigurationEnd[119];
output_pin_e boostControlPin;
/**
* offset 989
*/
pin_output_mode_e boostControlPinMode;
/**
* offset 990
*/
uint8_t unusedSpace[2];
/**
* offset 992
*/
pid_s boostPid;
/**
* offset 1012
*/
boostType_e boostType;
/**
* offset 1016
*/
int boostPwmFrequency;
/**
* offset 1020
*/
int unusedAtOldBoardConfigurationEnd[111];
/**
offset 1464 bit 0 */
bool vvtDisplayInverted : 1;
@ -1895,7 +1919,7 @@ struct engine_configuration_s {
bool useIacPidMultTable : 1;
/**
offset 1476 bit 22 */
bool unused_1484_bit_22 : 1;
bool isBoostControlEnabled : 1;
/**
offset 1476 bit 23 */
bool unused_1484_bit_23 : 1;
@ -2862,8 +2886,8 @@ struct engine_configuration_s {
/**
* offset 4140
*/
int mainUnusedEnd[565];
/** total size 6400*/
int mainUnusedEnd[527];
/** total size 6248*/
};
typedef struct engine_configuration_s engine_configuration_s;
@ -2874,6 +2898,26 @@ struct persistent_config_s {
* offset 0
*/
engine_configuration_s engineConfiguration;
/**
* offset 6248
*/
boost_table_t boostTableOpenLoop;
/**
* offset 6312
*/
uint8_t boostMapBins[BOOST_LOAD_COUNT];
/**
* offset 6320
*/
uint8_t boostRpmBins[BOOST_RPM_COUNT];
/**
* offset 6328
*/
boost_table_t boostTableClosedLoop;
/**
* offset 6392
*/
uint8_t boostTpsBins[BOOST_LOAD_COUNT];
/**
* offset 6400
*/
@ -3125,4 +3169,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:13:50 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Jan 31 14:19:03 EST 2020

View File

@ -263,8 +263,44 @@
#define biQuad_offset 2332
#define biQuad_offset_hex 91c
#define BLOCKING_FACTOR 400
#define BOOST_LOAD_COUNT 8
#define BOOST_RPM_COUNT 8
#define boostControlPin_offset 988
#define boostControlPin_offset_hex 3dc
#define boostControlPinMode_offset 989
#define boostControlPinMode_offset_hex 3dd
#define boostCutPressure_offset 2132
#define boostCutPressure_offset_hex 854
#define boostMapBins_offset 6312
#define boostMapBins_offset_hex 18a8
#define boostPid_dFactor_offset 1000
#define boostPid_dFactor_offset_hex 3e8
#define boostPid_iFactor_offset 996
#define boostPid_iFactor_offset_hex 3e4
#define boostPid_maxValue_offset 1010
#define boostPid_maxValue_offset_hex 3f2
#define boostPid_minValue_offset 1008
#define boostPid_minValue_offset_hex 3f0
#define boostPid_offset 992
#define boostPid_offset_hex 3e0
#define boostPid_offset_offset 1004
#define boostPid_offset_offset_hex 3ec
#define boostPid_periodMs_offset 1006
#define boostPid_periodMs_offset_hex 3ee
#define boostPid_pFactor_offset 992
#define boostPid_pFactor_offset_hex 3e0
#define boostPwmFrequency_offset 1016
#define boostPwmFrequency_offset_hex 3f8
#define boostRpmBins_offset 6320
#define boostRpmBins_offset_hex 18b0
#define boostTableClosedLoop_offset 6328
#define boostTableClosedLoop_offset_hex 18b8
#define boostTableOpenLoop_offset 6248
#define boostTableOpenLoop_offset_hex 1868
#define boostTpsBins_offset 6392
#define boostTpsBins_offset_hex 18f8
#define boostType_offset 1012
#define boostType_offset_hex 3f4
#define brain_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
#define brain_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
#define brakePedalPin_offset 2608
@ -449,7 +485,7 @@
#define cylinderBore_offset_hex 198
#define cylindersCount_offset 400
#define cylindersCount_offset_hex 190
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
#define debugMapAveraging_offset 807
#define debugMapAveraging_offset_hex 327
#define debugMode_offset 2092
@ -1286,6 +1322,8 @@
#define is_enabled_spi_4_offset_hex 2e8
#define isAlternatorControlEnabled_offset 1464
#define isAlternatorControlEnabled_offset_hex 5b8
#define isBoostControlEnabled_offset 1476
#define isBoostControlEnabled_offset_hex 5c4
#define isCJ125Enabled_offset 744
#define isCJ125Enabled_offset_hex 2e8
#define isCylinderCleanupEnabled_offset 1476
@ -1389,6 +1427,7 @@
#define LE_COMMAND_LENGTH 200
#define LIS302DLCsPin_offset 2043
#define LIS302DLCsPin_offset_hex 7fb
#define LOAD_1_BYTE_PACKING_MULT 2
#define logFormat_offset 496
#define logFormat_offset_hex 1f0
#define LOGIC_ANALYZER_CHANNEL_COUNT 4
@ -1828,6 +1867,7 @@
#define tps2Max_offset_hex 6ea
#define tps2Min_offset 1768
#define tps2Min_offset_hex 6e8
#define TPS_1_BYTE_PACKING_MULT 2
#define TPS_TPS_ACCEL_TABLE 8
#define tpsAccelEnrichmentThreshold_offset 2048
#define tpsAccelEnrichmentThreshold_offset_hex 800
@ -1988,8 +2028,6 @@
#define unused1059_offset_hex f7c
#define unused1234234_offset 2042
#define unused1234234_offset_hex 7fa
#define unused_1484_bit_22_offset 1476
#define unused_1484_bit_22_offset_hex 5c4
#define unused_1484_bit_23_offset 1476
#define unused_1484_bit_23_offset_hex 5c4
#define unused_1484_bit_24_offset 1476
@ -2014,8 +2052,8 @@
#define unused_offset_hex 3cc
#define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8
#define unusedAtOldBoardConfigurationEnd_offset 988
#define unusedAtOldBoardConfigurationEnd_offset_hex 3dc
#define unusedAtOldBoardConfigurationEnd_offset 1020
#define unusedAtOldBoardConfigurationEnd_offset_hex 3fc
#define unusedBit4_1476_offset 1476
#define unusedBit4_1476_offset_hex 5c4
#define unusedBit_249_10_offset 976
@ -2090,6 +2128,8 @@
#define unusedHereo_wires_offset_hex 4c
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpace_offset 990
#define unusedSpace_offset_hex 3de
#define unusedSpiPadding4_offset 2593
#define unusedSpiPadding4_offset_hex a21
#define unusedSpiPadding5_offset 2713

View File

@ -539,8 +539,8 @@ case Force_4_bytes_size_cranking_ignition_mode:
}
const char *getDebug_mode_e(debug_mode_e value){
switch(value) {
case DBG_36:
return "DBG_36";
case DBG_BOOST:
return "DBG_BOOST";
case DBG_37:
return "DBG_37";
case DBG_ALTERNATOR_PID:

View File

@ -654,7 +654,7 @@ typedef enum {
DBG_DWELL_METRIC = 33,
DBG_AUX_TEMPERATURE = 34,
DBG_ETB_LOGIC = 35,
DBG_36 = 36,
DBG_BOOST = 36,
DBG_37 = 37,
Force_4_bytes_size_debug_mode_e = ENUM_32_BITS,
@ -837,3 +837,8 @@ typedef enum {
*/
Force_4bytes_size_idle_state_e = ENUM_32_BITS,
} idle_state_e;
typedef enum {
OPEN_LOOP = 0,
CLOSED_LOOP = 1,
Force_4bytes_size_boostType_e = ENUM_32_BITS,
} boostType_e;

View File

@ -98,6 +98,7 @@ typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE];
typedef float fsio_table_8x8_f32t[FSIO_TABLE_8][FSIO_TABLE_8];
typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE];
typedef uint8_t fsio_table_8x8_u8t[FSIO_TABLE_8][FSIO_TABLE_8];
typedef uint8_t boost_table_t[BOOST_LOAD_COUNT][BOOST_RPM_COUNT];
// this is different type simply to have different hi/low range in rusefi.ini

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:54 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1676,7 +1676,31 @@ struct engine_configuration_s {
/**
* offset 988
*/
int unusedAtOldBoardConfigurationEnd[119];
output_pin_e boostControlPin;
/**
* offset 989
*/
pin_output_mode_e boostControlPinMode;
/**
* offset 990
*/
uint8_t unusedSpace[2];
/**
* offset 992
*/
pid_s boostPid;
/**
* offset 1012
*/
boostType_e boostType;
/**
* offset 1016
*/
int boostPwmFrequency;
/**
* offset 1020
*/
int unusedAtOldBoardConfigurationEnd[111];
/**
offset 1464 bit 0 */
bool vvtDisplayInverted : 1;
@ -1895,7 +1919,7 @@ struct engine_configuration_s {
bool useIacPidMultTable : 1;
/**
offset 1476 bit 22 */
bool unused_1484_bit_22 : 1;
bool isBoostControlEnabled : 1;
/**
offset 1476 bit 23 */
bool unused_1484_bit_23 : 1;
@ -2862,8 +2886,8 @@ struct engine_configuration_s {
/**
* offset 4140
*/
int mainUnusedEnd[565];
/** total size 6400*/
int mainUnusedEnd[527];
/** total size 6248*/
};
typedef struct engine_configuration_s engine_configuration_s;
@ -2874,6 +2898,26 @@ struct persistent_config_s {
* offset 0
*/
engine_configuration_s engineConfiguration;
/**
* offset 6248
*/
boost_table_t boostTableOpenLoop;
/**
* offset 6312
*/
uint8_t boostMapBins[BOOST_LOAD_COUNT];
/**
* offset 6320
*/
uint8_t boostRpmBins[BOOST_RPM_COUNT];
/**
* offset 6328
*/
boost_table_t boostTableClosedLoop;
/**
* offset 6392
*/
uint8_t boostTpsBins[BOOST_LOAD_COUNT];
/**
* offset 6400
*/
@ -3125,4 +3169,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:54 EST 2020

View File

@ -1,26 +1,28 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 11 20:00:32 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:07:20 EST 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,
FSIO_SETTING_FANOFFTEMPERATURE = 1001,
FSIO_SETTING_ALTERNATORCONTROL_OFFSET = 1002,
FSIO_SETTING_ALTERNATORCONTROL_MINVALUE = 1003,
FSIO_SETTING_ETB_OFFSET = 1004,
FSIO_SETTING_ETB_MINVALUE = 1005,
FSIO_SETTING_IDLERPMPID_OFFSET = 1006,
FSIO_SETTING_IDLERPMPID_MINVALUE = 1007,
FSIO_SETTING_STARTUPFUELPUMPDURATION = 1008,
FSIO_SETTING_FUELCLOSEDLOOPPID_OFFSET = 1009,
FSIO_SETTING_FUELCLOSEDLOOPPID_MINVALUE = 1010,
FSIO_SETTING_AUXPID1_OFFSET = 1011,
FSIO_SETTING_AUXPID1_MINVALUE = 1012,
FSIO_SETTING_AUXPID2_OFFSET = 1013,
FSIO_SETTING_AUXPID2_MINVALUE = 1014,
FSIO_SETTING_AUXPID3_OFFSET = 1015,
FSIO_SETTING_AUXPID3_MINVALUE = 1016,
FSIO_SETTING_AUXPID4_OFFSET = 1017,
FSIO_SETTING_AUXPID4_MINVALUE = 1018,
FSIO_SETTING_IDLETIMINGPID_OFFSET = 1019,
FSIO_SETTING_IDLETIMINGPID_MINVALUE = 1020,
FSIO_SETTING_IDLERPMPID2_OFFSET = 1021,
FSIO_SETTING_IDLERPMPID2_MINVALUE = 1022,
FSIO_SETTING_BOOSTPID_OFFSET = 1002,
FSIO_SETTING_BOOSTPID_MINVALUE = 1003,
FSIO_SETTING_ALTERNATORCONTROL_OFFSET = 1004,
FSIO_SETTING_ALTERNATORCONTROL_MINVALUE = 1005,
FSIO_SETTING_ETB_OFFSET = 1006,
FSIO_SETTING_ETB_MINVALUE = 1007,
FSIO_SETTING_IDLERPMPID_OFFSET = 1008,
FSIO_SETTING_IDLERPMPID_MINVALUE = 1009,
FSIO_SETTING_STARTUPFUELPUMPDURATION = 1010,
FSIO_SETTING_FUELCLOSEDLOOPPID_OFFSET = 1011,
FSIO_SETTING_FUELCLOSEDLOOPPID_MINVALUE = 1012,
FSIO_SETTING_AUXPID1_OFFSET = 1013,
FSIO_SETTING_AUXPID1_MINVALUE = 1014,
FSIO_SETTING_AUXPID2_OFFSET = 1015,
FSIO_SETTING_AUXPID2_MINVALUE = 1016,
FSIO_SETTING_AUXPID3_OFFSET = 1017,
FSIO_SETTING_AUXPID3_MINVALUE = 1018,
FSIO_SETTING_AUXPID4_OFFSET = 1019,
FSIO_SETTING_AUXPID4_MINVALUE = 1020,
FSIO_SETTING_IDLETIMINGPID_OFFSET = 1021,
FSIO_SETTING_IDLETIMINGPID_MINVALUE = 1022,
FSIO_SETTING_IDLERPMPID2_OFFSET = 1023,
FSIO_SETTING_IDLERPMPID2_MINVALUE = 1024,

View File

@ -1,10 +1,14 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 11 20:00:32 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:07:20 EST 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:
return engineConfiguration->fanOnTemperature;
case FSIO_SETTING_FANOFFTEMPERATURE:
return engineConfiguration->fanOffTemperature;
case FSIO_SETTING_BOOSTPID_OFFSET:
return engineConfiguration->boostPid.offset;
case FSIO_SETTING_BOOSTPID_MINVALUE:
return engineConfiguration->boostPid.minValue;
case FSIO_SETTING_ALTERNATORCONTROL_OFFSET:
return engineConfiguration->alternatorControl.offset;
case FSIO_SETTING_ALTERNATORCONTROL_MINVALUE:

View File

@ -1,8 +1,10 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 11 20:00:32 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:07:20 EST 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
static LENameOrdinalPair lefanOffTemperature(FSIO_SETTING_FANOFFTEMPERATURE, "cfg_fanOffTemperature");
static LENameOrdinalPair leboostPid_offset(FSIO_SETTING_BOOSTPID_OFFSET, "cfg_boostPid_offset");
static LENameOrdinalPair leboostPid_minValue(FSIO_SETTING_BOOSTPID_MINVALUE, "cfg_boostPid_minValue");
static LENameOrdinalPair lealternatorControl_offset(FSIO_SETTING_ALTERNATORCONTROL_OFFSET, "cfg_alternatorControl_offset");
static LENameOrdinalPair lealternatorControl_minValue(FSIO_SETTING_ALTERNATORCONTROL_MINVALUE, "cfg_alternatorControl_minValue");
static LENameOrdinalPair leetb_offset(FSIO_SETTING_ETB_OFFSET, "cfg_etb_offset");

View File

@ -1,10 +1,14 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Sep 11 20:00:32 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:07:20 EST 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:
return "cfg_fanOnTemperature";
case FSIO_SETTING_FANOFFTEMPERATURE:
return "cfg_fanOffTemperature";
case FSIO_SETTING_BOOSTPID_OFFSET:
return "cfg_boostPid_offset";
case FSIO_SETTING_BOOSTPID_MINVALUE:
return "cfg_boostPid_minValue";
case FSIO_SETTING_ALTERNATORCONTROL_OFFSET:
return "cfg_alternatorControl_offset";
case FSIO_SETTING_ALTERNATORCONTROL_MINVALUE:

View File

@ -263,8 +263,44 @@
#define biQuad_offset 2332
#define biQuad_offset_hex 91c
#define BLOCKING_FACTOR 400
#define BOOST_LOAD_COUNT 8
#define BOOST_RPM_COUNT 8
#define boostControlPin_offset 988
#define boostControlPin_offset_hex 3dc
#define boostControlPinMode_offset 989
#define boostControlPinMode_offset_hex 3dd
#define boostCutPressure_offset 2132
#define boostCutPressure_offset_hex 854
#define boostMapBins_offset 6312
#define boostMapBins_offset_hex 18a8
#define boostPid_dFactor_offset 1000
#define boostPid_dFactor_offset_hex 3e8
#define boostPid_iFactor_offset 996
#define boostPid_iFactor_offset_hex 3e4
#define boostPid_maxValue_offset 1010
#define boostPid_maxValue_offset_hex 3f2
#define boostPid_minValue_offset 1008
#define boostPid_minValue_offset_hex 3f0
#define boostPid_offset 992
#define boostPid_offset_hex 3e0
#define boostPid_offset_offset 1004
#define boostPid_offset_offset_hex 3ec
#define boostPid_periodMs_offset 1006
#define boostPid_periodMs_offset_hex 3ee
#define boostPid_pFactor_offset 992
#define boostPid_pFactor_offset_hex 3e0
#define boostPwmFrequency_offset 1016
#define boostPwmFrequency_offset_hex 3f8
#define boostRpmBins_offset 6320
#define boostRpmBins_offset_hex 18b0
#define boostTableClosedLoop_offset 6328
#define boostTableClosedLoop_offset_hex 18b8
#define boostTableOpenLoop_offset 6248
#define boostTableOpenLoop_offset_hex 1868
#define boostTpsBins_offset 6392
#define boostTpsBins_offset_hex 18f8
#define boostType_offset 1012
#define boostType_offset_hex 3f4
#define brain_input_pin_e_enum "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "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", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "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", "INVALID", "INVALID", "INVALID"
#define brain_pin_e_enum "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
#define brakePedalPin_offset 2608
@ -449,7 +485,7 @@
#define cylinderBore_offset_hex 198
#define cylindersCount_offset 400
#define cylindersCount_offset_hex 190
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
#define debugMapAveraging_offset 807
#define debugMapAveraging_offset_hex 327
#define debugMode_offset 2092
@ -1286,6 +1322,8 @@
#define is_enabled_spi_4_offset_hex 2e8
#define isAlternatorControlEnabled_offset 1464
#define isAlternatorControlEnabled_offset_hex 5b8
#define isBoostControlEnabled_offset 1476
#define isBoostControlEnabled_offset_hex 5c4
#define isCJ125Enabled_offset 744
#define isCJ125Enabled_offset_hex 2e8
#define isCylinderCleanupEnabled_offset 1476
@ -1389,6 +1427,7 @@
#define LE_COMMAND_LENGTH 200
#define LIS302DLCsPin_offset 2043
#define LIS302DLCsPin_offset_hex 7fb
#define LOAD_1_BYTE_PACKING_MULT 2
#define logFormat_offset 496
#define logFormat_offset_hex 1f0
#define LOGIC_ANALYZER_CHANNEL_COUNT 4
@ -1828,6 +1867,7 @@
#define tps2Max_offset_hex 6ea
#define tps2Min_offset 1768
#define tps2Min_offset_hex 6e8
#define TPS_1_BYTE_PACKING_MULT 2
#define TPS_TPS_ACCEL_TABLE 8
#define tpsAccelEnrichmentThreshold_offset 2048
#define tpsAccelEnrichmentThreshold_offset_hex 800
@ -1988,8 +2028,6 @@
#define unused1059_offset_hex f7c
#define unused1234234_offset 2042
#define unused1234234_offset_hex 7fa
#define unused_1484_bit_22_offset 1476
#define unused_1484_bit_22_offset_hex 5c4
#define unused_1484_bit_23_offset 1476
#define unused_1484_bit_23_offset_hex 5c4
#define unused_1484_bit_24_offset 1476
@ -2014,8 +2052,8 @@
#define unused_offset_hex 3cc
#define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8
#define unusedAtOldBoardConfigurationEnd_offset 988
#define unusedAtOldBoardConfigurationEnd_offset_hex 3dc
#define unusedAtOldBoardConfigurationEnd_offset 1020
#define unusedAtOldBoardConfigurationEnd_offset_hex 3fc
#define unusedBit4_1476_offset 1476
#define unusedBit4_1476_offset_hex 5c4
#define unusedBit_249_10_offset 976
@ -2090,6 +2128,8 @@
#define unusedHereo_wires_offset_hex 4c
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpace_offset 990
#define unusedSpace_offset_hex 3de
#define unusedSpiPadding4_offset 2593
#define unusedSpiPadding4_offset_hex a21
#define unusedSpiPadding5_offset 2713

View File

@ -117,6 +117,8 @@ struct_no_prefix engine_configuration_s
#define FUEL_RPM_COUNT 16
#define FUEL_LOAD_COUNT 16
#define BOOST_RPM_COUNT 8
#define BOOST_LOAD_COUNT 8
#define PEDAL_TO_TPS_SIZE 8
@ -136,7 +138,8 @@ struct_no_prefix engine_configuration_s
#define PACK_MULT_AFR 1000
#define PACK_MULT_ANGLE 50
#define PACK_MULT_VOLTAGE 1000
#define TPS_1_BYTE_PACKING_MULT 2
#define LOAD_1_BYTE_PACKING_MULT 2
#define FSIO_TABLE_8 8
#define FSIO_CURVE_8 8
@ -168,7 +171,7 @@ custom angle_table_t 4*@@IGN_RPM_COUNT@@x@@IGN_LOAD_COUNT@@ array, F32, @OFF
custom pedal_to_tps_t @@PEDAL_TO_TPS_SIZE@@x@@PEDAL_TO_TPS_SIZE@@ array, U08, @OFFSET@, [@@PEDAL_TO_TPS_SIZE@@x@@PEDAL_TO_TPS_SIZE@@],"deg", 1, 0, -720, 720, 2
custom iac_pid_mult_t @@IAC_PID_MULT_SIZE@@x@@IAC_PID_MULT_SIZE@@ array, U08, @OFFSET@, [@@IAC_PID_MULT_SIZE@@x@@IAC_PID_MULT_SIZE@@],"%", 1, 0, 0, 999, 2
custom boost_table_t @@BOOST_RPM_COUNT@@x@@BOOST_LOAD_COUNT@@ array, U08, @OFFSET@, [@@BOOST_RPM_COUNT@@x@@BOOST_LOAD_COUNT@@],"", @@LOAD_1_BYTE_PACKING_MULT@@, 0 , 0, 3000, 0
struct pid_s
float pFactor;;"", 1, 0, -10000, 10000, 4
float iFactor;;"", 1, 0, -10000, 10000, 4
@ -184,7 +187,7 @@ float baseFuel;+Base duration of the fuel injection during cranking, this is mod
int16_t rpm;+This sets the RPM limit below which the ECU will use cranking fuel and ignition logic, typically this is around 350-450rpm. \nset cranking_rpm X;"RPM", 1, 0, 0, 3000, 0
end_struct
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:7], @@debug_mode_e_enum@@
#define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
@ -737,8 +740,18 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
bit todoClutchUpPinInverted
bit todoClutchDownPinInverted
etb_io[ETB_COUNT iterate] etbIo
! our strategy is to get rid of "boardConfiguration" and make everything just "engineConfiguration". Please do not add new fields into legacy "bc" area.
int[119] unusedAtOldBoardConfigurationEnd;
output_pin_e boostControlPin;
pin_output_mode_e boostControlPinMode;
uint8_t[2] unusedSpace;
pid_s boostPid;
custom boostType_e 4 bits, U32, @OFFSET@, [0:0], "Open Loop", "Closed Loop"
boostType_e boostType;
int boostPwmFrequency;;"Hz", 1, 0, 0, 3000.0, 0
int[111] unusedAtOldBoardConfigurationEnd;
bit vvtDisplayInverted
bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.
@ -804,7 +817,7 @@ bit useAdvanceCorrectionsForCranking;+This enables the various ignition correcti
bit useTPSAdvanceTable;+This flag allows to use TPS for ignition lookup while in Speed Density Fuel Mode
bit etbCalibrationOnStart
bit useIacPidMultTable;+This flag allows to use a special 'PID Multiplier' table (0.0-1.0) to compensate for nonlinear nature of IAC-RPM controller
bit unused_1484_bit_22
bit isBoostControlEnabled;
bit unused_1484_bit_23
bit unused_1484_bit_24
bit unused_1484_bit_25
@ -1117,13 +1130,20 @@ uint8_t[4] unusuedsw;
uint8_t[IAC_PID_MULT_SIZE] iacPidMultLoadBins;;"Load", 1, 0.0, 0, 500.0, 2
uint8_t[IAC_PID_MULT_SIZE] iacPidMultRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0
int[565] mainUnusedEnd;
int[527] mainUnusedEnd;
! end of engine_configuration_s
end_struct
engine_configuration_s engineConfiguration;
boost_table_t boostTableOpenLoop;
uint8_t[BOOST_LOAD_COUNT] boostMapBins;;"", @@LOAD_1_BYTE_PACKING_MULT@@, 0, 0, 600.0, 1
uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0
boost_table_t boostTableClosedLoop;
uint8_t[BOOST_LOAD_COUNT] boostTpsBins;;"%", @@TPS_1_BYTE_PACKING_MULT@@, 0.0, 0, 100.0, 2
pedal_to_tps_t pedalToTpsTable;
uint8_t[PEDAL_TO_TPS_SIZE] pedalToTpsPedalBins;;"%", 1, 0, 0.0, 120.0, 0
! it's not serious to use one byte for RPM but let me try that just to try it

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 Tue Jan 14 22:57:51 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:54 EST 2020
pageSize = 20000
page = 1
@ -572,7 +572,19 @@ page = 1
etbIo2_directionPin2 = bits, U08, 985, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPin1 = bits, U08, 986, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPinMode = bits, U08, 987, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 988
boostControlPin = bits, U08, 988, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
boostControlPinMode = bits, U08, 989, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedSpace offset 990
boostPid_pFactor = scalar, F32, 992, "", 1, 0, -10000, 10000, 4
boostPid_iFactor = scalar, F32, 996, "", 1, 0, -10000, 10000, 4
boostPid_dFactor = scalar, F32, 1000, "", 1, 0, -10000, 10000, 4
boostPid_offset = scalar, S16, 1004, "", 1, 0, -1000, 1000, 0
boostPid_periodMs = scalar, S16, 1006, "ms", 1, 0, 0, 3000, 0
boostPid_minValue = scalar, S16, 1008, "", 1, 0, -30000, 30000.0, 0
boostPid_maxValue = scalar, S16, 1010, "", 1, 0, -30000, 30000.0, 0
boostType = bits, U32, 1012, [0:0], "Open Loop", "Closed Loop"
boostPwmFrequency = scalar, S32, 1016, "Hz", 1, 0, 0, 3000.0, 0
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1020
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -632,7 +644,7 @@ page = 1
useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true"
etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true"
useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true"
unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true"
isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true"
unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true"
unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true"
unused_1484_bit_25 = bits, U32, 1476, [25:25], "false", "true"
@ -750,7 +762,7 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
@ -984,6 +996,11 @@ page = 1
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

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 Tue Jan 14 22:57:57 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:58 EST 2020
pageSize = 20000
page = 1
@ -572,7 +572,19 @@ page = 1
etbIo2_directionPin2 = bits, U08, 985, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPin1 = bits, U08, 986, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPinMode = bits, U08, 987, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 988
boostControlPin = bits, U08, 988, [0:7], "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","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
boostControlPinMode = bits, U08, 989, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedSpace offset 990
boostPid_pFactor = scalar, F32, 992, "", 1, 0, -10000, 10000, 4
boostPid_iFactor = scalar, F32, 996, "", 1, 0, -10000, 10000, 4
boostPid_dFactor = scalar, F32, 1000, "", 1, 0, -10000, 10000, 4
boostPid_offset = scalar, S16, 1004, "", 1, 0, -1000, 1000, 0
boostPid_periodMs = scalar, S16, 1006, "ms", 1, 0, 0, 3000, 0
boostPid_minValue = scalar, S16, 1008, "", 1, 0, -30000, 30000.0, 0
boostPid_maxValue = scalar, S16, 1010, "", 1, 0, -30000, 30000.0, 0
boostType = bits, U32, 1012, [0:0], "Open Loop", "Closed Loop"
boostPwmFrequency = scalar, S32, 1016, "Hz", 1, 0, 0, 3000.0, 0
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1020
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -632,7 +644,7 @@ page = 1
useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true"
etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true"
useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true"
unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true"
isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true"
unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true"
unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true"
unused_1484_bit_25 = bits, U32, 1476, [25:25], "false", "true"
@ -750,7 +762,7 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
@ -984,6 +996,11 @@ page = 1
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

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 Sun Jan 12 05:13:50 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Jan 31 14:19:03 EST 2020
pageSize = 20000
page = 1
@ -572,7 +572,19 @@ page = 1
etbIo2_directionPin2 = bits, U08, 985, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
etbIo2_controlPin1 = bits, U08, 986, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
etbIo2_controlPinMode = bits, U08, 987, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 988
boostControlPin = bits, U08, 988, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
boostControlPinMode = bits, U08, 989, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedSpace offset 990
boostPid_pFactor = scalar, F32, 992, "", 1, 0, -10000, 10000, 4
boostPid_iFactor = scalar, F32, 996, "", 1, 0, -10000, 10000, 4
boostPid_dFactor = scalar, F32, 1000, "", 1, 0, -10000, 10000, 4
boostPid_offset = scalar, S16, 1004, "", 1, 0, -1000, 1000, 0
boostPid_periodMs = scalar, S16, 1006, "ms", 1, 0, 0, 3000, 0
boostPid_minValue = scalar, S16, 1008, "", 1, 0, -30000, 30000.0, 0
boostPid_maxValue = scalar, S16, 1010, "", 1, 0, -30000, 30000.0, 0
boostType = bits, U32, 1012, [0:0], "Open Loop", "Closed Loop"
boostPwmFrequency = scalar, S32, 1016, "Hz", 1, 0, 0, 3000.0, 0
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1020
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -632,7 +644,7 @@ page = 1
useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true"
etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true"
useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true"
unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true"
isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true"
unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true"
unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true"
unused_1484_bit_25 = bits, U32, 1476, [25:25], "false", "true"
@ -750,7 +762,7 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
@ -984,6 +996,11 @@ page = 1
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
@ -1356,7 +1373,7 @@ fileVersion = { 20191221 }
tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
; Ignition
ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0
sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0

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 Tue Jan 14 22:57:54 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:56 EST 2020
pageSize = 20000
page = 1
@ -572,7 +572,19 @@ page = 1
etbIo2_directionPin2 = bits, U08, 985, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPin1 = bits, U08, 986, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPinMode = bits, U08, 987, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 988
boostControlPin = bits, U08, 988, [0:7], "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","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID"
boostControlPinMode = bits, U08, 989, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedSpace offset 990
boostPid_pFactor = scalar, F32, 992, "", 1, 0, -10000, 10000, 4
boostPid_iFactor = scalar, F32, 996, "", 1, 0, -10000, 10000, 4
boostPid_dFactor = scalar, F32, 1000, "", 1, 0, -10000, 10000, 4
boostPid_offset = scalar, S16, 1004, "", 1, 0, -1000, 1000, 0
boostPid_periodMs = scalar, S16, 1006, "ms", 1, 0, 0, 3000, 0
boostPid_minValue = scalar, S16, 1008, "", 1, 0, -30000, 30000.0, 0
boostPid_maxValue = scalar, S16, 1010, "", 1, 0, -30000, 30000.0, 0
boostType = bits, U32, 1012, [0:0], "Open Loop", "Closed Loop"
boostPwmFrequency = scalar, S32, 1016, "Hz", 1, 0, 0, 3000.0, 0
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1020
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -632,7 +644,7 @@ page = 1
useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true"
etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true"
useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true"
unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true"
isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true"
unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true"
unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true"
unused_1484_bit_25 = bits, U32, 1476, [25:25], "false", "true"
@ -750,7 +762,7 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
@ -984,6 +996,11 @@ page = 1
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

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 Tue Jan 14 22:57:59 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:19:01 EST 2020
pageSize = 20000
page = 1
@ -572,7 +572,19 @@ page = 1
etbIo2_directionPin2 = bits, U08, 985, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPin1 = bits, U08, 986, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
etbIo2_controlPinMode = bits, U08, 987, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 988
boostControlPin = bits, U08, 988, [0:7], "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","Injector 3Z","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","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","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","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"
boostControlPinMode = bits, U08, 989, [0:7], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unusedSpace offset 990
boostPid_pFactor = scalar, F32, 992, "", 1, 0, -10000, 10000, 4
boostPid_iFactor = scalar, F32, 996, "", 1, 0, -10000, 10000, 4
boostPid_dFactor = scalar, F32, 1000, "", 1, 0, -10000, 10000, 4
boostPid_offset = scalar, S16, 1004, "", 1, 0, -1000, 1000, 0
boostPid_periodMs = scalar, S16, 1006, "ms", 1, 0, 0, 3000, 0
boostPid_minValue = scalar, S16, 1008, "", 1, 0, -30000, 30000.0, 0
boostPid_maxValue = scalar, S16, 1010, "", 1, 0, -30000, 30000.0, 0
boostType = bits, U32, 1012, [0:0], "Open Loop", "Closed Loop"
boostPwmFrequency = scalar, S32, 1016, "Hz", 1, 0, 0, 3000.0, 0
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1020
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -632,7 +644,7 @@ page = 1
useTPSAdvanceTable = bits, U32, 1476, [19:19], "false", "true"
etbCalibrationOnStart = bits, U32, 1476, [20:20], "false", "true"
useIacPidMultTable = bits, U32, 1476, [21:21], "false", "true"
unused_1484_bit_22 = bits, U32, 1476, [22:22], "false", "true"
isBoostControlEnabled = bits, U32, 1476, [22:22], "false", "true"
unused_1484_bit_23 = bits, U32, 1476, [23:23], "false", "true"
unused_1484_bit_24 = bits, U32, 1476, [24:24], "false", "true"
unused_1484_bit_25 = bits, U32, 1476, [25:25], "false", "true"
@ -750,7 +762,7 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
@ -984,6 +996,11 @@ page = 1
iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2
iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0
;no TS info - skipping mainUnusedEnd offset 4140
boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0
boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0

View File

@ -158,6 +158,8 @@ typedef Map3D<IGN_RPM_COUNT, IGN_TPS_COUNT, int16_t, float> ign_tps_Map3D_t;
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float, float> fuel_Map3D_t;
typedef Map3D<BARO_CORR_SIZE, BARO_CORR_SIZE, float, float> baroCorr_Map3D_t;
typedef Map3D<PEDAL_TO_TPS_SIZE, PEDAL_TO_TPS_SIZE, uint8_t, uint8_t> pedal2tps_t;
typedef Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t> boostOpenLoop_Map3D_t;
typedef Map3D<BOOST_RPM_COUNT, BOOST_LOAD_COUNT, uint8_t, uint8_t> boostClosedLoop_Map3D_t;
typedef Map3D<IAC_PID_MULT_SIZE, IAC_PID_MULT_SIZE, uint8_t, uint8_t> iacPidMultiplier_t;
void setRpmBin(float array[], int size, float idleRpm, float topRpm);

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 Sun Jan 12 05:13:41 EST 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jan 31 14:18:54 EST 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -166,8 +166,28 @@ public class Fields {
public static final int biQuad_b2_offset = 2348;
public static final int biQuad_offset = 2332;
public static final int BLOCKING_FACTOR = 400;
public static final int BOOST_LOAD_COUNT = 8;
public static final int BOOST_RPM_COUNT = 8;
public static final int boostControlPin_offset = 988;
public static final int boostControlPinMode_offset = 989;
public static final int boostCutPressure_offset = 2132;
public static final int boostCutPressure_offset_hex = 854;
public static final int boostMapBins_offset = 6312;
public static final int boostPid_dFactor_offset = 1000;
public static final int boostPid_iFactor_offset = 996;
public static final int boostPid_maxValue_offset = 1010;
public static final int boostPid_minValue_offset = 1008;
public static final int boostPid_offset = 992;
public static final int boostPid_offset_offset = 1004;
public static final int boostPid_periodMs_offset = 1006;
public static final int boostPid_pFactor_offset = 992;
public static final int boostPwmFrequency_offset = 1016;
public static final int boostRpmBins_offset = 6320;
public static final int boostTableClosedLoop_offset = 6328;
public static final int boostTableOpenLoop_offset = 6248;
public static final int boostTableOpenLoop_offset_hex = 1868;
public static final int boostTpsBins_offset = 6392;
public static final int boostType_offset = 1012;
public static final int brakePedalPin_offset = 2608;
public static final int brakePedalPinMode_offset = 2611;
public static final int byFirmwareVersion_offset = 500;
@ -860,6 +880,7 @@ public class Fields {
public static final int is_enabled_spi_3_offset = 744;
public static final int is_enabled_spi_4_offset = 744;
public static final int isAlternatorControlEnabled_offset = 1464;
public static final int isBoostControlEnabled_offset = 1476;
public static final int isCJ125Enabled_offset = 744;
public static final int isCylinderCleanupEnabled_offset = 1476;
public static final int isEngineChartEnabled_offset = 1464;
@ -919,6 +940,7 @@ public class Fields {
public static final int LDS_TRIGGER_STATE_STATE_INDEX = 11;
public static final int LE_COMMAND_LENGTH = 200;
public static final int LIS302DLCsPin_offset = 2043;
public static final int LOAD_1_BYTE_PACKING_MULT = 2;
public static final int logFormat_offset = 496;
public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4;
public static final int logicAnalyzerMode_offset = 756;
@ -1200,6 +1222,7 @@ public class Fields {
public static final int tps2_2AdcChannel_offset = 682;
public static final int tps2Max_offset = 1770;
public static final int tps2Min_offset = 1768;
public static final int TPS_1_BYTE_PACKING_MULT = 2;
public static final int TPS_TPS_ACCEL_TABLE = 8;
public static final int tpsAccelEnrichmentThreshold_offset = 2048;
public static final int tpsAccelEnrichmentThreshold_offset_hex = 800;
@ -1319,7 +1342,6 @@ public class Fields {
public static final int unrealisticRpmThreashold_offset = 760;
public static final int unused1059_offset = 3964;
public static final int unused1234234_offset = 2042;
public static final int unused_1484_bit_22_offset = 1476;
public static final int unused_1484_bit_23_offset = 1476;
public static final int unused_1484_bit_24_offset = 1476;
public static final int unused_1484_bit_25_offset = 1476;
@ -1333,7 +1355,7 @@ public class Fields {
public static final int unused_former_warmup_target_afr_offset_hex = 830;
public static final int unused_offset = 972;
public static final int unusedAnotherOne_offset = 744;
public static final int unusedAtOldBoardConfigurationEnd_offset = 988;
public static final int unusedAtOldBoardConfigurationEnd_offset = 1020;
public static final int unusedBit4_1476_offset = 1476;
public static final int unusedBit_249_10_offset = 976;
public static final int unusedBit_249_11_offset = 976;
@ -1371,6 +1393,7 @@ public class Fields {
public static final int unusedFormerWarmupAfrPid_offset = 1772;
public static final int unusedHereo_wires_offset = 76;
public static final int unusedOldWarmupAfr_offset = 744;
public static final int unusedSpace_offset = 990;
public static final int unusedSpiPadding4_offset = 2593;
public static final int unusedSpiPadding5_offset = 2713;
public static final int unusedSpiPadding7_offset = 4005;
@ -1919,6 +1942,17 @@ public class Fields {
public static final Field ETBIO2_DIRECTIONPIN2 = Field.create("ETBIO2_DIRECTIONPIN2", 985, FieldType.INT8, brain_pin_e);
public static final Field ETBIO2_CONTROLPIN1 = Field.create("ETBIO2_CONTROLPIN1", 986, FieldType.INT8, brain_pin_e);
public static final Field ETBIO2_CONTROLPINMODE = Field.create("ETBIO2_CONTROLPINMODE", 987, FieldType.INT8, pin_output_mode_e);
public static final Field BOOSTCONTROLPIN = Field.create("BOOSTCONTROLPIN", 988, FieldType.INT8, output_pin_e);
public static final Field BOOSTCONTROLPINMODE = Field.create("BOOSTCONTROLPINMODE", 989, FieldType.INT8, pin_output_mode_e);
public static final Field BOOSTPID_PFACTOR = Field.create("BOOSTPID_PFACTOR", 992, FieldType.FLOAT);
public static final Field BOOSTPID_IFACTOR = Field.create("BOOSTPID_IFACTOR", 996, FieldType.FLOAT);
public static final Field BOOSTPID_DFACTOR = Field.create("BOOSTPID_DFACTOR", 1000, FieldType.FLOAT);
public static final Field BOOSTPID_OFFSET = Field.create("BOOSTPID_OFFSET", 1004, FieldType.INT16);
public static final Field BOOSTPID_PERIODMS = Field.create("BOOSTPID_PERIODMS", 1006, FieldType.INT16);
public static final Field BOOSTPID_MINVALUE = Field.create("BOOSTPID_MINVALUE", 1008, FieldType.INT16);
public static final Field BOOSTPID_MAXVALUE = Field.create("BOOSTPID_MAXVALUE", 1010, FieldType.INT16);
public static final Field BOOSTTYPE = Field.create("BOOSTTYPE", 1012, FieldType.INT);
public static final Field BOOSTPWMFREQUENCY = Field.create("BOOSTPWMFREQUENCY", 1016, FieldType.INT);
public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0);
public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1);
public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2);
@ -1978,7 +2012,7 @@ public class Fields {
public static final Field USETPSADVANCETABLE = Field.create("USETPSADVANCETABLE", 1476, FieldType.BIT, 19);
public static final Field ETBCALIBRATIONONSTART = Field.create("ETBCALIBRATIONONSTART", 1476, FieldType.BIT, 20);
public static final Field USEIACPIDMULTTABLE = Field.create("USEIACPIDMULTTABLE", 1476, FieldType.BIT, 21);
public static final Field UNUSED_1484_BIT_22 = Field.create("UNUSED_1484_BIT_22", 1476, FieldType.BIT, 22);
public static final Field ISBOOSTCONTROLENABLED = Field.create("ISBOOSTCONTROLENABLED", 1476, FieldType.BIT, 22);
public static final Field UNUSED_1484_BIT_23 = Field.create("UNUSED_1484_BIT_23", 1476, FieldType.BIT, 23);
public static final Field UNUSED_1484_BIT_24 = Field.create("UNUSED_1484_BIT_24", 1476, FieldType.BIT, 24);
public static final Field UNUSED_1484_BIT_25 = Field.create("UNUSED_1484_BIT_25", 1476, FieldType.BIT, 25);
@ -2087,7 +2121,7 @@ public class Fields {
public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2080, FieldType.FLOAT);
public static final Field TPSDECELENLEANMENTMULTIPLIER = Field.create("TPSDECELENLEANMENTMULTIPLIER", 2084, FieldType.FLOAT);
public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2088, FieldType.FLOAT);
public static final String[] debug_mode_e = {"Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"};
public static final String[] debug_mode_e = {"Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic", "Boost Control"};
public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2092, FieldType.INT, debug_mode_e);
public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2132, FieldType.FLOAT);
public static final Field FSIOADC1 = Field.create("FSIOADC1", 2200, FieldType.INT8, adc_channel_e);
@ -2291,6 +2325,8 @@ public class Fields {
public static final Field IDLERPMPID2_MINVALUE = Field.create("IDLERPMPID2_MINVALUE", 4056, FieldType.INT16);
public static final Field IDLERPMPID2_MAXVALUE = Field.create("IDLERPMPID2_MAXVALUE", 4058, FieldType.INT16);
public static final Field IACPIDMULTTABLE = Field.create("IACPIDMULTTABLE", 4060, FieldType.INT);
public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6248, FieldType.INT);
public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6328, FieldType.INT);
public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6400, FieldType.INT);
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
@ -2789,6 +2825,17 @@ public class Fields {
ETBIO2_DIRECTIONPIN2,
ETBIO2_CONTROLPIN1,
ETBIO2_CONTROLPINMODE,
BOOSTCONTROLPIN,
BOOSTCONTROLPINMODE,
BOOSTPID_PFACTOR,
BOOSTPID_IFACTOR,
BOOSTPID_DFACTOR,
BOOSTPID_OFFSET,
BOOSTPID_PERIODMS,
BOOSTPID_MINVALUE,
BOOSTPID_MAXVALUE,
BOOSTTYPE,
BOOSTPWMFREQUENCY,
VVTDISPLAYINVERTED,
FUELCLOSEDLOOPCORRECTIONENABLED,
ISVERBOSEIAC,
@ -2848,7 +2895,7 @@ public class Fields {
USETPSADVANCETABLE,
ETBCALIBRATIONONSTART,
USEIACPIDMULTTABLE,
UNUSED_1484_BIT_22,
ISBOOSTCONTROLENABLED,
UNUSED_1484_BIT_23,
UNUSED_1484_BIT_24,
UNUSED_1484_BIT_25,
@ -3156,6 +3203,8 @@ public class Fields {
IDLERPMPID2_MINVALUE,
IDLERPMPID2_MAXVALUE,
IACPIDMULTTABLE,
BOOSTTABLEOPENLOOP,
BOOSTTABLECLOSEDLOOP,
PEDALTOTPSTABLE,
FSIOFORMULAS1,
FSIOFORMULAS2,