diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 6b01f5ac50..2720dbed5e 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:49 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4001,8 +4001,17 @@ struct engine_configuration_s { units * offset 4620 */ - int mainUnusedEnd[423]; - /** total size 6312*/ + int mainUnusedEnd[100]; + /** total size 5020*/ +}; + +// start of cyl_trim_s +struct cyl_trim_s { + /** + * offset 0 + */ + scaled_channel table[TRIM_SIZE][TRIM_SIZE]; + /** total size 16*/ }; // start of persistent_config_s @@ -4012,152 +4021,152 @@ struct persistent_config_s { */ engine_configuration_s engineConfiguration; /** - * offset 6312 + * offset 5020 */ error_message_t warning_message; /** C - * offset 6432 + * offset 5140 */ float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE]; /** Seconds - * offset 6464 + * offset 5172 */ float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE]; /** % - * offset 6496 + * offset 5204 */ float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE]; /** Seconds - * offset 6528 + * offset 5236 */ float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE]; /** - * offset 6560 + * offset 5268 */ uint8_t boostTableOpenLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** RPM - * offset 6624 + * offset 5332 */ uint8_t boostRpmBins[BOOST_RPM_COUNT]; /** - * offset 6632 + * offset 5340 */ uint8_t boostTableClosedLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** % - * offset 6696 + * offset 5404 */ uint8_t boostTpsBins[BOOST_LOAD_COUNT]; /** % - * offset 6704 + * offset 5412 */ uint8_t pedalToTpsTable[PEDAL_TO_TPS_SIZE][PEDAL_TO_TPS_SIZE]; /** % - * offset 6768 + * offset 5476 */ uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE]; /** RPM - * offset 6776 + * offset 5484 */ uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller C - * offset 6784 + * offset 5492 */ float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller % - * offset 6816 + * offset 5524 */ float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) RPM - * offset 6848 + * offset 5556 */ scaled_channel idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) deg - * offset 6856 + * offset 5564 */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) RPM - * offset 6888 + * offset 5596 */ scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) % - * offset 6896 + * offset 5604 */ float idleVe[IDLE_VE_CURVE_SIZE]; /** - * offset 6928 + * offset 5636 */ lua_script_t luaScript; /** C - * offset 14928 + * offset 13636 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 14992 + * offset 13700 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 15056 + * offset 13764 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 15120 + * offset 13828 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 15184 + * offset 13892 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 15216 + * offset 13924 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 15248 + * offset 13956 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 15280 + * offset 13988 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 15312 + * offset 14020 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 15376 + * offset 14084 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4165,228 +4174,247 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 15440 + * offset 14148 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 16464 + * offset 15172 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 17488 + * offset 16196 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 18512 + * offset 17220 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 18576 + * offset 17284 */ - float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 18640 + * offset 17316 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 19664 + * offset 18340 */ - float injPhaseLoadBins[FUEL_LOAD_COUNT]; + uint16_t injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 19728 + * offset 18372 */ - float injPhaseRpmBins[FUEL_RPM_COUNT]; + uint16_t injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 19792 + * offset 18404 */ uint8_t tcuSolenoidTable[TCU_SOLENOID_COUNT][TCU_GEAR_COUNT]; /** * Good example: number of tooth on wheel, For Can 10 is a good number. Hz - * offset 19852 + * offset 18464 */ float vssFilterReciprocal; /** kPa - * offset 19856 + * offset 18468 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 20368 + * offset 18980 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 20400 + * offset 19012 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 20432 + * offset 19044 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20496 + * offset 19108 */ - float vvtTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20528 + * offset 19124 */ - float vvtTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 20560 + * offset 19140 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20624 + * offset 19204 */ - float vvtTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20656 + * offset 19220 */ - float vvtTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8]; /** deg - * offset 20688 + * offset 19236 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 21712 + * offset 20260 */ - float ignitionLoadBins[IGN_LOAD_COUNT]; + uint16_t ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 21776 + * offset 20292 */ - float ignitionRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 21840 + * offset 20324 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 22864 + * offset 21348 */ - float veLoadBins[FUEL_LOAD_COUNT]; + uint16_t veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 22928 + * offset 21380 */ - float veRpmBins[FUEL_RPM_COUNT]; + uint16_t veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 22992 + * offset 21412 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 23248 + * offset 21668 */ - float lambdaLoadBins[FUEL_LOAD_COUNT]; + uint16_t lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 23312 + * offset 21700 */ - float lambdaRpmBins[FUEL_RPM_COUNT]; + uint16_t lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 23376 + * offset 21732 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 23632 + * offset 21988 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** - * RPM is float and not integer in order to use unified methods for interpolation to - * offset 23664 + * offset 22020 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 23696 + * offset 22052 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 23952 + * offset 22308 */ - float scriptTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 23984 + * offset 22324 */ - float scriptTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24016 + * offset 22340 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24080 + * offset 22404 */ - float scriptTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24112 + * offset 22420 */ - float scriptTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24144 + * offset 22436 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24208 + * offset 22500 */ - float scriptTable3LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24240 + * offset 22516 */ - float scriptTable3RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24272 + * offset 22532 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24336 + * offset 22596 */ - float scriptTable4LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable4LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24368 + * offset 22612 */ - float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 24400*/ + uint16_t scriptTable4RpmBins[SCRIPT_TABLE_8]; + /** + * offset 22628 + */ + uint16_t ignTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22636 + */ + uint16_t ignTrimRpmBins[TRIM_SIZE]; + /** + * offset 22644 + */ + cyl_trim_s ignTrims[12]; + /** + * offset 22836 + */ + uint16_t fuelTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22844 + */ + uint16_t fuelTrimRpmBins[TRIM_SIZE]; + /** + * offset 22852 + */ + cyl_trim_s fuelTrims[12]; + /** total size 23044*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:35 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:49 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index b678c9f1c1..99055186e4 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -60,10 +60,10 @@ #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 #define AFTERSTART_HOLD_CURVE_SIZE 8 -#define afterstartCoolantBins_offset 6432 -#define afterstartDecayTime_offset 6528 -#define afterstartEnrich_offset 6496 -#define afterstartHoldTime_offset 6464 +#define afterstartCoolantBins_offset 5140 +#define afterstartDecayTime_offset 5236 +#define afterstartEnrich_offset 5204 +#define afterstartHoldTime_offset 5172 #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define air_pressure_sensor_type_e_Force_4_bytes_size_cranking_map_type ENUM_32_BITS @@ -211,10 +211,10 @@ #define boostPid_periodMs_offset 926 #define boostPid_pFactor_offset 912 #define boostPwmFrequency_offset 936 -#define boostRpmBins_offset 6624 -#define boostTableClosedLoop_offset 6632 -#define boostTableOpenLoop_offset 6560 -#define boostTpsBins_offset 6696 +#define boostRpmBins_offset 5332 +#define boostTableClosedLoop_offset 5340 +#define boostTableOpenLoop_offset 5268 +#define boostTpsBins_offset 5404 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_e_CLOSED_LOOP 1 #define boostType_e_Force_4bytes_size_boostType_e ENUM_32_BITS @@ -515,12 +515,12 @@ #define clt_tempC_2_offset 344 #define clt_tempC_3_offset 348 #define CLT_TIMING_CURVE_SIZE 8 -#define cltCrankingCorr_offset 6816 -#define cltCrankingCorrBins_offset 6784 -#define cltFuelCorr_offset 14992 -#define cltFuelCorrBins_offset 14928 -#define cltIdleCorr_offset 15376 -#define cltIdleCorrBins_offset 15312 +#define cltCrankingCorr_offset 5524 +#define cltCrankingCorrBins_offset 5492 +#define cltFuelCorr_offset 13700 +#define cltFuelCorrBins_offset 13636 +#define cltIdleCorr_offset 14084 +#define cltIdleCorrBins_offset 14020 #define cltIdleRpm_offset 1656 #define cltIdleRpmBins_offset 1592 #define cltRevLimitRpm_offset 2924 @@ -608,10 +608,10 @@ #define cranking_rpm_offset 180 #define crankingAdvance_offset 2716 #define crankingAdvanceBins_offset 2700 -#define crankingCycleBins_offset 15280 -#define crankingCycleCoef_offset 15248 -#define crankingFuelBins_offset 15216 -#define crankingFuelCoef_offset 15184 +#define crankingCycleBins_offset 13988 +#define crankingCycleCoef_offset 13956 +#define crankingFuelBins_offset 13924 +#define crankingFuelCoef_offset 13892 #define crankingIACposition_offset 1848 #define crankingInjectionMode_offset 436 #define crankingTimingAngle_offset 448 @@ -620,6 +620,7 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1260 #define cutSparkOnHardLimit_offset 1260 +#define cyl_trim_s_size 16 #define cylinderBankSelect10_offset 3493 #define cylinderBankSelect11_offset 3494 #define cylinderBankSelect12_offset 3495 @@ -744,7 +745,7 @@ #define enableTrailingSparks_offset 164 #define enableVerboseCan2Tx_offset 1740 #define enableVerboseCanTx_offset 748 -#define engine_configuration_s_size 6312 +#define engine_configuration_s_size 5020 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" #define engine_load_mode_e_Force_4_bytes_size_engine_load_mode ENUM_32_BITS @@ -981,6 +982,32 @@ #define fuelTrim7_offset 4086 #define fuelTrim8_offset 4087 #define fuelTrim9_offset 4088 +#define fuelTrimLoadBins_offset 22836 +#define fuelTrimRpmBins_offset 22844 +#define fuelTrims10_offset 22996 +#define fuelTrims10_table_offset 22996 +#define fuelTrims11_offset 23012 +#define fuelTrims11_table_offset 23012 +#define fuelTrims12_offset 23028 +#define fuelTrims12_table_offset 23028 +#define fuelTrims1_offset 22852 +#define fuelTrims1_table_offset 22852 +#define fuelTrims2_offset 22868 +#define fuelTrims2_table_offset 22868 +#define fuelTrims3_offset 22884 +#define fuelTrims3_table_offset 22884 +#define fuelTrims4_offset 22900 +#define fuelTrims4_table_offset 22900 +#define fuelTrims5_offset 22916 +#define fuelTrims5_table_offset 22916 +#define fuelTrims6_offset 22932 +#define fuelTrims6_table_offset 22932 +#define fuelTrims7_offset 22948 +#define fuelTrims7_table_offset 22948 +#define fuelTrims8_offset 22964 +#define fuelTrims8_table_offset 22964 +#define fuelTrims9_offset 22980 +#define fuelTrims9_table_offset 22980 #define GAP_TRACKING_LENGTH 18 #define gapTrackingLengthOverride_offset 456 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1255,8 +1282,8 @@ #define iat_tempC_1_offset 372 #define iat_tempC_2_offset 376 #define iat_tempC_3_offset 380 -#define iatFuelCorr_offset 15120 -#define iatFuelCorrBins_offset 15056 +#define iatFuelCorr_offset 13828 +#define iatFuelCorrBins_offset 13764 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 704 #define idle_derivativeFilterLoss_offset 524 @@ -1279,8 +1306,8 @@ #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 #define IDLE_VE_CURVE_SIZE 8 -#define idleAdvance_offset 6856 -#define idleAdvanceBins_offset 6848 +#define idleAdvance_offset 5564 +#define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 #define idleMode_offset 1268 #define idlePidActivationTime_offset 2188 @@ -1319,8 +1346,8 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 6896 -#define idleVeBins_offset 6888 +#define idleVe_offset 5604 +#define idleVeBins_offset 5596 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1330,10 +1357,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 188 -#define ignitionIatCorrLoadBins_offset 18512 -#define ignitionIatCorrRpmBins_offset 18576 -#define ignitionIatCorrTable_offset 17488 -#define ignitionLoadBins_offset 21712 +#define ignitionIatCorrLoadBins_offset 17220 +#define ignitionIatCorrRpmBins_offset 17284 +#define ignitionIatCorrTable_offset 16196 +#define ignitionLoadBins_offset 20260 #define ignitionMode_offset 452 #define ignitionPinMode_offset 657 #define ignitionPins10_offset 653 @@ -1348,9 +1375,35 @@ #define ignitionPins7_offset 650 #define ignitionPins8_offset 651 #define ignitionPins9_offset 652 -#define ignitionRpmBins_offset 21776 -#define ignitionTable_offset 20688 +#define ignitionRpmBins_offset 20292 +#define ignitionTable_offset 19236 #define ignOverrideMode_offset 1752 +#define ignTrimLoadBins_offset 22628 +#define ignTrimRpmBins_offset 22636 +#define ignTrims10_offset 22788 +#define ignTrims10_table_offset 22788 +#define ignTrims11_offset 22804 +#define ignTrims11_table_offset 22804 +#define ignTrims12_offset 22820 +#define ignTrims12_table_offset 22820 +#define ignTrims1_offset 22644 +#define ignTrims1_table_offset 22644 +#define ignTrims2_offset 22660 +#define ignTrims2_table_offset 22660 +#define ignTrims3_offset 22676 +#define ignTrims3_table_offset 22676 +#define ignTrims4_offset 22692 +#define ignTrims4_table_offset 22692 +#define ignTrims5_offset 22708 +#define ignTrims5_table_offset 22708 +#define ignTrims6_offset 22724 +#define ignTrims6_table_offset 22724 +#define ignTrims7_offset 22740 +#define ignTrims7_table_offset 22740 +#define ignTrims8_offset 22756 +#define ignTrims8_table_offset 22756 +#define ignTrims9_offset 22772 +#define ignTrims9_table_offset 22772 #define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_MM5_10", "IMU_TYPE_3", "IMU_TYPE_4" #define imu_type_e_IMU_MM5_10 2 #define imu_type_e_IMU_NONE 0 @@ -1369,7 +1422,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 440 -#define injectionPhase_offset 18640 +#define injectionPhase_offset 17316 #define injectionPinMode_offset 656 #define injectionPins10_offset 641 #define injectionPins11_offset 642 @@ -1409,8 +1462,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 796 #define injectorPressureType_offset 1753 -#define injPhaseLoadBins_offset 19664 -#define injPhaseRpmBins_offset 19728 +#define injPhaseLoadBins_offset 18340 +#define injPhaseRpmBins_offset 18372 #define invertCamVVTSignal_offset 896 #define invertPrimaryTriggerSignal_offset 1260 #define invertSecondaryTriggerSignal_offset 1260 @@ -1466,9 +1519,9 @@ #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 #define knockSamplingDuration_offset 2112 -#define lambdaLoadBins_offset 23248 -#define lambdaRpmBins_offset 23312 -#define lambdaTable_offset 22992 +#define lambdaLoadBins_offset 21668 +#define lambdaRpmBins_offset 21700 +#define lambdaTable_offset 21412 #define launchActivateDelay_offset 976 #define launchActivatePin_offset 911 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1524,7 +1577,7 @@ #define luaOutputPins6_offset 1141 #define luaOutputPins7_offset 1142 #define luaOutputPins8_offset 1143 -#define luaScript_offset 6928 +#define luaScript_offset 5636 #define MAF_DECODING_COUNT 256 #define maf_sensor_type_e_auto_enum "CUSTOM", "Bosch0280218037", "Bosch0280218004", "DensoTODO" #define maf_sensor_type_e_Bosch0280218004 2 @@ -1534,8 +1587,8 @@ #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3" #define maf_sensor_type_e_Internal_ForceMyEnumIntSize_maf_sensor ENUM_32_BITS #define mafAdcChannel_offset 551 -#define mafDecoding_offset 15440 -#define mafDecodingBins_offset 16464 +#define mafDecoding_offset 14148 +#define mafDecodingBins_offset 15172 #define mafSensorType_offset 892 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 @@ -1569,9 +1622,9 @@ #define mapCamSkipFactor_offset 768 #define mapErrorDetectionTooHigh_offset 1540 #define mapErrorDetectionTooLow_offset 1536 -#define mapEstimateRpmBins_offset 20400 -#define mapEstimateTable_offset 19856 -#define mapEstimateTpsBins_offset 20368 +#define mapEstimateRpmBins_offset 19012 +#define mapEstimateTable_offset 18468 +#define mapEstimateTpsBins_offset 18980 #define mapHighValueVoltage_offset 1832 #define mapLowValueVoltage_offset 1828 #define mapMinBufferLength_offset 820 @@ -1667,11 +1720,11 @@ #define PACK_PERCENT_BYTE_MULT 100.0 #define pauseEtbControl_offset 748 #define PEDAL_TO_TPS_SIZE 8 -#define pedalToTpsPedalBins_offset 6768 -#define pedalToTpsRpmBins_offset 6776 -#define pedalToTpsTable_offset 6704 +#define pedalToTpsPedalBins_offset 5476 +#define pedalToTpsRpmBins_offset 5484 +#define pedalToTpsTable_offset 5412 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 24400 +#define persistent_config_s_size 23044 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1778,18 +1831,18 @@ #define scriptSettingName6_offset 3300 #define scriptSettingName7_offset 3316 #define scriptSettingName8_offset 3332 -#define scriptTable1_offset 23696 -#define scriptTable1LoadBins_offset 23952 -#define scriptTable1RpmBins_offset 23984 -#define scriptTable2_offset 24016 -#define scriptTable2LoadBins_offset 24080 -#define scriptTable2RpmBins_offset 24112 -#define scriptTable3_offset 24144 -#define scriptTable3LoadBins_offset 24208 -#define scriptTable3RpmBins_offset 24240 -#define scriptTable4_offset 24272 -#define scriptTable4LoadBins_offset 24336 -#define scriptTable4RpmBins_offset 24368 +#define scriptTable1_offset 22052 +#define scriptTable1LoadBins_offset 22308 +#define scriptTable1RpmBins_offset 22324 +#define scriptTable2_offset 22340 +#define scriptTable2LoadBins_offset 22404 +#define scriptTable2RpmBins_offset 22420 +#define scriptTable3_offset 22436 +#define scriptTable3LoadBins_offset 22500 +#define scriptTable3RpmBins_offset 22516 +#define scriptTable4_offset 22532 +#define scriptTable4LoadBins_offset 22596 +#define scriptTable4RpmBins_offset 22612 #define scriptTableName1_offset 3156 #define scriptTableName2_offset 3172 #define scriptTableName3_offset 3188 @@ -1822,7 +1875,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 964314691 +#define SIGNATURE_HASH 882147479 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -1962,7 +2015,7 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 -#define tcuSolenoidTable_offset 19792 +#define tcuSolenoidTable_offset 18404 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 #define test557pin_offset 807 @@ -2012,7 +2065,7 @@ #define TORQUE_CURVE_SIZE 8 #define torqueRpmBins_offset 4602 #define torqueValues_offset 4594 -#define TOTAL_CONFIG_SIZE 24400 +#define TOTAL_CONFIG_SIZE 23044 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 #define tps1SecondaryMax_offset 830 @@ -2036,9 +2089,9 @@ #define tpsErrorDetectionTooLow_offset 172 #define tpsMax_offset 170 #define tpsMin_offset 168 -#define tpsTpsAccelFromRpmBins_offset 23632 -#define tpsTpsAccelTable_offset 23376 -#define tpsTpsAccelToRpmBins_offset 23664 +#define tpsTpsAccelFromRpmBins_offset 21988 +#define tpsTpsAccelTable_offset 21732 +#define tpsTpsAccelToRpmBins_offset 22020 #define trailingCoilPins10_offset 1965 #define trailingCoilPins11_offset 1966 #define trailingCoilPins12_offset 1967 @@ -2233,6 +2286,7 @@ #define triggerSimulatorPins1_offset 740 #define triggerSimulatorPins2_offset 741 #define triggerSimulatorPins3_offset 742 +#define TRIM_SIZE 4 #define TS_BURN_COMMAND 'B' #define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' @@ -2342,7 +2396,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.964314691" +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen_cypress.882147479" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2461,7 +2515,7 @@ #define vehicleName_offset 1076 #define vehicleSpeedSensorInputPin_offset 794 #define vehicleWeight_offset 786 -#define veLoadBins_offset 22864 +#define veLoadBins_offset 21348 #define veOverrideMode_offset 1733 #define verboseCan2BaseAddress_offset 1736 #define verboseCan_offset 164 @@ -2469,8 +2523,8 @@ #define verboseTLE8888_offset 748 #define verboseTriggerSynchDetails_offset 1272 #define verboseVVTDecoding_offset 896 -#define veRpmBins_offset 22928 -#define veTable_offset 21840 +#define veRpmBins_offset 21380 +#define veTable_offset 20324 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2486,7 +2540,7 @@ #define vrThreshold2_pin_offset 1176 #define vrThreshold2_rpmBins_offset 1180 #define vrThreshold2_values_offset 1186 -#define vssFilterReciprocal_offset 19852 +#define vssFilterReciprocal_offset 18464 #define vssGearRatio_offset 624 #define vssToothCount_offset 626 #define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_12", "VVT_MAP_V_TWIN_ANOTHER" @@ -2520,13 +2574,13 @@ #define vvtPins2_offset 1841 #define vvtPins3_offset 1842 #define vvtPins4_offset 1843 -#define vvtTable1_offset 20432 -#define vvtTable1LoadBins_offset 20496 -#define vvtTable1RpmBins_offset 20528 -#define vvtTable2_offset 20560 -#define vvtTable2LoadBins_offset 20624 -#define vvtTable2RpmBins_offset 20656 -#define warning_message_offset 6312 +#define vvtTable1_offset 19044 +#define vvtTable1LoadBins_offset 19108 +#define vvtTable1RpmBins_offset 19124 +#define vvtTable2_offset 19140 +#define vvtTable2LoadBins_offset 19204 +#define vvtTable2RpmBins_offset 19220 +#define warning_message_offset 5020 #define warningLedPin_offset 1685 #define warningPeriod_offset 1290 #define wastegatePositionMax_offset 726 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 3833298f08..c48d07d2da 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:33 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:46 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3995,8 +3995,17 @@ struct engine_configuration_s { units * offset 4592 */ - int mainUnusedEnd[423]; - /** total size 6284*/ + int mainUnusedEnd[100]; + /** total size 4992*/ +}; + +// start of cyl_trim_s +struct cyl_trim_s { + /** + * offset 0 + */ + scaled_channel table[TRIM_SIZE][TRIM_SIZE]; + /** total size 16*/ }; // start of persistent_config_s @@ -4006,152 +4015,152 @@ struct persistent_config_s { */ engine_configuration_s engineConfiguration; /** - * offset 6284 + * offset 4992 */ error_message_t warning_message; /** C - * offset 6404 + * offset 5112 */ float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE]; /** Seconds - * offset 6436 + * offset 5144 */ float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE]; /** % - * offset 6468 + * offset 5176 */ float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE]; /** Seconds - * offset 6500 + * offset 5208 */ float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE]; /** - * offset 6532 + * offset 5240 */ uint8_t boostTableOpenLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** RPM - * offset 6596 + * offset 5304 */ uint8_t boostRpmBins[BOOST_RPM_COUNT]; /** - * offset 6604 + * offset 5312 */ uint8_t boostTableClosedLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** % - * offset 6668 + * offset 5376 */ uint8_t boostTpsBins[BOOST_LOAD_COUNT]; /** % - * offset 6676 + * offset 5384 */ uint8_t pedalToTpsTable[PEDAL_TO_TPS_SIZE][PEDAL_TO_TPS_SIZE]; /** % - * offset 6740 + * offset 5448 */ uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE]; /** RPM - * offset 6748 + * offset 5456 */ uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller C - * offset 6756 + * offset 5464 */ float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller % - * offset 6788 + * offset 5496 */ float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) RPM - * offset 6820 + * offset 5528 */ scaled_channel idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) deg - * offset 6828 + * offset 5536 */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) RPM - * offset 6860 + * offset 5568 */ scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) % - * offset 6868 + * offset 5576 */ float idleVe[IDLE_VE_CURVE_SIZE]; /** - * offset 6900 + * offset 5608 */ lua_script_t luaScript; /** C - * offset 14900 + * offset 13608 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 14964 + * offset 13672 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 15028 + * offset 13736 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 15092 + * offset 13800 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 15156 + * offset 13864 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 15188 + * offset 13896 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 15220 + * offset 13928 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 15252 + * offset 13960 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 15284 + * offset 13992 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 15348 + * offset 14056 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4159,228 +4168,247 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 15412 + * offset 14120 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 16436 + * offset 15144 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 17460 + * offset 16168 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 18484 + * offset 17192 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 18548 + * offset 17256 */ - float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 18612 + * offset 17288 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 19636 + * offset 18312 */ - float injPhaseLoadBins[FUEL_LOAD_COUNT]; + uint16_t injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 19700 + * offset 18344 */ - float injPhaseRpmBins[FUEL_RPM_COUNT]; + uint16_t injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 19764 + * offset 18376 */ uint8_t tcuSolenoidTable[TCU_SOLENOID_COUNT][TCU_GEAR_COUNT]; /** * Good example: number of tooth on wheel, For Can 10 is a good number. Hz - * offset 19824 + * offset 18436 */ float vssFilterReciprocal; /** kPa - * offset 19828 + * offset 18440 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 20340 + * offset 18952 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 20372 + * offset 18984 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 20404 + * offset 19016 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20468 + * offset 19080 */ - float vvtTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20500 + * offset 19096 */ - float vvtTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 20532 + * offset 19112 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20596 + * offset 19176 */ - float vvtTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20628 + * offset 19192 */ - float vvtTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8]; /** deg - * offset 20660 + * offset 19208 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 21684 + * offset 20232 */ - float ignitionLoadBins[IGN_LOAD_COUNT]; + uint16_t ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 21748 + * offset 20264 */ - float ignitionRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 21812 + * offset 20296 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 22836 + * offset 21320 */ - float veLoadBins[FUEL_LOAD_COUNT]; + uint16_t veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 22900 + * offset 21352 */ - float veRpmBins[FUEL_RPM_COUNT]; + uint16_t veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 22964 + * offset 21384 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 23220 + * offset 21640 */ - float lambdaLoadBins[FUEL_LOAD_COUNT]; + uint16_t lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 23284 + * offset 21672 */ - float lambdaRpmBins[FUEL_RPM_COUNT]; + uint16_t lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 23348 + * offset 21704 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 23604 + * offset 21960 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** - * RPM is float and not integer in order to use unified methods for interpolation to - * offset 23636 + * offset 21992 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 23668 + * offset 22024 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 23924 + * offset 22280 */ - float scriptTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 23956 + * offset 22296 */ - float scriptTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 23988 + * offset 22312 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24052 + * offset 22376 */ - float scriptTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24084 + * offset 22392 */ - float scriptTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24116 + * offset 22408 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24180 + * offset 22472 */ - float scriptTable3LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24212 + * offset 22488 */ - float scriptTable3RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24244 + * offset 22504 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24308 + * offset 22568 */ - float scriptTable4LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable4LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24340 + * offset 22584 */ - float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 24372*/ + uint16_t scriptTable4RpmBins[SCRIPT_TABLE_8]; + /** + * offset 22600 + */ + uint16_t ignTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22608 + */ + uint16_t ignTrimRpmBins[TRIM_SIZE]; + /** + * offset 22616 + */ + cyl_trim_s ignTrims[12]; + /** + * offset 22808 + */ + uint16_t fuelTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22816 + */ + uint16_t fuelTrimRpmBins[TRIM_SIZE]; + /** + * offset 22824 + */ + cyl_trim_s fuelTrims[12]; + /** total size 23016*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:33 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:46 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 7bf9280578..153719fc6d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -60,10 +60,10 @@ #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 #define AFTERSTART_HOLD_CURVE_SIZE 8 -#define afterstartCoolantBins_offset 6404 -#define afterstartDecayTime_offset 6500 -#define afterstartEnrich_offset 6468 -#define afterstartHoldTime_offset 6436 +#define afterstartCoolantBins_offset 5112 +#define afterstartDecayTime_offset 5208 +#define afterstartEnrich_offset 5176 +#define afterstartHoldTime_offset 5144 #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define air_pressure_sensor_type_e_Force_4_bytes_size_cranking_map_type ENUM_32_BITS @@ -202,10 +202,10 @@ #define boostPid_periodMs_offset 926 #define boostPid_pFactor_offset 912 #define boostPwmFrequency_offset 936 -#define boostRpmBins_offset 6596 -#define boostTableClosedLoop_offset 6604 -#define boostTableOpenLoop_offset 6532 -#define boostTpsBins_offset 6668 +#define boostRpmBins_offset 5304 +#define boostTableClosedLoop_offset 5312 +#define boostTableOpenLoop_offset 5240 +#define boostTpsBins_offset 5376 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_e_CLOSED_LOOP 1 #define boostType_e_Force_4bytes_size_boostType_e ENUM_32_BITS @@ -500,12 +500,12 @@ #define clt_tempC_2_offset 344 #define clt_tempC_3_offset 348 #define CLT_TIMING_CURVE_SIZE 8 -#define cltCrankingCorr_offset 6788 -#define cltCrankingCorrBins_offset 6756 -#define cltFuelCorr_offset 14964 -#define cltFuelCorrBins_offset 14900 -#define cltIdleCorr_offset 15348 -#define cltIdleCorrBins_offset 15284 +#define cltCrankingCorr_offset 5496 +#define cltCrankingCorrBins_offset 5464 +#define cltFuelCorr_offset 13672 +#define cltFuelCorrBins_offset 13608 +#define cltIdleCorr_offset 14056 +#define cltIdleCorrBins_offset 13992 #define cltIdleRpm_offset 1656 #define cltIdleRpmBins_offset 1592 #define cltRevLimitRpm_offset 2896 @@ -593,10 +593,10 @@ #define cranking_rpm_offset 180 #define crankingAdvance_offset 2688 #define crankingAdvanceBins_offset 2672 -#define crankingCycleBins_offset 15252 -#define crankingCycleCoef_offset 15220 -#define crankingFuelBins_offset 15188 -#define crankingFuelCoef_offset 15156 +#define crankingCycleBins_offset 13960 +#define crankingCycleCoef_offset 13928 +#define crankingFuelBins_offset 13896 +#define crankingFuelCoef_offset 13864 #define crankingIACposition_offset 1844 #define crankingInjectionMode_offset 436 #define crankingTimingAngle_offset 448 @@ -605,6 +605,7 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1260 #define cutSparkOnHardLimit_offset 1260 +#define cyl_trim_s_size 16 #define cylinderBankSelect10_offset 3465 #define cylinderBankSelect11_offset 3466 #define cylinderBankSelect12_offset 3467 @@ -729,7 +730,7 @@ #define enableTrailingSparks_offset 164 #define enableVerboseCan2Tx_offset 1740 #define enableVerboseCanTx_offset 748 -#define engine_configuration_s_size 6284 +#define engine_configuration_s_size 4992 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" #define engine_load_mode_e_Force_4_bytes_size_engine_load_mode ENUM_32_BITS @@ -966,6 +967,32 @@ #define fuelTrim7_offset 4058 #define fuelTrim8_offset 4059 #define fuelTrim9_offset 4060 +#define fuelTrimLoadBins_offset 22808 +#define fuelTrimRpmBins_offset 22816 +#define fuelTrims10_offset 22968 +#define fuelTrims10_table_offset 22968 +#define fuelTrims11_offset 22984 +#define fuelTrims11_table_offset 22984 +#define fuelTrims12_offset 23000 +#define fuelTrims12_table_offset 23000 +#define fuelTrims1_offset 22824 +#define fuelTrims1_table_offset 22824 +#define fuelTrims2_offset 22840 +#define fuelTrims2_table_offset 22840 +#define fuelTrims3_offset 22856 +#define fuelTrims3_table_offset 22856 +#define fuelTrims4_offset 22872 +#define fuelTrims4_table_offset 22872 +#define fuelTrims5_offset 22888 +#define fuelTrims5_table_offset 22888 +#define fuelTrims6_offset 22904 +#define fuelTrims6_table_offset 22904 +#define fuelTrims7_offset 22920 +#define fuelTrims7_table_offset 22920 +#define fuelTrims8_offset 22936 +#define fuelTrims8_table_offset 22936 +#define fuelTrims9_offset 22952 +#define fuelTrims9_table_offset 22952 #define GAP_TRACKING_LENGTH 18 #define gapTrackingLengthOverride_offset 456 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1240,8 +1267,8 @@ #define iat_tempC_1_offset 372 #define iat_tempC_2_offset 376 #define iat_tempC_3_offset 380 -#define iatFuelCorr_offset 15092 -#define iatFuelCorrBins_offset 15028 +#define iatFuelCorr_offset 13800 +#define iatFuelCorrBins_offset 13736 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 704 #define idle_derivativeFilterLoss_offset 524 @@ -1264,8 +1291,8 @@ #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 #define IDLE_VE_CURVE_SIZE 8 -#define idleAdvance_offset 6828 -#define idleAdvanceBins_offset 6820 +#define idleAdvance_offset 5536 +#define idleAdvanceBins_offset 5528 #define idleIncrementalPidCic_offset 748 #define idleMode_offset 1268 #define idlePidActivationTime_offset 2180 @@ -1304,8 +1331,8 @@ #define idleTimingPid_periodMs_offset 3430 #define idleTimingPid_pFactor_offset 3416 #define idleTimingPidDeadZone_offset 3436 -#define idleVe_offset 6868 -#define idleVeBins_offset 6860 +#define idleVe_offset 5576 +#define idleVeBins_offset 5568 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1315,10 +1342,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 188 -#define ignitionIatCorrLoadBins_offset 18484 -#define ignitionIatCorrRpmBins_offset 18548 -#define ignitionIatCorrTable_offset 17460 -#define ignitionLoadBins_offset 21684 +#define ignitionIatCorrLoadBins_offset 17192 +#define ignitionIatCorrRpmBins_offset 17256 +#define ignitionIatCorrTable_offset 16168 +#define ignitionLoadBins_offset 20232 #define ignitionMode_offset 452 #define ignitionPinMode_offset 657 #define ignitionPins10_offset 653 @@ -1333,9 +1360,35 @@ #define ignitionPins7_offset 650 #define ignitionPins8_offset 651 #define ignitionPins9_offset 652 -#define ignitionRpmBins_offset 21748 -#define ignitionTable_offset 20660 +#define ignitionRpmBins_offset 20264 +#define ignitionTable_offset 19208 #define ignOverrideMode_offset 1752 +#define ignTrimLoadBins_offset 22600 +#define ignTrimRpmBins_offset 22608 +#define ignTrims10_offset 22760 +#define ignTrims10_table_offset 22760 +#define ignTrims11_offset 22776 +#define ignTrims11_table_offset 22776 +#define ignTrims12_offset 22792 +#define ignTrims12_table_offset 22792 +#define ignTrims1_offset 22616 +#define ignTrims1_table_offset 22616 +#define ignTrims2_offset 22632 +#define ignTrims2_table_offset 22632 +#define ignTrims3_offset 22648 +#define ignTrims3_table_offset 22648 +#define ignTrims4_offset 22664 +#define ignTrims4_table_offset 22664 +#define ignTrims5_offset 22680 +#define ignTrims5_table_offset 22680 +#define ignTrims6_offset 22696 +#define ignTrims6_table_offset 22696 +#define ignTrims7_offset 22712 +#define ignTrims7_table_offset 22712 +#define ignTrims8_offset 22728 +#define ignTrims8_table_offset 22728 +#define ignTrims9_offset 22744 +#define ignTrims9_table_offset 22744 #define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_MM5_10", "IMU_TYPE_3", "IMU_TYPE_4" #define imu_type_e_IMU_MM5_10 2 #define imu_type_e_IMU_NONE 0 @@ -1354,7 +1407,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 440 -#define injectionPhase_offset 18612 +#define injectionPhase_offset 17288 #define injectionPinMode_offset 656 #define injectionPins10_offset 641 #define injectionPins11_offset 642 @@ -1394,8 +1447,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 796 #define injectorPressureType_offset 1753 -#define injPhaseLoadBins_offset 19636 -#define injPhaseRpmBins_offset 19700 +#define injPhaseLoadBins_offset 18312 +#define injPhaseRpmBins_offset 18344 #define invertCamVVTSignal_offset 896 #define invertPrimaryTriggerSignal_offset 1260 #define invertSecondaryTriggerSignal_offset 1260 @@ -1451,9 +1504,9 @@ #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 #define knockSamplingDuration_offset 2104 -#define lambdaLoadBins_offset 23220 -#define lambdaRpmBins_offset 23284 -#define lambdaTable_offset 22964 +#define lambdaLoadBins_offset 21640 +#define lambdaRpmBins_offset 21672 +#define lambdaTable_offset 21384 #define launchActivateDelay_offset 976 #define launchActivatePin_offset 911 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1509,7 +1562,7 @@ #define luaOutputPins6_offset 1141 #define luaOutputPins7_offset 1142 #define luaOutputPins8_offset 1143 -#define luaScript_offset 6900 +#define luaScript_offset 5608 #define MAF_DECODING_COUNT 256 #define maf_sensor_type_e_auto_enum "CUSTOM", "Bosch0280218037", "Bosch0280218004", "DensoTODO" #define maf_sensor_type_e_Bosch0280218004 2 @@ -1519,8 +1572,8 @@ #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3" #define maf_sensor_type_e_Internal_ForceMyEnumIntSize_maf_sensor ENUM_32_BITS #define mafAdcChannel_offset 551 -#define mafDecoding_offset 15412 -#define mafDecodingBins_offset 16436 +#define mafDecoding_offset 14120 +#define mafDecodingBins_offset 15144 #define mafSensorType_offset 892 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 @@ -1554,9 +1607,9 @@ #define mapCamSkipFactor_offset 768 #define mapErrorDetectionTooHigh_offset 1540 #define mapErrorDetectionTooLow_offset 1536 -#define mapEstimateRpmBins_offset 20372 -#define mapEstimateTable_offset 19828 -#define mapEstimateTpsBins_offset 20340 +#define mapEstimateRpmBins_offset 18984 +#define mapEstimateTable_offset 18440 +#define mapEstimateTpsBins_offset 18952 #define mapHighValueVoltage_offset 1832 #define mapLowValueVoltage_offset 1828 #define mapMinBufferLength_offset 820 @@ -1652,11 +1705,11 @@ #define PACK_PERCENT_BYTE_MULT 100.0 #define pauseEtbControl_offset 748 #define PEDAL_TO_TPS_SIZE 8 -#define pedalToTpsPedalBins_offset 6740 -#define pedalToTpsRpmBins_offset 6748 -#define pedalToTpsTable_offset 6676 +#define pedalToTpsPedalBins_offset 5448 +#define pedalToTpsRpmBins_offset 5456 +#define pedalToTpsTable_offset 5384 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 24372 +#define persistent_config_s_size 23016 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1763,18 +1816,18 @@ #define scriptSettingName6_offset 3272 #define scriptSettingName7_offset 3288 #define scriptSettingName8_offset 3304 -#define scriptTable1_offset 23668 -#define scriptTable1LoadBins_offset 23924 -#define scriptTable1RpmBins_offset 23956 -#define scriptTable2_offset 23988 -#define scriptTable2LoadBins_offset 24052 -#define scriptTable2RpmBins_offset 24084 -#define scriptTable3_offset 24116 -#define scriptTable3LoadBins_offset 24180 -#define scriptTable3RpmBins_offset 24212 -#define scriptTable4_offset 24244 -#define scriptTable4LoadBins_offset 24308 -#define scriptTable4RpmBins_offset 24340 +#define scriptTable1_offset 22024 +#define scriptTable1LoadBins_offset 22280 +#define scriptTable1RpmBins_offset 22296 +#define scriptTable2_offset 22312 +#define scriptTable2LoadBins_offset 22376 +#define scriptTable2RpmBins_offset 22392 +#define scriptTable3_offset 22408 +#define scriptTable3LoadBins_offset 22472 +#define scriptTable3RpmBins_offset 22488 +#define scriptTable4_offset 22504 +#define scriptTable4LoadBins_offset 22568 +#define scriptTable4RpmBins_offset 22584 #define scriptTableName1_offset 3128 #define scriptTableName2_offset 3144 #define scriptTableName3_offset 3160 @@ -1807,7 +1860,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3336538815 +#define SIGNATURE_HASH 3409005675 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -1947,7 +2000,7 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3955 #define tcuEnabled_offset 896 -#define tcuSolenoidTable_offset 19764 +#define tcuSolenoidTable_offset 18376 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3954 #define test557pin_offset 807 @@ -1997,7 +2050,7 @@ #define TORQUE_CURVE_SIZE 8 #define torqueRpmBins_offset 4574 #define torqueValues_offset 4566 -#define TOTAL_CONFIG_SIZE 24372 +#define TOTAL_CONFIG_SIZE 23016 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 #define tps1SecondaryMax_offset 830 @@ -2021,9 +2074,9 @@ #define tpsErrorDetectionTooLow_offset 172 #define tpsMax_offset 170 #define tpsMin_offset 168 -#define tpsTpsAccelFromRpmBins_offset 23604 -#define tpsTpsAccelTable_offset 23348 -#define tpsTpsAccelToRpmBins_offset 23636 +#define tpsTpsAccelFromRpmBins_offset 21960 +#define tpsTpsAccelTable_offset 21704 +#define tpsTpsAccelToRpmBins_offset 21992 #define trailingCoilPins10_offset 1957 #define trailingCoilPins11_offset 1958 #define trailingCoilPins12_offset 1959 @@ -2218,6 +2271,7 @@ #define triggerSimulatorPins1_offset 740 #define triggerSimulatorPins2_offset 741 #define triggerSimulatorPins3_offset 742 +#define TRIM_SIZE 4 #define TS_BURN_COMMAND 'B' #define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' @@ -2327,7 +2381,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.kin.3336538815" +#define TS_SIGNATURE "rusEFI 2021.12.21.kin.3409005675" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2446,7 +2500,7 @@ #define vehicleName_offset 1076 #define vehicleSpeedSensorInputPin_offset 794 #define vehicleWeight_offset 786 -#define veLoadBins_offset 22836 +#define veLoadBins_offset 21320 #define veOverrideMode_offset 1733 #define verboseCan2BaseAddress_offset 1736 #define verboseCan_offset 164 @@ -2454,8 +2508,8 @@ #define verboseTLE8888_offset 748 #define verboseTriggerSynchDetails_offset 1272 #define verboseVVTDecoding_offset 896 -#define veRpmBins_offset 22900 -#define veTable_offset 21812 +#define veRpmBins_offset 21352 +#define veTable_offset 20296 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2471,7 +2525,7 @@ #define vrThreshold2_pin_offset 1176 #define vrThreshold2_rpmBins_offset 1180 #define vrThreshold2_values_offset 1186 -#define vssFilterReciprocal_offset 19824 +#define vssFilterReciprocal_offset 18436 #define vssGearRatio_offset 624 #define vssToothCount_offset 626 #define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_12", "VVT_MAP_V_TWIN_ANOTHER" @@ -2497,13 +2551,13 @@ #define vvtOffsetsPadding_offset 1148 #define vvtOutputFrequency1_offset 1864 #define vvtPins1_offset 1840 -#define vvtTable1_offset 20404 -#define vvtTable1LoadBins_offset 20468 -#define vvtTable1RpmBins_offset 20500 -#define vvtTable2_offset 20532 -#define vvtTable2LoadBins_offset 20596 -#define vvtTable2RpmBins_offset 20628 -#define warning_message_offset 6284 +#define vvtTable1_offset 19016 +#define vvtTable1LoadBins_offset 19080 +#define vvtTable1RpmBins_offset 19096 +#define vvtTable2_offset 19112 +#define vvtTable2LoadBins_offset 19176 +#define vvtTable2RpmBins_offset 19192 +#define warning_message_offset 4992 #define warningLedPin_offset 1685 #define warningPeriod_offset 1290 #define wastegatePositionMax_offset 726 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 6a04e07c6b..dae466e4d8 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:51 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4001,8 +4001,17 @@ struct engine_configuration_s { units * offset 4620 */ - int mainUnusedEnd[423]; - /** total size 6312*/ + int mainUnusedEnd[100]; + /** total size 5020*/ +}; + +// start of cyl_trim_s +struct cyl_trim_s { + /** + * offset 0 + */ + scaled_channel table[TRIM_SIZE][TRIM_SIZE]; + /** total size 16*/ }; // start of persistent_config_s @@ -4012,152 +4021,152 @@ struct persistent_config_s { */ engine_configuration_s engineConfiguration; /** - * offset 6312 + * offset 5020 */ error_message_t warning_message; /** C - * offset 6432 + * offset 5140 */ float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE]; /** Seconds - * offset 6464 + * offset 5172 */ float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE]; /** % - * offset 6496 + * offset 5204 */ float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE]; /** Seconds - * offset 6528 + * offset 5236 */ float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE]; /** - * offset 6560 + * offset 5268 */ uint8_t boostTableOpenLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** RPM - * offset 6624 + * offset 5332 */ uint8_t boostRpmBins[BOOST_RPM_COUNT]; /** - * offset 6632 + * offset 5340 */ uint8_t boostTableClosedLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** % - * offset 6696 + * offset 5404 */ uint8_t boostTpsBins[BOOST_LOAD_COUNT]; /** % - * offset 6704 + * offset 5412 */ uint8_t pedalToTpsTable[PEDAL_TO_TPS_SIZE][PEDAL_TO_TPS_SIZE]; /** % - * offset 6768 + * offset 5476 */ uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE]; /** RPM - * offset 6776 + * offset 5484 */ uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller C - * offset 6784 + * offset 5492 */ float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller % - * offset 6816 + * offset 5524 */ float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) RPM - * offset 6848 + * offset 5556 */ scaled_channel idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) deg - * offset 6856 + * offset 5564 */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) RPM - * offset 6888 + * offset 5596 */ scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) % - * offset 6896 + * offset 5604 */ float idleVe[IDLE_VE_CURVE_SIZE]; /** - * offset 6928 + * offset 5636 */ lua_script_t luaScript; /** C - * offset 14928 + * offset 13636 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 14992 + * offset 13700 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 15056 + * offset 13764 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 15120 + * offset 13828 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 15184 + * offset 13892 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 15216 + * offset 13924 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 15248 + * offset 13956 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 15280 + * offset 13988 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 15312 + * offset 14020 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 15376 + * offset 14084 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4165,228 +4174,247 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 15440 + * offset 14148 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 16464 + * offset 15172 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 17488 + * offset 16196 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 18512 + * offset 17220 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 18576 + * offset 17284 */ - float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 18640 + * offset 17316 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 19664 + * offset 18340 */ - float injPhaseLoadBins[FUEL_LOAD_COUNT]; + uint16_t injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 19728 + * offset 18372 */ - float injPhaseRpmBins[FUEL_RPM_COUNT]; + uint16_t injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 19792 + * offset 18404 */ uint8_t tcuSolenoidTable[TCU_SOLENOID_COUNT][TCU_GEAR_COUNT]; /** * Good example: number of tooth on wheel, For Can 10 is a good number. Hz - * offset 19852 + * offset 18464 */ float vssFilterReciprocal; /** kPa - * offset 19856 + * offset 18468 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 20368 + * offset 18980 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 20400 + * offset 19012 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 20432 + * offset 19044 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20496 + * offset 19108 */ - float vvtTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20528 + * offset 19124 */ - float vvtTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 20560 + * offset 19140 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20624 + * offset 19204 */ - float vvtTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20656 + * offset 19220 */ - float vvtTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8]; /** deg - * offset 20688 + * offset 19236 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 21712 + * offset 20260 */ - float ignitionLoadBins[IGN_LOAD_COUNT]; + uint16_t ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 21776 + * offset 20292 */ - float ignitionRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 21840 + * offset 20324 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 22864 + * offset 21348 */ - float veLoadBins[FUEL_LOAD_COUNT]; + uint16_t veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 22928 + * offset 21380 */ - float veRpmBins[FUEL_RPM_COUNT]; + uint16_t veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 22992 + * offset 21412 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 23248 + * offset 21668 */ - float lambdaLoadBins[FUEL_LOAD_COUNT]; + uint16_t lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 23312 + * offset 21700 */ - float lambdaRpmBins[FUEL_RPM_COUNT]; + uint16_t lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 23376 + * offset 21732 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 23632 + * offset 21988 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** - * RPM is float and not integer in order to use unified methods for interpolation to - * offset 23664 + * offset 22020 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 23696 + * offset 22052 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 23952 + * offset 22308 */ - float scriptTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 23984 + * offset 22324 */ - float scriptTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24016 + * offset 22340 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24080 + * offset 22404 */ - float scriptTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24112 + * offset 22420 */ - float scriptTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24144 + * offset 22436 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24208 + * offset 22500 */ - float scriptTable3LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24240 + * offset 22516 */ - float scriptTable3RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24272 + * offset 22532 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24336 + * offset 22596 */ - float scriptTable4LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable4LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24368 + * offset 22612 */ - float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 24400*/ + uint16_t scriptTable4RpmBins[SCRIPT_TABLE_8]; + /** + * offset 22628 + */ + uint16_t ignTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22636 + */ + uint16_t ignTrimRpmBins[TRIM_SIZE]; + /** + * offset 22644 + */ + cyl_trim_s ignTrims[12]; + /** + * offset 22836 + */ + uint16_t fuelTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22844 + */ + uint16_t fuelTrimRpmBins[TRIM_SIZE]; + /** + * offset 22852 + */ + cyl_trim_s fuelTrims[12]; + /** total size 23044*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:38 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:51 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 69d5adfbfd..ec899d1a78 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -68,10 +68,10 @@ #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 #define AFTERSTART_HOLD_CURVE_SIZE 8 -#define afterstartCoolantBins_offset 6432 -#define afterstartDecayTime_offset 6528 -#define afterstartEnrich_offset 6496 -#define afterstartHoldTime_offset 6464 +#define afterstartCoolantBins_offset 5140 +#define afterstartDecayTime_offset 5236 +#define afterstartEnrich_offset 5204 +#define afterstartHoldTime_offset 5172 #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define air_pressure_sensor_type_e_Force_4_bytes_size_cranking_map_type ENUM_32_BITS @@ -219,10 +219,10 @@ #define boostPid_periodMs_offset 926 #define boostPid_pFactor_offset 912 #define boostPwmFrequency_offset 936 -#define boostRpmBins_offset 6624 -#define boostTableClosedLoop_offset 6632 -#define boostTableOpenLoop_offset 6560 -#define boostTpsBins_offset 6696 +#define boostRpmBins_offset 5332 +#define boostTableClosedLoop_offset 5340 +#define boostTableOpenLoop_offset 5268 +#define boostTpsBins_offset 5404 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_e_CLOSED_LOOP 1 #define boostType_e_Force_4bytes_size_boostType_e ENUM_32_BITS @@ -527,12 +527,12 @@ #define clt_tempC_2_offset 344 #define clt_tempC_3_offset 348 #define CLT_TIMING_CURVE_SIZE 8 -#define cltCrankingCorr_offset 6816 -#define cltCrankingCorrBins_offset 6784 -#define cltFuelCorr_offset 14992 -#define cltFuelCorrBins_offset 14928 -#define cltIdleCorr_offset 15376 -#define cltIdleCorrBins_offset 15312 +#define cltCrankingCorr_offset 5524 +#define cltCrankingCorrBins_offset 5492 +#define cltFuelCorr_offset 13700 +#define cltFuelCorrBins_offset 13636 +#define cltIdleCorr_offset 14084 +#define cltIdleCorrBins_offset 14020 #define cltIdleRpm_offset 1656 #define cltIdleRpmBins_offset 1592 #define cltRevLimitRpm_offset 2924 @@ -620,10 +620,10 @@ #define cranking_rpm_offset 180 #define crankingAdvance_offset 2716 #define crankingAdvanceBins_offset 2700 -#define crankingCycleBins_offset 15280 -#define crankingCycleCoef_offset 15248 -#define crankingFuelBins_offset 15216 -#define crankingFuelCoef_offset 15184 +#define crankingCycleBins_offset 13988 +#define crankingCycleCoef_offset 13956 +#define crankingFuelBins_offset 13924 +#define crankingFuelCoef_offset 13892 #define crankingIACposition_offset 1848 #define crankingInjectionMode_offset 436 #define crankingTimingAngle_offset 448 @@ -632,6 +632,7 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1260 #define cutSparkOnHardLimit_offset 1260 +#define cyl_trim_s_size 16 #define cylinderBankSelect10_offset 3493 #define cylinderBankSelect11_offset 3494 #define cylinderBankSelect12_offset 3495 @@ -756,7 +757,7 @@ #define enableTrailingSparks_offset 164 #define enableVerboseCan2Tx_offset 1740 #define enableVerboseCanTx_offset 748 -#define engine_configuration_s_size 6312 +#define engine_configuration_s_size 5020 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" #define engine_load_mode_e_Force_4_bytes_size_engine_load_mode ENUM_32_BITS @@ -993,6 +994,32 @@ #define fuelTrim7_offset 4086 #define fuelTrim8_offset 4087 #define fuelTrim9_offset 4088 +#define fuelTrimLoadBins_offset 22836 +#define fuelTrimRpmBins_offset 22844 +#define fuelTrims10_offset 22996 +#define fuelTrims10_table_offset 22996 +#define fuelTrims11_offset 23012 +#define fuelTrims11_table_offset 23012 +#define fuelTrims12_offset 23028 +#define fuelTrims12_table_offset 23028 +#define fuelTrims1_offset 22852 +#define fuelTrims1_table_offset 22852 +#define fuelTrims2_offset 22868 +#define fuelTrims2_table_offset 22868 +#define fuelTrims3_offset 22884 +#define fuelTrims3_table_offset 22884 +#define fuelTrims4_offset 22900 +#define fuelTrims4_table_offset 22900 +#define fuelTrims5_offset 22916 +#define fuelTrims5_table_offset 22916 +#define fuelTrims6_offset 22932 +#define fuelTrims6_table_offset 22932 +#define fuelTrims7_offset 22948 +#define fuelTrims7_table_offset 22948 +#define fuelTrims8_offset 22964 +#define fuelTrims8_table_offset 22964 +#define fuelTrims9_offset 22980 +#define fuelTrims9_table_offset 22980 #define GAP_TRACKING_LENGTH 18 #define gapTrackingLengthOverride_offset 456 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1267,8 +1294,8 @@ #define iat_tempC_1_offset 372 #define iat_tempC_2_offset 376 #define iat_tempC_3_offset 380 -#define iatFuelCorr_offset 15120 -#define iatFuelCorrBins_offset 15056 +#define iatFuelCorr_offset 13828 +#define iatFuelCorrBins_offset 13764 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 704 #define idle_derivativeFilterLoss_offset 524 @@ -1291,8 +1318,8 @@ #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 #define IDLE_VE_CURVE_SIZE 8 -#define idleAdvance_offset 6856 -#define idleAdvanceBins_offset 6848 +#define idleAdvance_offset 5564 +#define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 #define idleMode_offset 1268 #define idlePidActivationTime_offset 2188 @@ -1331,8 +1358,8 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 6896 -#define idleVeBins_offset 6888 +#define idleVe_offset 5604 +#define idleVeBins_offset 5596 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1342,10 +1369,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 188 -#define ignitionIatCorrLoadBins_offset 18512 -#define ignitionIatCorrRpmBins_offset 18576 -#define ignitionIatCorrTable_offset 17488 -#define ignitionLoadBins_offset 21712 +#define ignitionIatCorrLoadBins_offset 17220 +#define ignitionIatCorrRpmBins_offset 17284 +#define ignitionIatCorrTable_offset 16196 +#define ignitionLoadBins_offset 20260 #define ignitionMode_offset 452 #define ignitionPinMode_offset 657 #define ignitionPins10_offset 653 @@ -1360,9 +1387,35 @@ #define ignitionPins7_offset 650 #define ignitionPins8_offset 651 #define ignitionPins9_offset 652 -#define ignitionRpmBins_offset 21776 -#define ignitionTable_offset 20688 +#define ignitionRpmBins_offset 20292 +#define ignitionTable_offset 19236 #define ignOverrideMode_offset 1752 +#define ignTrimLoadBins_offset 22628 +#define ignTrimRpmBins_offset 22636 +#define ignTrims10_offset 22788 +#define ignTrims10_table_offset 22788 +#define ignTrims11_offset 22804 +#define ignTrims11_table_offset 22804 +#define ignTrims12_offset 22820 +#define ignTrims12_table_offset 22820 +#define ignTrims1_offset 22644 +#define ignTrims1_table_offset 22644 +#define ignTrims2_offset 22660 +#define ignTrims2_table_offset 22660 +#define ignTrims3_offset 22676 +#define ignTrims3_table_offset 22676 +#define ignTrims4_offset 22692 +#define ignTrims4_table_offset 22692 +#define ignTrims5_offset 22708 +#define ignTrims5_table_offset 22708 +#define ignTrims6_offset 22724 +#define ignTrims6_table_offset 22724 +#define ignTrims7_offset 22740 +#define ignTrims7_table_offset 22740 +#define ignTrims8_offset 22756 +#define ignTrims8_table_offset 22756 +#define ignTrims9_offset 22772 +#define ignTrims9_table_offset 22772 #define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_MM5_10", "IMU_TYPE_3", "IMU_TYPE_4" #define imu_type_e_IMU_MM5_10 2 #define imu_type_e_IMU_NONE 0 @@ -1381,7 +1434,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 440 -#define injectionPhase_offset 18640 +#define injectionPhase_offset 17316 #define injectionPinMode_offset 656 #define injectionPins10_offset 641 #define injectionPins11_offset 642 @@ -1421,8 +1474,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 796 #define injectorPressureType_offset 1753 -#define injPhaseLoadBins_offset 19664 -#define injPhaseRpmBins_offset 19728 +#define injPhaseLoadBins_offset 18340 +#define injPhaseRpmBins_offset 18372 #define invertCamVVTSignal_offset 896 #define invertPrimaryTriggerSignal_offset 1260 #define invertSecondaryTriggerSignal_offset 1260 @@ -1478,9 +1531,9 @@ #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 #define knockSamplingDuration_offset 2112 -#define lambdaLoadBins_offset 23248 -#define lambdaRpmBins_offset 23312 -#define lambdaTable_offset 22992 +#define lambdaLoadBins_offset 21668 +#define lambdaRpmBins_offset 21700 +#define lambdaTable_offset 21412 #define launchActivateDelay_offset 976 #define launchActivatePin_offset 911 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1536,7 +1589,7 @@ #define luaOutputPins6_offset 1141 #define luaOutputPins7_offset 1142 #define luaOutputPins8_offset 1143 -#define luaScript_offset 6928 +#define luaScript_offset 5636 #define MAF_DECODING_COUNT 256 #define maf_sensor_type_e_auto_enum "CUSTOM", "Bosch0280218037", "Bosch0280218004", "DensoTODO" #define maf_sensor_type_e_Bosch0280218004 2 @@ -1546,8 +1599,8 @@ #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3" #define maf_sensor_type_e_Internal_ForceMyEnumIntSize_maf_sensor ENUM_32_BITS #define mafAdcChannel_offset 551 -#define mafDecoding_offset 15440 -#define mafDecodingBins_offset 16464 +#define mafDecoding_offset 14148 +#define mafDecodingBins_offset 15172 #define mafSensorType_offset 892 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 @@ -1581,9 +1634,9 @@ #define mapCamSkipFactor_offset 768 #define mapErrorDetectionTooHigh_offset 1540 #define mapErrorDetectionTooLow_offset 1536 -#define mapEstimateRpmBins_offset 20400 -#define mapEstimateTable_offset 19856 -#define mapEstimateTpsBins_offset 20368 +#define mapEstimateRpmBins_offset 19012 +#define mapEstimateTable_offset 18468 +#define mapEstimateTpsBins_offset 18980 #define mapHighValueVoltage_offset 1832 #define mapLowValueVoltage_offset 1828 #define mapMinBufferLength_offset 820 @@ -1679,11 +1732,11 @@ #define PACK_PERCENT_BYTE_MULT 100.0 #define pauseEtbControl_offset 748 #define PEDAL_TO_TPS_SIZE 8 -#define pedalToTpsPedalBins_offset 6768 -#define pedalToTpsRpmBins_offset 6776 -#define pedalToTpsTable_offset 6704 +#define pedalToTpsPedalBins_offset 5476 +#define pedalToTpsRpmBins_offset 5484 +#define pedalToTpsTable_offset 5412 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 24400 +#define persistent_config_s_size 23044 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1790,18 +1843,18 @@ #define scriptSettingName6_offset 3300 #define scriptSettingName7_offset 3316 #define scriptSettingName8_offset 3332 -#define scriptTable1_offset 23696 -#define scriptTable1LoadBins_offset 23952 -#define scriptTable1RpmBins_offset 23984 -#define scriptTable2_offset 24016 -#define scriptTable2LoadBins_offset 24080 -#define scriptTable2RpmBins_offset 24112 -#define scriptTable3_offset 24144 -#define scriptTable3LoadBins_offset 24208 -#define scriptTable3RpmBins_offset 24240 -#define scriptTable4_offset 24272 -#define scriptTable4LoadBins_offset 24336 -#define scriptTable4RpmBins_offset 24368 +#define scriptTable1_offset 22052 +#define scriptTable1LoadBins_offset 22308 +#define scriptTable1RpmBins_offset 22324 +#define scriptTable2_offset 22340 +#define scriptTable2LoadBins_offset 22404 +#define scriptTable2RpmBins_offset 22420 +#define scriptTable3_offset 22436 +#define scriptTable3LoadBins_offset 22500 +#define scriptTable3RpmBins_offset 22516 +#define scriptTable4_offset 22532 +#define scriptTable4LoadBins_offset 22596 +#define scriptTable4RpmBins_offset 22612 #define scriptTableName1_offset 3156 #define scriptTableName2_offset 3172 #define scriptTableName3_offset 3188 @@ -1835,7 +1888,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 3224745903 +#define SIGNATURE_HASH 3453710715 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -1975,7 +2028,7 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 -#define tcuSolenoidTable_offset 19792 +#define tcuSolenoidTable_offset 18404 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 #define test557pin_offset 807 @@ -2025,7 +2078,7 @@ #define TORQUE_CURVE_SIZE 8 #define torqueRpmBins_offset 4602 #define torqueValues_offset 4594 -#define TOTAL_CONFIG_SIZE 24400 +#define TOTAL_CONFIG_SIZE 23044 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 #define tps1SecondaryMax_offset 830 @@ -2049,9 +2102,9 @@ #define tpsErrorDetectionTooLow_offset 172 #define tpsMax_offset 170 #define tpsMin_offset 168 -#define tpsTpsAccelFromRpmBins_offset 23632 -#define tpsTpsAccelTable_offset 23376 -#define tpsTpsAccelToRpmBins_offset 23664 +#define tpsTpsAccelFromRpmBins_offset 21988 +#define tpsTpsAccelTable_offset 21732 +#define tpsTpsAccelToRpmBins_offset 22020 #define trailingCoilPins10_offset 1965 #define trailingCoilPins11_offset 1966 #define trailingCoilPins12_offset 1967 @@ -2246,6 +2299,7 @@ #define triggerSimulatorPins1_offset 740 #define triggerSimulatorPins2_offset 741 #define triggerSimulatorPins3_offset 742 +#define TRIM_SIZE 4 #define TS_BURN_COMMAND 'B' #define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' @@ -2355,7 +2409,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.3224745903" +#define TS_SIGNATURE "rusEFI 2021.12.21.subaru_eg33_f7.3453710715" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2474,7 +2528,7 @@ #define vehicleName_offset 1076 #define vehicleSpeedSensorInputPin_offset 794 #define vehicleWeight_offset 786 -#define veLoadBins_offset 22864 +#define veLoadBins_offset 21348 #define veOverrideMode_offset 1733 #define verboseCan2BaseAddress_offset 1736 #define verboseCan_offset 164 @@ -2482,8 +2536,8 @@ #define verboseTLE8888_offset 748 #define verboseTriggerSynchDetails_offset 1272 #define verboseVVTDecoding_offset 896 -#define veRpmBins_offset 22928 -#define veTable_offset 21840 +#define veRpmBins_offset 21380 +#define veTable_offset 20324 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2499,7 +2553,7 @@ #define vrThreshold2_pin_offset 1176 #define vrThreshold2_rpmBins_offset 1180 #define vrThreshold2_values_offset 1186 -#define vssFilterReciprocal_offset 19852 +#define vssFilterReciprocal_offset 18464 #define vssGearRatio_offset 624 #define vssToothCount_offset 626 #define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_12", "VVT_MAP_V_TWIN_ANOTHER" @@ -2533,13 +2587,13 @@ #define vvtPins2_offset 1841 #define vvtPins3_offset 1842 #define vvtPins4_offset 1843 -#define vvtTable1_offset 20432 -#define vvtTable1LoadBins_offset 20496 -#define vvtTable1RpmBins_offset 20528 -#define vvtTable2_offset 20560 -#define vvtTable2LoadBins_offset 20624 -#define vvtTable2RpmBins_offset 20656 -#define warning_message_offset 6312 +#define vvtTable1_offset 19044 +#define vvtTable1LoadBins_offset 19108 +#define vvtTable1RpmBins_offset 19124 +#define vvtTable2_offset 19140 +#define vvtTable2LoadBins_offset 19204 +#define vvtTable2RpmBins_offset 19220 +#define warning_message_offset 5020 #define warningLedPin_offset 1685 #define warningPeriod_offset 1290 #define wastegatePositionMax_offset 726 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 7a78d28a90..546e72ed6f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:54 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4001,8 +4001,17 @@ struct engine_configuration_s { units * offset 4620 */ - int mainUnusedEnd[423]; - /** total size 6312*/ + int mainUnusedEnd[100]; + /** total size 5020*/ +}; + +// start of cyl_trim_s +struct cyl_trim_s { + /** + * offset 0 + */ + scaled_channel table[TRIM_SIZE][TRIM_SIZE]; + /** total size 16*/ }; // start of persistent_config_s @@ -4012,152 +4021,152 @@ struct persistent_config_s { */ engine_configuration_s engineConfiguration; /** - * offset 6312 + * offset 5020 */ error_message_t warning_message; /** C - * offset 6432 + * offset 5140 */ float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE]; /** Seconds - * offset 6464 + * offset 5172 */ float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE]; /** % - * offset 6496 + * offset 5204 */ float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE]; /** Seconds - * offset 6528 + * offset 5236 */ float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE]; /** - * offset 6560 + * offset 5268 */ uint8_t boostTableOpenLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** RPM - * offset 6624 + * offset 5332 */ uint8_t boostRpmBins[BOOST_RPM_COUNT]; /** - * offset 6632 + * offset 5340 */ uint8_t boostTableClosedLoop[BOOST_RPM_COUNT][BOOST_LOAD_COUNT]; /** % - * offset 6696 + * offset 5404 */ uint8_t boostTpsBins[BOOST_LOAD_COUNT]; /** % - * offset 6704 + * offset 5412 */ uint8_t pedalToTpsTable[PEDAL_TO_TPS_SIZE][PEDAL_TO_TPS_SIZE]; /** % - * offset 6768 + * offset 5476 */ uint8_t pedalToTpsPedalBins[PEDAL_TO_TPS_SIZE]; /** RPM - * offset 6776 + * offset 5484 */ uint8_t pedalToTpsRpmBins[PEDAL_TO_TPS_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller C - * offset 6784 + * offset 5492 */ float cltCrankingCorrBins[CLT_CRANKING_CURVE_SIZE]; /** * CLT-based cranking position multiplier for simple manual idle controller % - * offset 6816 + * offset 5524 */ float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) RPM - * offset 6848 + * offset 5556 */ scaled_channel idleAdvanceBins[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional timing advance table for Idle (see useSeparateAdvanceForIdle) deg - * offset 6856 + * offset 5564 */ float idleAdvance[IDLE_ADVANCE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) RPM - * offset 6888 + * offset 5596 */ scaled_channel idleVeBins[IDLE_VE_CURVE_SIZE]; /** * Optional VE table for Idle (see useSeparateVEForIdle) % - * offset 6896 + * offset 5604 */ float idleVe[IDLE_VE_CURVE_SIZE]; /** - * offset 6928 + * offset 5636 */ lua_script_t luaScript; /** C - * offset 14928 + * offset 13636 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 14992 + * offset 13700 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 15056 + * offset 13764 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 15120 + * offset 13828 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 15184 + * offset 13892 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 15216 + * offset 13924 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 15248 + * offset 13956 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 15280 + * offset 13988 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 15312 + * offset 14020 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 15376 + * offset 14084 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4165,228 +4174,247 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 15440 + * offset 14148 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 16464 + * offset 15172 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 17488 + * offset 16196 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 18512 + * offset 17220 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 18576 + * offset 17284 */ - float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 18640 + * offset 17316 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 19664 + * offset 18340 */ - float injPhaseLoadBins[FUEL_LOAD_COUNT]; + uint16_t injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 19728 + * offset 18372 */ - float injPhaseRpmBins[FUEL_RPM_COUNT]; + uint16_t injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 19792 + * offset 18404 */ uint8_t tcuSolenoidTable[TCU_SOLENOID_COUNT][TCU_GEAR_COUNT]; /** * Good example: number of tooth on wheel, For Can 10 is a good number. Hz - * offset 19852 + * offset 18464 */ float vssFilterReciprocal; /** kPa - * offset 19856 + * offset 18468 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 20368 + * offset 18980 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 20400 + * offset 19012 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 20432 + * offset 19044 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20496 + * offset 19108 */ - float vvtTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20528 + * offset 19124 */ - float vvtTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 20560 + * offset 19140 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 20624 + * offset 19204 */ - float vvtTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 20656 + * offset 19220 */ - float vvtTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8]; /** deg - * offset 20688 + * offset 19236 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 21712 + * offset 20260 */ - float ignitionLoadBins[IGN_LOAD_COUNT]; + uint16_t ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 21776 + * offset 20292 */ - float ignitionRpmBins[IGN_RPM_COUNT]; + uint16_t ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 21840 + * offset 20324 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 22864 + * offset 21348 */ - float veLoadBins[FUEL_LOAD_COUNT]; + uint16_t veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 22928 + * offset 21380 */ - float veRpmBins[FUEL_RPM_COUNT]; + uint16_t veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 22992 + * offset 21412 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 23248 + * offset 21668 */ - float lambdaLoadBins[FUEL_LOAD_COUNT]; + uint16_t lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 23312 + * offset 21700 */ - float lambdaRpmBins[FUEL_RPM_COUNT]; + uint16_t lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 23376 + * offset 21732 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 23632 + * offset 21988 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** - * RPM is float and not integer in order to use unified methods for interpolation to - * offset 23664 + * offset 22020 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 23696 + * offset 22052 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 23952 + * offset 22308 */ - float scriptTable1LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 23984 + * offset 22324 */ - float scriptTable1RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24016 + * offset 22340 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24080 + * offset 22404 */ - float scriptTable2LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24112 + * offset 22420 */ - float scriptTable2RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24144 + * offset 22436 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24208 + * offset 22500 */ - float scriptTable3LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24240 + * offset 22516 */ - float scriptTable3RpmBins[SCRIPT_TABLE_8]; + uint16_t scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 24272 + * offset 22532 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 24336 + * offset 22596 */ - float scriptTable4LoadBins[SCRIPT_TABLE_8]; + uint16_t scriptTable4LoadBins[SCRIPT_TABLE_8]; /** - * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 24368 + * offset 22612 */ - float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 24400*/ + uint16_t scriptTable4RpmBins[SCRIPT_TABLE_8]; + /** + * offset 22628 + */ + uint16_t ignTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22636 + */ + uint16_t ignTrimRpmBins[TRIM_SIZE]; + /** + * offset 22644 + */ + cyl_trim_s ignTrims[12]; + /** + * offset 22836 + */ + uint16_t fuelTrimLoadBins[TRIM_SIZE]; + /** + rpm + * offset 22844 + */ + uint16_t fuelTrimRpmBins[TRIM_SIZE]; + /** + * offset 22852 + */ + cyl_trim_s fuelTrims[12]; + /** total size 23044*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:41 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:54 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 39c4a042a9..81e60fa589 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -60,10 +60,10 @@ #define AFTERSTART_DECAY_CURVE_SIZE 8 #define AFTERSTART_ENRICH_CURVE_SIZE 8 #define AFTERSTART_HOLD_CURVE_SIZE 8 -#define afterstartCoolantBins_offset 6432 -#define afterstartDecayTime_offset 6528 -#define afterstartEnrich_offset 6496 -#define afterstartHoldTime_offset 6464 +#define afterstartCoolantBins_offset 5140 +#define afterstartDecayTime_offset 5236 +#define afterstartEnrich_offset 5204 +#define afterstartHoldTime_offset 5172 #define air_pressure_sensor_config_s_size 16 #define air_pressure_sensor_type_e_auto_enum "MT_CUSTOM", "MT_DENSO183", "MT_MPX4250", "MT_HONDA3BAR", "MT_DODGE_NEON_2003", "MT_SUBY_DENSO", "MT_GM_3_BAR", "MT_MPX4100", "MT_TOYOTA_89420_02010", "MT_MPX4250A", "MT_BOSCH_2_5", "MT_MAZDA_1_BAR", "MT_GM_2_BAR", "MT_GM_1_BAR", "MT_MPXH6400" #define air_pressure_sensor_type_e_Force_4_bytes_size_cranking_map_type ENUM_32_BITS @@ -211,10 +211,10 @@ #define boostPid_periodMs_offset 926 #define boostPid_pFactor_offset 912 #define boostPwmFrequency_offset 936 -#define boostRpmBins_offset 6624 -#define boostTableClosedLoop_offset 6632 -#define boostTableOpenLoop_offset 6560 -#define boostTpsBins_offset 6696 +#define boostRpmBins_offset 5332 +#define boostTableClosedLoop_offset 5340 +#define boostTableOpenLoop_offset 5268 +#define boostTpsBins_offset 5404 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_e_CLOSED_LOOP 1 #define boostType_e_Force_4bytes_size_boostType_e ENUM_32_BITS @@ -515,12 +515,12 @@ #define clt_tempC_2_offset 344 #define clt_tempC_3_offset 348 #define CLT_TIMING_CURVE_SIZE 8 -#define cltCrankingCorr_offset 6816 -#define cltCrankingCorrBins_offset 6784 -#define cltFuelCorr_offset 14992 -#define cltFuelCorrBins_offset 14928 -#define cltIdleCorr_offset 15376 -#define cltIdleCorrBins_offset 15312 +#define cltCrankingCorr_offset 5524 +#define cltCrankingCorrBins_offset 5492 +#define cltFuelCorr_offset 13700 +#define cltFuelCorrBins_offset 13636 +#define cltIdleCorr_offset 14084 +#define cltIdleCorrBins_offset 14020 #define cltIdleRpm_offset 1656 #define cltIdleRpmBins_offset 1592 #define cltRevLimitRpm_offset 2924 @@ -608,10 +608,10 @@ #define cranking_rpm_offset 180 #define crankingAdvance_offset 2716 #define crankingAdvanceBins_offset 2700 -#define crankingCycleBins_offset 15280 -#define crankingCycleCoef_offset 15248 -#define crankingFuelBins_offset 15216 -#define crankingFuelCoef_offset 15184 +#define crankingCycleBins_offset 13988 +#define crankingCycleCoef_offset 13956 +#define crankingFuelBins_offset 13924 +#define crankingFuelCoef_offset 13892 #define crankingIACposition_offset 1848 #define crankingInjectionMode_offset 436 #define crankingTimingAngle_offset 448 @@ -620,6 +620,7 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1260 #define cutSparkOnHardLimit_offset 1260 +#define cyl_trim_s_size 16 #define cylinderBankSelect10_offset 3493 #define cylinderBankSelect11_offset 3494 #define cylinderBankSelect12_offset 3495 @@ -744,7 +745,7 @@ #define enableTrailingSparks_offset 164 #define enableVerboseCan2Tx_offset 1740 #define enableVerboseCanTx_offset 748 -#define engine_configuration_s_size 6312 +#define engine_configuration_s_size 5020 #define engine_load_mode_e_auto_enum "INVALID", "INVALID", "INVALID", "LM_SPEED_DENSITY", "LM_REAL_MAF", "LM_ALPHA_N", "LM_LUA", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "LM_MOCK" #define engine_load_mode_e_enum "INVALID", "INVALID", "INVALID", "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" #define engine_load_mode_e_Force_4_bytes_size_engine_load_mode ENUM_32_BITS @@ -981,6 +982,32 @@ #define fuelTrim7_offset 4086 #define fuelTrim8_offset 4087 #define fuelTrim9_offset 4088 +#define fuelTrimLoadBins_offset 22836 +#define fuelTrimRpmBins_offset 22844 +#define fuelTrims10_offset 22996 +#define fuelTrims10_table_offset 22996 +#define fuelTrims11_offset 23012 +#define fuelTrims11_table_offset 23012 +#define fuelTrims12_offset 23028 +#define fuelTrims12_table_offset 23028 +#define fuelTrims1_offset 22852 +#define fuelTrims1_table_offset 22852 +#define fuelTrims2_offset 22868 +#define fuelTrims2_table_offset 22868 +#define fuelTrims3_offset 22884 +#define fuelTrims3_table_offset 22884 +#define fuelTrims4_offset 22900 +#define fuelTrims4_table_offset 22900 +#define fuelTrims5_offset 22916 +#define fuelTrims5_table_offset 22916 +#define fuelTrims6_offset 22932 +#define fuelTrims6_table_offset 22932 +#define fuelTrims7_offset 22948 +#define fuelTrims7_table_offset 22948 +#define fuelTrims8_offset 22964 +#define fuelTrims8_table_offset 22964 +#define fuelTrims9_offset 22980 +#define fuelTrims9_table_offset 22980 #define GAP_TRACKING_LENGTH 18 #define gapTrackingLengthOverride_offset 456 #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" @@ -1255,8 +1282,8 @@ #define iat_tempC_1_offset 372 #define iat_tempC_2_offset 376 #define iat_tempC_3_offset 380 -#define iatFuelCorr_offset 15120 -#define iatFuelCorrBins_offset 15056 +#define iatFuelCorr_offset 13828 +#define iatFuelCorrBins_offset 13764 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 704 #define idle_derivativeFilterLoss_offset 524 @@ -1279,8 +1306,8 @@ #define idle_stepperDirectionPin_offset 613 #define idle_stepperStepPin_offset 614 #define IDLE_VE_CURVE_SIZE 8 -#define idleAdvance_offset 6856 -#define idleAdvanceBins_offset 6848 +#define idleAdvance_offset 5564 +#define idleAdvanceBins_offset 5556 #define idleIncrementalPidCic_offset 748 #define idleMode_offset 1268 #define idlePidActivationTime_offset 2188 @@ -1319,8 +1346,8 @@ #define idleTimingPid_periodMs_offset 3458 #define idleTimingPid_pFactor_offset 3444 #define idleTimingPidDeadZone_offset 3464 -#define idleVe_offset 6896 -#define idleVeBins_offset 6888 +#define idleVe_offset 5604 +#define idleVeBins_offset 5596 #define IGN_LOAD_COUNT 16 #define IGN_RPM_COUNT 16 #define ignition_mode_e_auto_enum "IM_ONE_COIL", "IM_INDIVIDUAL_COILS", "IM_WASTED_SPARK", "IM_TWO_COILS" @@ -1330,10 +1357,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 188 -#define ignitionIatCorrLoadBins_offset 18512 -#define ignitionIatCorrRpmBins_offset 18576 -#define ignitionIatCorrTable_offset 17488 -#define ignitionLoadBins_offset 21712 +#define ignitionIatCorrLoadBins_offset 17220 +#define ignitionIatCorrRpmBins_offset 17284 +#define ignitionIatCorrTable_offset 16196 +#define ignitionLoadBins_offset 20260 #define ignitionMode_offset 452 #define ignitionPinMode_offset 657 #define ignitionPins10_offset 653 @@ -1348,9 +1375,35 @@ #define ignitionPins7_offset 650 #define ignitionPins8_offset 651 #define ignitionPins9_offset 652 -#define ignitionRpmBins_offset 21776 -#define ignitionTable_offset 20688 +#define ignitionRpmBins_offset 20292 +#define ignitionTable_offset 19236 #define ignOverrideMode_offset 1752 +#define ignTrimLoadBins_offset 22628 +#define ignTrimRpmBins_offset 22636 +#define ignTrims10_offset 22788 +#define ignTrims10_table_offset 22788 +#define ignTrims11_offset 22804 +#define ignTrims11_table_offset 22804 +#define ignTrims12_offset 22820 +#define ignTrims12_table_offset 22820 +#define ignTrims1_offset 22644 +#define ignTrims1_table_offset 22644 +#define ignTrims2_offset 22660 +#define ignTrims2_table_offset 22660 +#define ignTrims3_offset 22676 +#define ignTrims3_table_offset 22676 +#define ignTrims4_offset 22692 +#define ignTrims4_table_offset 22692 +#define ignTrims5_offset 22708 +#define ignTrims5_table_offset 22708 +#define ignTrims6_offset 22724 +#define ignTrims6_table_offset 22724 +#define ignTrims7_offset 22740 +#define ignTrims7_table_offset 22740 +#define ignTrims8_offset 22756 +#define ignTrims8_table_offset 22756 +#define ignTrims9_offset 22772 +#define ignTrims9_table_offset 22772 #define imu_type_e_auto_enum "IMU_NONE", "IMU_VAG", "IMU_MM5_10", "IMU_TYPE_3", "IMU_TYPE_4" #define imu_type_e_IMU_MM5_10 2 #define imu_type_e_IMU_NONE 0 @@ -1369,7 +1422,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 440 -#define injectionPhase_offset 18640 +#define injectionPhase_offset 17316 #define injectionPinMode_offset 656 #define injectionPins10_offset 641 #define injectionPins11_offset 642 @@ -1409,8 +1462,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 796 #define injectorPressureType_offset 1753 -#define injPhaseLoadBins_offset 19664 -#define injPhaseRpmBins_offset 19728 +#define injPhaseLoadBins_offset 18340 +#define injPhaseRpmBins_offset 18372 #define invertCamVVTSignal_offset 896 #define invertPrimaryTriggerSignal_offset 1260 #define invertSecondaryTriggerSignal_offset 1260 @@ -1466,9 +1519,9 @@ #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 #define knockSamplingDuration_offset 2112 -#define lambdaLoadBins_offset 23248 -#define lambdaRpmBins_offset 23312 -#define lambdaTable_offset 22992 +#define lambdaLoadBins_offset 21668 +#define lambdaRpmBins_offset 21700 +#define lambdaTable_offset 21412 #define launchActivateDelay_offset 976 #define launchActivatePin_offset 911 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1524,7 +1577,7 @@ #define luaOutputPins6_offset 1141 #define luaOutputPins7_offset 1142 #define luaOutputPins8_offset 1143 -#define luaScript_offset 6928 +#define luaScript_offset 5636 #define MAF_DECODING_COUNT 256 #define maf_sensor_type_e_auto_enum "CUSTOM", "Bosch0280218037", "Bosch0280218004", "DensoTODO" #define maf_sensor_type_e_Bosch0280218004 2 @@ -1534,8 +1587,8 @@ #define maf_sensor_type_e_enum "v0", "v1", "v2", "v3" #define maf_sensor_type_e_Internal_ForceMyEnumIntSize_maf_sensor ENUM_32_BITS #define mafAdcChannel_offset 551 -#define mafDecoding_offset 15440 -#define mafDecodingBins_offset 16464 +#define mafDecoding_offset 14148 +#define mafDecodingBins_offset 15172 #define mafSensorType_offset 892 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 714 @@ -1569,9 +1622,9 @@ #define mapCamSkipFactor_offset 768 #define mapErrorDetectionTooHigh_offset 1540 #define mapErrorDetectionTooLow_offset 1536 -#define mapEstimateRpmBins_offset 20400 -#define mapEstimateTable_offset 19856 -#define mapEstimateTpsBins_offset 20368 +#define mapEstimateRpmBins_offset 19012 +#define mapEstimateTable_offset 18468 +#define mapEstimateTpsBins_offset 18980 #define mapHighValueVoltage_offset 1832 #define mapLowValueVoltage_offset 1828 #define mapMinBufferLength_offset 820 @@ -1667,11 +1720,11 @@ #define PACK_PERCENT_BYTE_MULT 100.0 #define pauseEtbControl_offset 748 #define PEDAL_TO_TPS_SIZE 8 -#define pedalToTpsPedalBins_offset 6768 -#define pedalToTpsRpmBins_offset 6776 -#define pedalToTpsTable_offset 6704 +#define pedalToTpsPedalBins_offset 5476 +#define pedalToTpsRpmBins_offset 5484 +#define pedalToTpsTable_offset 5412 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 24400 +#define persistent_config_s_size 23044 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1778,18 +1831,18 @@ #define scriptSettingName6_offset 3300 #define scriptSettingName7_offset 3316 #define scriptSettingName8_offset 3332 -#define scriptTable1_offset 23696 -#define scriptTable1LoadBins_offset 23952 -#define scriptTable1RpmBins_offset 23984 -#define scriptTable2_offset 24016 -#define scriptTable2LoadBins_offset 24080 -#define scriptTable2RpmBins_offset 24112 -#define scriptTable3_offset 24144 -#define scriptTable3LoadBins_offset 24208 -#define scriptTable3RpmBins_offset 24240 -#define scriptTable4_offset 24272 -#define scriptTable4LoadBins_offset 24336 -#define scriptTable4RpmBins_offset 24368 +#define scriptTable1_offset 22052 +#define scriptTable1LoadBins_offset 22308 +#define scriptTable1RpmBins_offset 22324 +#define scriptTable2_offset 22340 +#define scriptTable2LoadBins_offset 22404 +#define scriptTable2RpmBins_offset 22420 +#define scriptTable3_offset 22436 +#define scriptTable3LoadBins_offset 22500 +#define scriptTable3RpmBins_offset 22516 +#define scriptTable4_offset 22532 +#define scriptTable4LoadBins_offset 22596 +#define scriptTable4RpmBins_offset 22612 #define scriptTableName1_offset 3156 #define scriptTableName2_offset 3172 #define scriptTableName3_offset 3188 @@ -1822,7 +1875,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 896 #define showSdCardWarning_offset 164 -#define SIGNATURE_HASH 59744767 +#define SIGNATURE_HASH 241264427 #define silentTriggerError_offset 1260 #define slowAdcAlpha_offset 1712 #define sparkDwellRpmBins_offset 54 @@ -1962,7 +2015,7 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 -#define tcuSolenoidTable_offset 19792 +#define tcuSolenoidTable_offset 18404 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 #define test557pin_offset 807 @@ -2012,7 +2065,7 @@ #define TORQUE_CURVE_SIZE 8 #define torqueRpmBins_offset 4602 #define torqueValues_offset 4594 -#define TOTAL_CONFIG_SIZE 24400 +#define TOTAL_CONFIG_SIZE 23044 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 #define tps1SecondaryMax_offset 830 @@ -2036,9 +2089,9 @@ #define tpsErrorDetectionTooLow_offset 172 #define tpsMax_offset 170 #define tpsMin_offset 168 -#define tpsTpsAccelFromRpmBins_offset 23632 -#define tpsTpsAccelTable_offset 23376 -#define tpsTpsAccelToRpmBins_offset 23664 +#define tpsTpsAccelFromRpmBins_offset 21988 +#define tpsTpsAccelTable_offset 21732 +#define tpsTpsAccelToRpmBins_offset 22020 #define trailingCoilPins10_offset 1965 #define trailingCoilPins11_offset 1966 #define trailingCoilPins12_offset 1967 @@ -2233,6 +2286,7 @@ #define triggerSimulatorPins1_offset 740 #define triggerSimulatorPins2_offset 741 #define triggerSimulatorPins3_offset 742 +#define TRIM_SIZE 4 #define TS_BURN_COMMAND 'B' #define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' @@ -2342,7 +2396,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.20.all.59744767" +#define TS_SIGNATURE "rusEFI 2021.12.21.all.241264427" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2461,7 +2515,7 @@ #define vehicleName_offset 1076 #define vehicleSpeedSensorInputPin_offset 794 #define vehicleWeight_offset 786 -#define veLoadBins_offset 22864 +#define veLoadBins_offset 21348 #define veOverrideMode_offset 1733 #define verboseCan2BaseAddress_offset 1736 #define verboseCan_offset 164 @@ -2469,8 +2523,8 @@ #define verboseTLE8888_offset 748 #define verboseTriggerSynchDetails_offset 1272 #define verboseVVTDecoding_offset 896 -#define veRpmBins_offset 22928 -#define veTable_offset 21840 +#define veRpmBins_offset 21380 +#define veTable_offset 20324 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2486,7 +2540,7 @@ #define vrThreshold2_pin_offset 1176 #define vrThreshold2_rpmBins_offset 1180 #define vrThreshold2_values_offset 1186 -#define vssFilterReciprocal_offset 19852 +#define vssFilterReciprocal_offset 18464 #define vssGearRatio_offset 624 #define vssToothCount_offset 626 #define vvt_mode_e_auto_enum "VVT_INACTIVE", "VVT_SECOND_HALF", "VVT_2JZ", "VVT_MIATA_NB2", "VVT_FIRST_HALF", "VVT_BOSCH_QUICK_START", "VVT_TOYOTA_4_1", "VVT_FORD_ST170", "VVT_BARRA_3_PLUS_1", "VVT_NISSAN_VQ", "VVT_HONDA_K", "VVT_NISSAN_MR", "VVT_12", "VVT_MAP_V_TWIN_ANOTHER" @@ -2520,13 +2574,13 @@ #define vvtPins2_offset 1841 #define vvtPins3_offset 1842 #define vvtPins4_offset 1843 -#define vvtTable1_offset 20432 -#define vvtTable1LoadBins_offset 20496 -#define vvtTable1RpmBins_offset 20528 -#define vvtTable2_offset 20560 -#define vvtTable2LoadBins_offset 20624 -#define vvtTable2RpmBins_offset 20656 -#define warning_message_offset 6312 +#define vvtTable1_offset 19044 +#define vvtTable1LoadBins_offset 19108 +#define vvtTable1RpmBins_offset 19124 +#define vvtTable2_offset 19140 +#define vvtTable2LoadBins_offset 19204 +#define vvtTable2RpmBins_offset 19220 +#define warning_message_offset 5020 #define warningLedPin_offset 1685 #define warningPeriod_offset 1290 #define wastegatePositionMax_offset 726 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index c29e7b3e19..df7d3df7c8 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 59744767 -#define TS_SIGNATURE "rusEFI 2021.12.20.all.59744767" +#define SIGNATURE_HASH 241264427 +#define TS_SIGNATURE "rusEFI 2021.12.21.all.241264427" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 32e35536fa..f2a0396587 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 524637400 -#define TS_SIGNATURE "rusEFI 2021.12.20.atlas.524637400" +#define SIGNATURE_HASH 313233932 +#define TS_SIGNATURE "rusEFI 2021.12.21.atlas.313233932" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 10d7fe8df5..0b3416caa9 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 59744767 -#define TS_SIGNATURE "rusEFI 2021.12.20.f429-discovery.59744767" +#define SIGNATURE_HASH 241264427 +#define TS_SIGNATURE "rusEFI 2021.12.21.f429-discovery.241264427" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 882ad16187..a53bc85fc1 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2042491926 -#define TS_SIGNATURE "rusEFI 2021.12.20.frankenso_na6.2042491926" +#define SIGNATURE_HASH 1951609538 +#define TS_SIGNATURE "rusEFI 2021.12.21.frankenso_na6.1951609538" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 617884856a..a3be3a345a 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2791149942 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen-nb1.2791149942" +#define SIGNATURE_HASH 2880657314 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen-nb1.2880657314" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index acd4698583..f9caf02bdd 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3087778654 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121nissan.3087778654" +#define SIGNATURE_HASH 3051685258 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen121nissan.3051685258" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 11452a263d..df8fa3d792 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1546421749 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen121vag.1546421749" +#define SIGNATURE_HASH 1371685665 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen121vag.1371685665" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 7f5943566b..dcc9545341 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2571749976 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen128.2571749976" +#define SIGNATURE_HASH 2493975692 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen128.2493975692" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 27f766dc9e..1e019cd6e8 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3482565971 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen154hyundai.3482565971" +#define SIGNATURE_HASH 3263003527 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen154hyundai.3263003527" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 810922098a..e6dc25e8a7 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 4147258959 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen72.4147258959" +#define SIGNATURE_HASH 4208779419 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen72.4208779419" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index b1447cacc7..0a9090caaf 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1128250300 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen81.1128250300" +#define SIGNATURE_HASH 1322351976 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen81.1322351976" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 599b735cc9..e05cb67991 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2723098784 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen88bmw.2723098784" +#define SIGNATURE_HASH 2946627188 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen88bmw.2946627188" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index b027bc277f..3db04d7932 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1974658903 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellenNA6.1974658903" +#define SIGNATURE_HASH 2019303811 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellenNA6.2019303811" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c7765531c3..23c390bceb 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 964314691 -#define TS_SIGNATURE "rusEFI 2021.12.20.hellen_cypress.964314691" +#define SIGNATURE_HASH 882147479 +#define TS_SIGNATURE "rusEFI 2021.12.21.hellen_cypress.882147479" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 83a5ee80f4..dda5fc0b01 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 3336538815 -#define TS_SIGNATURE "rusEFI 2021.12.20.kin.3336538815" +#define SIGNATURE_HASH 3409005675 +#define TS_SIGNATURE "rusEFI 2021.12.21.kin.3409005675" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ff38ea7338..a2bcc42715 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2963856203 -#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f4.2963856203" +#define SIGNATURE_HASH 3175488927 +#define TS_SIGNATURE "rusEFI 2021.12.21.mre_f4.3175488927" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 419cf1e1bb..1a4f758f6f 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2963856203 -#define TS_SIGNATURE "rusEFI 2021.12.20.mre_f7.2963856203" +#define SIGNATURE_HASH 3175488927 +#define TS_SIGNATURE "rusEFI 2021.12.21.mre_f7.3175488927" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6f55dda32f..c1f698089e 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1399158809 -#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_405.1399158809" +#define SIGNATURE_HASH 1586216653 +#define TS_SIGNATURE "rusEFI 2021.12.21.prometheus_405.1586216653" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index bd4837fb5c..428a643964 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1399158809 -#define TS_SIGNATURE "rusEFI 2021.12.20.prometheus_469.1399158809" +#define SIGNATURE_HASH 1586216653 +#define TS_SIGNATURE "rusEFI 2021.12.21.prometheus_469.1586216653" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e4bdc6d62e..04b68be502 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3216923216 -#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f4.3216923216" +#define SIGNATURE_HASH 2991627396 +#define TS_SIGNATURE "rusEFI 2021.12.21.proteus_f4.2991627396" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 35edbe45be..f9f9102d8f 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3216923216 -#define TS_SIGNATURE "rusEFI 2021.12.20.proteus_f7.3216923216" +#define SIGNATURE_HASH 2991627396 +#define TS_SIGNATURE "rusEFI 2021.12.21.proteus_f7.2991627396" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 8130efe700..ad30f0bb54 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3224745903 -#define TS_SIGNATURE "rusEFI 2021.12.20.subaru_eg33_f7.3224745903" +#define SIGNATURE_HASH 3453710715 +#define TS_SIGNATURE "rusEFI 2021.12.21.subaru_eg33_f7.3453710715" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index dde37c72c1..c81fae6b81 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.all.59744767" + signature = "rusEFI 2021.12.21.all.241264427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.all.59744767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.all.241264427" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:44 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3741,6 +3896,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4249,19 +4431,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 54ab97172b..9cccf8a406 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.atlas.524637400" + signature = "rusEFI 2021.12.21.atlas.313233932" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.atlas.524637400" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.atlas.313233932" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:42 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3741,6 +3896,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4249,19 +4431,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 408b953bbb..59e6dc4cef 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.f429-discovery.59744767" + signature = "rusEFI 2021.12.21.f429-discovery.241264427" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.f429-discovery.59744767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.f429-discovery.241264427" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:00 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3741,6 +3896,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4249,19 +4431,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 559da3cd09..040d4f0823 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.frankenso_na6.2042491926" + signature = "rusEFI 2021.12.21.frankenso_na6.1951609538" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.frankenso_na6.2042491926" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.frankenso_na6.1951609538" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:31 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3741,6 +3896,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4249,19 +4431,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index fcaa5b2cf9..df4382f1db 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen-nb1.2791149942" + signature = "rusEFI 2021.12.21.hellen-nb1.2880657314" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen-nb1.2791149942" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen-nb1.2880657314" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:21 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 71d073fb29..ffbd9a4808 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen121nissan.3087778654" + signature = "rusEFI 2021.12.21.hellen121nissan.3051685258" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen121nissan.3087778654" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen121nissan.3051685258" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:08 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c45ec490c0..2e348d5741 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen121vag.1546421749" + signature = "rusEFI 2021.12.21.hellen121vag.1371685665" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen121vag.1546421749" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen121vag.1371685665" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:06 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 7b76694087..5eac9d594d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen128.2571749976" + signature = "rusEFI 2021.12.21.hellen128.2493975692" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen128.2571749976" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen128.2493975692" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:03 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8e6db97e92..6b5b1aee70 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen154hyundai.3482565971" + signature = "rusEFI 2021.12.21.hellen154hyundai.3263003527" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen154hyundai.3482565971" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen154hyundai.3263003527" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:11 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index bc82960d36..0a66ca95f1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen72.4147258959" + signature = "rusEFI 2021.12.21.hellen72.4208779419" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen72.4147258959" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen72.4208779419" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:16 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index d7fb2f44ea..d387397934 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen81.1128250300" + signature = "rusEFI 2021.12.21.hellen81.1322351976" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen81.1128250300" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen81.1322351976" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:18 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3736,6 +3891,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4244,19 +4426,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 3d802de099..89c4ebea78 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen88bmw.2723098784" + signature = "rusEFI 2021.12.21.hellen88bmw.2946627188" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen88bmw.2723098784" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen88bmw.2946627188" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:12:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:13 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index cd613e6a6a..66ac39a7ed 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellenNA6.1974658903" + signature = "rusEFI 2021.12.21.hellenNA6.2019303811" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellenNA6.1974658903" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellenNA6.2019303811" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:23 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 1758357372..ba40a67c31 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.hellen_cypress.964314691" + signature = "rusEFI 2021.12.21.hellen_cypress.882147479" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.hellen_cypress.964314691" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.hellen_cypress.882147479" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:49 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3741,6 +3896,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4249,19 +4431,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 11c212ddcc..4f95c5be64 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.kin.3336538815" + signature = "rusEFI 2021.12.21.kin.3409005675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.kin.3336538815" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.kin.3409005675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Dec 20 19:13:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Dec 21 03:02:46 UTC 2021 -pageSize = 24372 +pageSize = 23016 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1221,84 +1221,112 @@ hpfpCompensationRpmBins = array, U08, 4556, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4566, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4574, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4590 = array, U08, 4590, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4592, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6284, 120 -afterstartCoolantBins = array, F32, 6404, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6436, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6468, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6500, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6532, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6596, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6604, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6668, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6676, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6740, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6748, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6756, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6788, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6820, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6828, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6860, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6868, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6900, 8000 -cltFuelCorrBins = array, F32, 14900, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14964, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15028, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15092, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15156, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15188, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15220, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15252, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15284, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15348, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15412, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16436, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17460, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18484, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18548, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18612, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19636, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19700, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19764, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19824, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19828, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20340, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20372, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20404, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20468, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20500, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20532, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20596, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20628, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20660, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21684, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21748, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21812, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22836, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22900, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4592, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 4992, 120 +afterstartCoolantBins = array, F32, 5112, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5144, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5176, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5208, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5240, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5304, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5312, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5376, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5384, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5448, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5456, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5464, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5496, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5528, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5536, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5568, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5576, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5608, 8000 +cltFuelCorrBins = array, F32, 13608, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13672, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13736, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13800, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13864, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13896, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13928, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13960, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 13992, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14056, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14120, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15144, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16168, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17192, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17256, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17288, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18312, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18344, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18376, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18436, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18440, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18952, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 18984, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19016, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19080, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19096, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19112, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19176, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19192, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19208, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20232, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20264, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20296, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21320, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21352, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22964, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21384, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22964, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21384, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23220, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23284, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23348, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23604, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23636, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23668, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23924, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23956, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 23988, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24052, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24084, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24116, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24180, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24212, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24244, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24308, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24340, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24372 +lambdaLoadBins = array, U16, 21640, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21672, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21704, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21960, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 21992, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22024, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22280, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22296, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22312, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22376, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22392, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22408, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22472, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22488, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22504, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22568, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22584, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22600, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22608, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22616, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22632, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22648, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22664, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22680, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22696, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22712, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22728, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22744, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22760, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22776, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22792, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22808, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22816, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22824, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22840, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22856, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22872, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22888, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22904, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22920, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22936, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22952, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22968, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 22984, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23000, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23016 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1745,13 +1773,6 @@ scriptTable4RpmBins = array, F32, 24340, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2806,6 +2827,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3532,7 +3685,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3574,7 +3726,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3707,6 +3862,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4216,19 +4398,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6b30461c08..67359b2ddb 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.mre_f4.2963856203" + signature = "rusEFI 2021.12.21.mre_f4.3175488927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.mre_f4.2963856203" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.mre_f4.3175488927" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:28 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3738,6 +3893,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4246,19 +4428,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 19785fff3a..355639983b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.mre_f7.2963856203" + signature = "rusEFI 2021.12.21.mre_f7.3175488927" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.mre_f7.2963856203" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.mre_f7.3175488927" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:26 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3738,6 +3893,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4246,19 +4428,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a7136e5d19..0ac042c18c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.prometheus_405.1399158809" + signature = "rusEFI 2021.12.21.prometheus_405.1586216653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.prometheus_405.1399158809" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.prometheus_405.1586216653" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:35 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3736,6 +3891,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4244,19 +4426,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b9bc755412..5538d4c0d7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.prometheus_469.1399158809" + signature = "rusEFI 2021.12.21.prometheus_469.1586216653" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.prometheus_469.1399158809" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.prometheus_469.1586216653" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:33 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3736,6 +3891,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4244,19 +4426,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b206853aea..eecebf7982 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.proteus_f4.3216923216" + signature = "rusEFI 2021.12.21.proteus_f4.2991627396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.proteus_f4.3216923216" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.proteus_f4.2991627396" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:40 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3733,6 +3888,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4242,19 +4424,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 8f2a07f126..3c6bf55d8c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.proteus_f7.3216923216" + signature = "rusEFI 2021.12.21.proteus_f7.2991627396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.proteus_f7.3216923216" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.proteus_f7.2991627396" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:38 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3733,6 +3888,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4242,19 +4424,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 4003dae7d5..a044e42369 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.12.20.subaru_eg33_f7.3224745903" + signature = "rusEFI 2021.12.21.subaru_eg33_f7.3453710715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.20.subaru_eg33_f7.3224745903" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.21.subaru_eg33_f7.3453710715" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:51 UTC 2021 -pageSize = 24400 +pageSize = 23044 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1243,84 +1243,112 @@ hpfpCompensationRpmBins = array, U08, 4584, [10], "RPM", 50.0, 0, 0, 12500, 0 torqueValues = array, U08, 4594, [8], "Nm", 10.0, 0, 0, 255, 0 torqueRpmBins = array, U16, 4602, [8], "RPM", 1, 0, 0, 65000, 0 alignmentFill_at_4618 = array, U08, 4618, [2], "units", 1, 0, -20, 100, 0 -mainUnusedEnd = array, S32, 4620, [423], "units", 1, 0, -20, 100, 0 -warning_message = string, ASCII, 6312, 120 -afterstartCoolantBins = array, F32, 6432, [8], "C", 1, 0, -100, 250, 0 -afterstartHoldTime = array, F32, 6464, [8], "Seconds", 1, 0, 0, 100, 1 -afterstartEnrich = array, F32, 6496, [8], "%", 1, 0, 0, 600, 1 -afterstartDecayTime = array, F32, 6528, [8], "Seconds", 1, 0, 0, 100, 1 -boostTableOpenLoop = array, U08, 6560, [8x8], "", 2.0, 0 , 0, 100, 0 -boostRpmBins = array, U08, 6624, [8], "RPM", 50.0, 0, 0, 12000, 0 -boostTableClosedLoop = array, U08, 6632, [8x8], "", 2.0, 0 , 0, 3000, 0 -boostTpsBins = array, U08, 6696, [8], "%", 2.0, 0, 0, 100, 2 -pedalToTpsTable = array, U08, 6704, [8x8], "%", 1, 0, 0, 100, 0 -pedalToTpsPedalBins = array, U08, 6768, [8], "%", 1, 0, 0, 120, 0 -pedalToTpsRpmBins = array, U08, 6776, [8], "RPM", 50.0, 0, 0, 12000, 0 -cltCrankingCorrBins = array, F32, 6784, [8], "C", 1, 0, -100, 250, 2 -cltCrankingCorr = array, F32, 6816, [8], "%", 1, 0, 0, 500, 2 -idleAdvanceBins = array, U08, 6848, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleAdvance = array, F32, 6856, [8], "deg", 1, 0, -20, 90, 2 -idleVeBins = array, U08, 6888, [8], "RPM", 50.0, 0, 0, 18000, 2 -idleVe = array, F32, 6896, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6928, 8000 -cltFuelCorrBins = array, F32, 14928, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 14992, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 15184, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 15216, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 15248, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 15280, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 15312, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 15376, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 15440, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 16464, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 17488, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 18512, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 18576, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 18640, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 19664, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 19728, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 19792, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 19852, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 19856, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 20368, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 20400, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 20432, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 20496, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 20528, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 20560, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 20624, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 20656, [8], "RPM", 1, 0, 0, 25500, 2 -ignitionTable = array, F32, 20688, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 21712, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 21776, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 21840, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 22864, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 22928, [16], "RPM", 1, 0, 0, 18000, 2 +mainUnusedEnd = array, S32, 4620, [100], "units", 1, 0, 0, 1, 0 +warning_message = string, ASCII, 5020, 120 +afterstartCoolantBins = array, F32, 5140, [8], "C", 1, 0, -100, 250, 0 +afterstartHoldTime = array, F32, 5172, [8], "Seconds", 1, 0, 0, 100, 1 +afterstartEnrich = array, F32, 5204, [8], "%", 1, 0, 0, 600, 1 +afterstartDecayTime = array, F32, 5236, [8], "Seconds", 1, 0, 0, 100, 1 +boostTableOpenLoop = array, U08, 5268, [8x8], "", 2.0, 0 , 0, 100, 0 +boostRpmBins = array, U08, 5332, [8], "RPM", 50.0, 0, 0, 12000, 0 +boostTableClosedLoop = array, U08, 5340, [8x8], "", 2.0, 0 , 0, 3000, 0 +boostTpsBins = array, U08, 5404, [8], "%", 2.0, 0, 0, 100, 2 +pedalToTpsTable = array, U08, 5412, [8x8], "%", 1, 0, 0, 100, 0 +pedalToTpsPedalBins = array, U08, 5476, [8], "%", 1, 0, 0, 120, 0 +pedalToTpsRpmBins = array, U08, 5484, [8], "RPM", 50.0, 0, 0, 12000, 0 +cltCrankingCorrBins = array, F32, 5492, [8], "C", 1, 0, -100, 250, 2 +cltCrankingCorr = array, F32, 5524, [8], "%", 1, 0, 0, 500, 2 +idleAdvanceBins = array, U08, 5556, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleAdvance = array, F32, 5564, [8], "deg", 1, 0, -20, 90, 1 +idleVeBins = array, U08, 5596, [8], "RPM", 50.0, 0, 0, 18000, 0 +idleVe = array, F32, 5604, [8], "%", 1, 0, 0, 999, 1 +luaScript = string, ASCII, 5636, 8000 +cltFuelCorrBins = array, F32, 13636, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 13700, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 13764, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 13828, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 13892, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 13924, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 13956, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 13988, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 14020, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 14084, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 14148, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 15172, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 16196, [16x16], "deg", 1, 0, -720, 720, 1 +ignitionIatCorrLoadBins = array, F32, 17220, [16], "Temperature", 1, 0, 0, 500, 0 +ignitionIatCorrRpmBins = array, U16, 17284, [16], "RPM", 1, 0, 0, 18000, 0 +injectionPhase = array, F32, 17316, [16x16], "deg", 1, 0, -720, 720, 0 +injPhaseLoadBins = array, U16, 18340, [16], "Load", 1, 0, 0, 500, 0 +injPhaseRpmBins = array, U16, 18372, [16], "RPM", 1, 0, 0, 18000, 0 +tcuSolenoidTable = array, U08, 18404, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 18464, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 18468, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 18980, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 19012, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 19044, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, U16, 19108, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, U16, 19124, [8], "RPM", 1, 0, 0, 18000, 0 +vvtTable2 = array, U08, 19140, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, U16, 19204, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, U16, 19220, [8], "RPM", 1, 0, 0, 18000, 0 +ignitionTable = array, F32, 19236, [16x16], "deg", 1, 0, -20, 90, 1 +ignitionLoadBins = array, U16, 20260, [16], "Load", 1, 0, 0, 500, 0 +ignitionRpmBins = array, U16, 20292, [16], "RPM", 1, 0, 0, 18000, 0 +veTable = array, F32, 20324, [16x16], "%", 1, 0, 0, 999, 1 +veLoadBins = array, U16, 21348, [16], "kPa", 1, 0, 0, 400, 0 +veRpmBins = array, U16, 21380, [16], "RPM", 1, 0, 0, 18000, 0 #if LAMBDA -lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 21412, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 21412, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 23248, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 23312, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 23376, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 23632, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 23664, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 23696, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 23952, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 23984, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 24016, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 24080, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 24112, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 24144, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 24208, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 24240, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 24272, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 24336, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 24400 +lambdaLoadBins = array, U16, 21668, [16], "", 1, 0, 0, 500, 0 +lambdaRpmBins = array, U16, 21700, [16], "RPM", 1, 0, 0, 18000, 0 +tpsTpsAccelTable = array, F32, 21732, [8x8], "value", 1, 0, 0, 30000, 2 +tpsTpsAccelFromRpmBins = array, F32, 21988, [8], "from", 1, 0, 0, 30000, 2 +tpsTpsAccelToRpmBins = array, F32, 22020, [8], "to", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 22052, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, U16, 22308, [8], "L", 1, 0, 0, 30000, 0 +scriptTable1RpmBins = array, U16, 22324, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable2 = array, U08, 22340, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, U16, 22404, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, U16, 22420, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable3 = array, U08, 22436, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, U16, 22500, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, U16, 22516, [8], "RPM", 1, 0, 0, 25500, 0 +scriptTable4 = array, U08, 22532, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, U16, 22596, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, U16, 22612, [8], "RPM", 1, 0, 0, 25500, 0 +ignTrimLoadBins = array, U16, 22628, [4], "", 1, 0, 0, 400, 0 +ignTrimRpmBins = array, U16, 22636, [4], "rpm", 1, 0, 0, 20000, 0 +ignTrims1_table = array, S08, 22644, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims2_table = array, S08, 22660, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims3_table = array, S08, 22676, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims4_table = array, S08, 22692, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims5_table = array, S08, 22708, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims6_table = array, S08, 22724, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims7_table = array, S08, 22740, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims8_table = array, S08, 22756, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims9_table = array, S08, 22772, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims10_table = array, S08, 22788, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims11_table = array, S08, 22804, [4x4], "", 0.2, 0, -25, 25, 1 +ignTrims12_table = array, S08, 22820, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrimLoadBins = array, U16, 22836, [4], "", 1, 0, 0, 400, 0 +fuelTrimRpmBins = array, U16, 22844, [4], "rpm", 1, 0, 0, 20000, 0 +fuelTrims1_table = array, S08, 22852, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims2_table = array, S08, 22868, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims3_table = array, S08, 22884, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims4_table = array, S08, 22900, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims5_table = array, S08, 22916, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims6_table = array, S08, 22932, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims7_table = array, S08, 22948, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims8_table = array, S08, 22964, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims9_table = array, S08, 22980, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims10_table = array, S08, 22996, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims11_table = array, S08, 23012, [4x4], "", 0.2, 0, -25, 25, 1 +fuelTrims12_table = array, S08, 23028, [4x4], "", 0.2, 0, -25, 25, 1 +; total TS size = 23044 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -1779,13 +1807,6 @@ scriptTable4RpmBins = array, F32, 24368, [8], "RPM", 1, 0, 0, 25500, 2 cltIdleCorr = "CLT-based idle position multiplier for simple manual idle controller" mafDecoding = "Also known as MAF transfer function.\nkg/hour value.\nBy the way 2.081989116 kg/h = 1 ft3/m" vssFilterReciprocal = "Good example: number of tooth on wheel, For Can 10 is a good number." - vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2840,6 +2861,138 @@ etbStatus_resetCounter = scalar, S32, 636, "", 1, 0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" + table = fuelTrimTbl1, fuelTrimMap1, "Fuel trim cyl 1", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims1_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl2, fuelTrimMap2, "Fuel trim cyl 2", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims2_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl3, fuelTrimMap3, "Fuel trim cyl 3", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims3_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl4, fuelTrimMap4, "Fuel trim cyl 4", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims4_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl5, fuelTrimMap5, "Fuel trim cyl 5", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims5_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl6, fuelTrimMap6, "Fuel trim cyl 6", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims6_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl7, fuelTrimMap7, "Fuel trim cyl 7", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims7_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl8, fuelTrimMap8, "Fuel trim cyl 8", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims8_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl9, fuelTrimMap9, "Fuel trim cyl 9", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims9_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl10, fuelTrimMap10, "Fuel trim cyl 10", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims10_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl11, fuelTrimMap11, "Fuel trim cyl 11", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims11_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = fuelTrimTbl12, fuelTrimMap12, "Fuel trim cyl 12", 1 + xBins = fuelTrimRpmBins, RPMValue + yBins = fuelTrimLoadBins, veTableYAxis + zBins = fuelTrims12_table + upDownLabel = "(RICHER)", "(LEANER)" + + table = ignTrimTbl1, ignTrimMap1, "Ign trim cyl 1", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims1_table + + table = ignTrimTbl2, ignTrimMap2, "Ign trim cyl 2", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims2_table + + table = ignTrimTbl3, ignTrimMap3, "Ign trim cyl 3", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims3_table + + table = ignTrimTbl4, ignTrimMap4, "Ign trim cyl 4", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims4_table + + table = ignTrimTbl5, ignTrimMap5, "Ign trim cyl 5", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims5_table + + table = ignTrimTbl6, ignTrimMap6, "Ign trim cyl 6", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims6_table + + table = ignTrimTbl7, ignTrimMap7, "Ign trim cyl 7", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims7_table + + table = ignTrimTbl8, ignTrimMap8, "Ign trim cyl 8", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims8_table + + table = ignTrimTbl9, ignTrimMap9, "Ign trim cyl 9", 1 + xBins =ignTrimRpmBins, RPMValue + yBins =ignTrimLoadBins, ignitionLoad + zBins =ignTrims9_table + + table = ignTrimTbl10, ignTrimMap10, "Ign trim cyl 10", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims10_table + + table = ignTrimTbl11, ignTrimMap11, "Ign trim cyl 11", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims11_table + + table = ignTrimTbl12, ignTrimMap12, "Ign trim cyl 12", 1 + xBins = ignTrimRpmBins, RPMValue + yBins = ignTrimLoadBins, ignitionLoad + zBins = ignTrims12_table + table = mapEstimateTableTbl, mapEstimateTableMap, "MAP Estimate", 1 xBins = mapEstimateRpmBins, RPMValue yBins = mapEstimateTpsBins, TPSValue @@ -3566,7 +3719,6 @@ menuDialog = main subMenu = std_separator subMenu = dwellSettings, "Dwell", 0, {isIgnitionEnabled == 1} - subMenu = ignitionCylExtra, "Ignition cylinder trim", 0, {isIgnitionEnabled == 1} subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = std_separator @@ -3608,7 +3760,10 @@ menuDialog = main subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} menu = "&Advanced" - subMenu = boostDialog, "Boost Control" + subMenu = ignitionCylExtra, "Cylinder offsets", 0 + + subMenu = std_separator + subMenu = boostDialog, "Boost Control" subMenu = boostOpenLoopDialog, "Boost Control Open Loop", { isBoostControlEnabled && boostType == 0 } subMenu = boostPidDialog, "Boost Control Closed Loop PID", { isBoostControlEnabled && boostType == 1 } subMenu = boostTargetDialog, "Boost Control Closed Loop Target", { isBoostControlEnabled && boostType == 1 } @@ -3737,6 +3892,33 @@ menuDialog = main # subMenu = antiLag, "Antilag Setup" # subMenu = std_separator + groupMenu = "Cylinder fuel trims" + groupChildMenu = fuelTrimTbl1, "Fuel trim cyl 1" + groupChildMenu = fuelTrimTbl2, "Fuel trim cyl 2" + groupChildMenu = fuelTrimTbl3, "Fuel trim cyl 3" + groupChildMenu = fuelTrimTbl4, "Fuel trim cyl 4" + groupChildMenu = fuelTrimTbl5, "Fuel trim cyl 5" + groupChildMenu = fuelTrimTbl6, "Fuel trim cyl 6" + groupChildMenu = fuelTrimTbl7, "Fuel trim cyl 7" + groupChildMenu = fuelTrimTbl8, "Fuel trim cyl 8" + groupChildMenu = fuelTrimTbl9, "Fuel trim cyl 9" + groupChildMenu = fuelTrimTbl10, "Fuel trim cyl 10" + groupChildMenu = fuelTrimTbl11, "Fuel trim cyl 11" + groupChildMenu = fuelTrimTbl12, "Fuel trim cyl 12" + + groupMenu = "Cylinder ign trims" + groupChildMenu = ignTrimTbl1, "Ignition trim cyl 1" + groupChildMenu = ignTrimTbl2, "Ignition trim cyl 2" + groupChildMenu = ignTrimTbl3, "Ignition trim cyl 3" + groupChildMenu = ignTrimTbl4, "Ignition trim cyl 4" + groupChildMenu = ignTrimTbl5, "Ignition trim cyl 5" + groupChildMenu = ignTrimTbl6, "Ignition trim cyl 6" + groupChildMenu = ignTrimTbl7, "Ignition trim cyl 7" + groupChildMenu = ignTrimTbl8, "Ignition trim cyl 8" + groupChildMenu = ignTrimTbl9, "Ignition trim cyl 9" + groupChildMenu = ignTrimTbl10, "Ignition trim cyl 10" + groupChildMenu = ignTrimTbl11, "Ignition trim cyl 11" + groupChildMenu = ignTrimTbl12, "Ignition trim cyl 12" menu = "Help" subMenu = helpGeneral, "rusEFI Info" @@ -4245,19 +4427,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = fuelParams panel = injectorsDeadTime - dialog = ignitionCylExtra, "Ignition Cylinder Extra Timing" - field = "Extra cyl #1", timing_offset_cylinder1 - field = "Extra cyl #2", timing_offset_cylinder2, {cylindersCount > 1} - field = "Extra cyl #3", timing_offset_cylinder3, {cylindersCount > 2} - field = "Extra cyl #4", timing_offset_cylinder4, {cylindersCount > 3} - field = "Extra cyl #5", timing_offset_cylinder5, {cylindersCount > 4} - field = "Extra cyl #6", timing_offset_cylinder6, {cylindersCount > 5} - field = "Extra cyl #7", timing_offset_cylinder7, {cylindersCount > 6} - field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} - field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} - field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} - field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} + dialog = ignitionCylExtra, "Cylinder offsets" + field = "Offset angle for each cylinder if you have an odd fire" + field = "engine, like a v-twin or some V6/V10 engines" + field = "#Positive numbers retard, negative numbers advance" + field = "Offset cyl 1", timing_offset_cylinder1 + field = "Offset cyl 2", timing_offset_cylinder2, {cylindersCount > 1} + field = "Offset cyl 3", timing_offset_cylinder3, {cylindersCount > 2} + field = "Offset cyl 4", timing_offset_cylinder4, {cylindersCount > 3} + field = "Offset cyl 5", timing_offset_cylinder5, {cylindersCount > 4} + field = "Offset cyl 6", timing_offset_cylinder6, {cylindersCount > 5} + field = "Offset cyl 7", timing_offset_cylinder7, {cylindersCount > 6} + field = "Offset cyl 8", timing_offset_cylinder8, {cylindersCount > 7} + field = "Offset cyl 9", timing_offset_cylinder9, {cylindersCount > 8} + field = "Offset cyl 10", timing_offset_cylinder10, {cylindersCount > 9} + field = "Offset cyl 11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Offset cyl 12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" field = "Spark duration", multisparkSparkDuration, {multisparkEnable} diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 1cad945b86..20e74bf38d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Dec 20 19:13:41 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Dec 21 03:02:54 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -58,10 +58,10 @@ public class Fields { public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; - public static final int afterstartCoolantBins_offset = 6432; - public static final int afterstartDecayTime_offset = 6528; - public static final int afterstartEnrich_offset = 6496; - public static final int afterstartHoldTime_offset = 6464; + public static final int afterstartCoolantBins_offset = 5140; + public static final int afterstartDecayTime_offset = 5236; + public static final int afterstartEnrich_offset = 5204; + public static final int afterstartHoldTime_offset = 5172; public static final int air_pressure_sensor_config_s_size = 16; public static final int air_pressure_sensor_type_e_MT_BOSCH_2_5 = 10; public static final int air_pressure_sensor_type_e_MT_CUSTOM = 0; @@ -204,10 +204,10 @@ public class Fields { public static final int boostPid_periodMs_offset = 926; public static final int boostPid_pFactor_offset = 912; public static final int boostPwmFrequency_offset = 936; - public static final int boostRpmBins_offset = 6624; - public static final int boostTableClosedLoop_offset = 6632; - public static final int boostTableOpenLoop_offset = 6560; - public static final int boostTpsBins_offset = 6696; + public static final int boostRpmBins_offset = 5332; + public static final int boostTableClosedLoop_offset = 5340; + public static final int boostTableOpenLoop_offset = 5268; + public static final int boostTpsBins_offset = 5404; public static final int boostType_e_CLOSED_LOOP = 1; public static final int boostType_e_OPEN_LOOP = 0; public static final int boostType_offset = 932; @@ -496,12 +496,12 @@ public class Fields { public static final int clt_tempC_2_offset = 344; public static final int clt_tempC_3_offset = 348; public static final int CLT_TIMING_CURVE_SIZE = 8; - public static final int cltCrankingCorr_offset = 6816; - public static final int cltCrankingCorrBins_offset = 6784; - public static final int cltFuelCorr_offset = 14992; - public static final int cltFuelCorrBins_offset = 14928; - public static final int cltIdleCorr_offset = 15376; - public static final int cltIdleCorrBins_offset = 15312; + public static final int cltCrankingCorr_offset = 5524; + public static final int cltCrankingCorrBins_offset = 5492; + public static final int cltFuelCorr_offset = 13700; + public static final int cltFuelCorrBins_offset = 13636; + public static final int cltIdleCorr_offset = 14084; + public static final int cltIdleCorrBins_offset = 14020; public static final int cltIdleRpm_offset = 1656; public static final int cltIdleRpmBins_offset = 1592; public static final int cltRevLimitRpm_offset = 2924; @@ -588,10 +588,10 @@ public class Fields { public static final int cranking_rpm_offset = 180; public static final int crankingAdvance_offset = 2716; public static final int crankingAdvanceBins_offset = 2700; - public static final int crankingCycleBins_offset = 15280; - public static final int crankingCycleCoef_offset = 15248; - public static final int crankingFuelBins_offset = 15216; - public static final int crankingFuelCoef_offset = 15184; + public static final int crankingCycleBins_offset = 13988; + public static final int crankingCycleCoef_offset = 13956; + public static final int crankingFuelBins_offset = 13924; + public static final int crankingFuelCoef_offset = 13892; public static final int crankingIACposition_offset = 1848; public static final int crankingInjectionMode_offset = 436; public static final int crankingTimingAngle_offset = 448; @@ -600,6 +600,7 @@ public class Fields { public static final String CRITICAL_PREFIX = "CRITICAL"; public static final int cutFuelOnHardLimit_offset = 1260; public static final int cutSparkOnHardLimit_offset = 1260; + public static final int cyl_trim_s_size = 16; public static final int cylinderBankSelect10_offset = 3493; public static final int cylinderBankSelect11_offset = 3494; public static final int cylinderBankSelect12_offset = 3495; @@ -716,7 +717,7 @@ public class Fields { public static final int enableTrailingSparks_offset = 164; public static final int enableVerboseCan2Tx_offset = 1740; public static final int enableVerboseCanTx_offset = 748; - public static final int engine_configuration_s_size = 6312; + public static final int engine_configuration_s_size = 5020; public static final int engine_load_mode_e_LM_ALPHA_N = 5; public static final int engine_load_mode_e_LM_LUA = 6; public static final int engine_load_mode_e_LM_MOCK = 100; @@ -947,6 +948,32 @@ public class Fields { public static final int fuelTrim7_offset = 4086; public static final int fuelTrim8_offset = 4087; public static final int fuelTrim9_offset = 4088; + public static final int fuelTrimLoadBins_offset = 22836; + public static final int fuelTrimRpmBins_offset = 22844; + public static final int fuelTrims10_offset = 22996; + public static final int fuelTrims10_table_offset = 22996; + public static final int fuelTrims11_offset = 23012; + public static final int fuelTrims11_table_offset = 23012; + public static final int fuelTrims12_offset = 23028; + public static final int fuelTrims12_table_offset = 23028; + public static final int fuelTrims1_offset = 22852; + public static final int fuelTrims1_table_offset = 22852; + public static final int fuelTrims2_offset = 22868; + public static final int fuelTrims2_table_offset = 22868; + public static final int fuelTrims3_offset = 22884; + public static final int fuelTrims3_table_offset = 22884; + public static final int fuelTrims4_offset = 22900; + public static final int fuelTrims4_table_offset = 22900; + public static final int fuelTrims5_offset = 22916; + public static final int fuelTrims5_table_offset = 22916; + public static final int fuelTrims6_offset = 22932; + public static final int fuelTrims6_table_offset = 22932; + public static final int fuelTrims7_offset = 22948; + public static final int fuelTrims7_table_offset = 22948; + public static final int fuelTrims8_offset = 22964; + public static final int fuelTrims8_table_offset = 22964; + public static final int fuelTrims9_offset = 22980; + public static final int fuelTrims9_table_offset = 22980; public static final int GAP_TRACKING_LENGTH = 18; public static final int gapTrackingLengthOverride_offset = 456; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; @@ -1217,8 +1244,8 @@ public class Fields { public static final int iat_tempC_1_offset = 372; public static final int iat_tempC_2_offset = 376; public static final int iat_tempC_3_offset = 380; - public static final int iatFuelCorr_offset = 15120; - public static final int iatFuelCorrBins_offset = 15056; + public static final int iatFuelCorr_offset = 13828; + public static final int iatFuelCorrBins_offset = 13764; public static final int IDLE_ADVANCE_CURVE_SIZE = 8; public static final int idle_antiwindupFreq_offset = 704; public static final int idle_derivativeFilterLoss_offset = 524; @@ -1238,8 +1265,8 @@ public class Fields { public static final int idle_stepperDirectionPin_offset = 613; public static final int idle_stepperStepPin_offset = 614; public static final int IDLE_VE_CURVE_SIZE = 8; - public static final int idleAdvance_offset = 6856; - public static final int idleAdvanceBins_offset = 6848; + public static final int idleAdvance_offset = 5564; + public static final int idleAdvanceBins_offset = 5556; public static final int idleIncrementalPidCic_offset = 748; public static final int idleMode_offset = 1268; public static final int idlePidActivationTime_offset = 2188; @@ -1278,8 +1305,8 @@ public class Fields { public static final int idleTimingPid_periodMs_offset = 3458; public static final int idleTimingPid_pFactor_offset = 3444; public static final int idleTimingPidDeadZone_offset = 3464; - public static final int idleVe_offset = 6896; - public static final int idleVeBins_offset = 6888; + public static final int idleVe_offset = 5604; + public static final int idleVeBins_offset = 5596; public static final int IGN_LOAD_COUNT = 16; public static final int IGN_RPM_COUNT = 16; public static final int ignition_mode_e_IM_INDIVIDUAL_COILS = 1; @@ -1287,10 +1314,10 @@ public class Fields { public static final int ignition_mode_e_IM_TWO_COILS = 3; public static final int ignition_mode_e_IM_WASTED_SPARK = 2; public static final int ignitionDwellForCrankingMs_offset = 188; - public static final int ignitionIatCorrLoadBins_offset = 18512; - public static final int ignitionIatCorrRpmBins_offset = 18576; - public static final int ignitionIatCorrTable_offset = 17488; - public static final int ignitionLoadBins_offset = 21712; + public static final int ignitionIatCorrLoadBins_offset = 17220; + public static final int ignitionIatCorrRpmBins_offset = 17284; + public static final int ignitionIatCorrTable_offset = 16196; + public static final int ignitionLoadBins_offset = 20260; public static final int ignitionMode_offset = 452; public static final int ignitionPinMode_offset = 657; public static final int ignitionPins10_offset = 653; @@ -1305,9 +1332,35 @@ public class Fields { public static final int ignitionPins7_offset = 650; public static final int ignitionPins8_offset = 651; public static final int ignitionPins9_offset = 652; - public static final int ignitionRpmBins_offset = 21776; - public static final int ignitionTable_offset = 20688; + public static final int ignitionRpmBins_offset = 20292; + public static final int ignitionTable_offset = 19236; public static final int ignOverrideMode_offset = 1752; + public static final int ignTrimLoadBins_offset = 22628; + public static final int ignTrimRpmBins_offset = 22636; + public static final int ignTrims10_offset = 22788; + public static final int ignTrims10_table_offset = 22788; + public static final int ignTrims11_offset = 22804; + public static final int ignTrims11_table_offset = 22804; + public static final int ignTrims12_offset = 22820; + public static final int ignTrims12_table_offset = 22820; + public static final int ignTrims1_offset = 22644; + public static final int ignTrims1_table_offset = 22644; + public static final int ignTrims2_offset = 22660; + public static final int ignTrims2_table_offset = 22660; + public static final int ignTrims3_offset = 22676; + public static final int ignTrims3_table_offset = 22676; + public static final int ignTrims4_offset = 22692; + public static final int ignTrims4_table_offset = 22692; + public static final int ignTrims5_offset = 22708; + public static final int ignTrims5_table_offset = 22708; + public static final int ignTrims6_offset = 22724; + public static final int ignTrims6_table_offset = 22724; + public static final int ignTrims7_offset = 22740; + public static final int ignTrims7_table_offset = 22740; + public static final int ignTrims8_offset = 22756; + public static final int ignTrims8_table_offset = 22756; + public static final int ignTrims9_offset = 22772; + public static final int ignTrims9_table_offset = 22772; public static final int imu_type_e_IMU_MM5_10 = 2; public static final int imu_type_e_IMU_NONE = 0; public static final int imu_type_e_IMU_TYPE_3 = 3; @@ -1323,7 +1376,7 @@ public class Fields { public static final int injection_mode_e_IM_SIMULTANEOUS = 0; public static final int injection_mode_e_IM_SINGLE_POINT = 3; public static final int injectionMode_offset = 440; - public static final int injectionPhase_offset = 18640; + public static final int injectionPhase_offset = 17316; public static final int injectionPinMode_offset = 656; public static final int injectionPins10_offset = 641; public static final int injectionPins11_offset = 642; @@ -1360,8 +1413,8 @@ public class Fields { public static final int InjectorNonlinearMode_INJ_PolynomialAdder = 1; public static final int injectorNonlinearMode_offset = 796; public static final int injectorPressureType_offset = 1753; - public static final int injPhaseLoadBins_offset = 19664; - public static final int injPhaseRpmBins_offset = 19728; + public static final int injPhaseLoadBins_offset = 18340; + public static final int injPhaseRpmBins_offset = 18372; public static final int invertCamVVTSignal_offset = 896; public static final int invertPrimaryTriggerSignal_offset = 1260; public static final int invertSecondaryTriggerSignal_offset = 1260; @@ -1417,9 +1470,9 @@ public class Fields { public static final int knockRetardMaximum_offset = 622; public static final int knockRetardReapplyRate_offset = 621; public static final int knockSamplingDuration_offset = 2112; - public static final int lambdaLoadBins_offset = 23248; - public static final int lambdaRpmBins_offset = 23312; - public static final int lambdaTable_offset = 22992; + public static final int lambdaLoadBins_offset = 21668; + public static final int lambdaRpmBins_offset = 21700; + public static final int lambdaTable_offset = 21412; public static final int launchActivateDelay_offset = 976; public static final int launchActivatePin_offset = 911; public static final int launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH = 2; @@ -1471,15 +1524,15 @@ public class Fields { public static final int luaOutputPins6_offset = 1141; public static final int luaOutputPins7_offset = 1142; public static final int luaOutputPins8_offset = 1143; - public static final int luaScript_offset = 6928; + public static final int luaScript_offset = 5636; public static final int MAF_DECODING_COUNT = 256; public static final int maf_sensor_type_e_Bosch0280218004 = 2; public static final int maf_sensor_type_e_Bosch0280218037 = 1; public static final int maf_sensor_type_e_CUSTOM = 0; public static final int maf_sensor_type_e_DensoTODO = 3; public static final int mafAdcChannel_offset = 551; - public static final int mafDecoding_offset = 15440; - public static final int mafDecodingBins_offset = 16464; + public static final int mafDecoding_offset = 14148; + public static final int mafDecodingBins_offset = 15172; public static final int mafSensorType_offset = 892; public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int mainRelayPin_offset = 714; @@ -1513,9 +1566,9 @@ public class Fields { public static final int mapCamSkipFactor_offset = 768; public static final int mapErrorDetectionTooHigh_offset = 1540; public static final int mapErrorDetectionTooLow_offset = 1536; - public static final int mapEstimateRpmBins_offset = 20400; - public static final int mapEstimateTable_offset = 19856; - public static final int mapEstimateTpsBins_offset = 20368; + public static final int mapEstimateRpmBins_offset = 19012; + public static final int mapEstimateTable_offset = 18468; + public static final int mapEstimateTpsBins_offset = 18980; public static final int mapHighValueVoltage_offset = 1832; public static final int mapLowValueVoltage_offset = 1828; public static final int mapMinBufferLength_offset = 820; @@ -1607,10 +1660,10 @@ public class Fields { public static final int PACK_MULT_VOLTAGE = 1000; public static final int pauseEtbControl_offset = 748; public static final int PEDAL_TO_TPS_SIZE = 8; - public static final int pedalToTpsPedalBins_offset = 6768; - public static final int pedalToTpsRpmBins_offset = 6776; - public static final int pedalToTpsTable_offset = 6704; - public static final int persistent_config_s_size = 24400; + public static final int pedalToTpsPedalBins_offset = 5476; + public static final int pedalToTpsRpmBins_offset = 5484; + public static final int pedalToTpsTable_offset = 5412; + public static final int persistent_config_s_size = 23044; public static final int pid_s_size = 20; public static final int PidAutoTune_AutoTunerState_AUTOTUNER_OFF = 0; public static final int PidAutoTune_AutoTunerState_CONVERGED = 16; @@ -1711,18 +1764,18 @@ public class Fields { public static final int scriptSettingName6_offset = 3300; public static final int scriptSettingName7_offset = 3316; public static final int scriptSettingName8_offset = 3332; - public static final int scriptTable1_offset = 23696; - public static final int scriptTable1LoadBins_offset = 23952; - public static final int scriptTable1RpmBins_offset = 23984; - public static final int scriptTable2_offset = 24016; - public static final int scriptTable2LoadBins_offset = 24080; - public static final int scriptTable2RpmBins_offset = 24112; - public static final int scriptTable3_offset = 24144; - public static final int scriptTable3LoadBins_offset = 24208; - public static final int scriptTable3RpmBins_offset = 24240; - public static final int scriptTable4_offset = 24272; - public static final int scriptTable4LoadBins_offset = 24336; - public static final int scriptTable4RpmBins_offset = 24368; + public static final int scriptTable1_offset = 22052; + public static final int scriptTable1LoadBins_offset = 22308; + public static final int scriptTable1RpmBins_offset = 22324; + public static final int scriptTable2_offset = 22340; + public static final int scriptTable2LoadBins_offset = 22404; + public static final int scriptTable2RpmBins_offset = 22420; + public static final int scriptTable3_offset = 22436; + public static final int scriptTable3LoadBins_offset = 22500; + public static final int scriptTable3RpmBins_offset = 22516; + public static final int scriptTable4_offset = 22532; + public static final int scriptTable4LoadBins_offset = 22596; + public static final int scriptTable4RpmBins_offset = 22612; public static final int scriptTableName1_offset = 3156; public static final int scriptTableName2_offset = 3172; public static final int scriptTableName3_offset = 3188; @@ -1750,7 +1803,7 @@ public class Fields { public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; public static final int showSdCardWarning_offset = 164; - public static final int SIGNATURE_HASH = 59744767; + public static final int SIGNATURE_HASH = 241264427; public static final int silentTriggerError_offset = 1260; public static final int slowAdcAlpha_offset = 1712; public static final int sparkDwellRpmBins_offset = 54; @@ -1883,7 +1936,7 @@ public class Fields { public static final int tcuDownshiftButtonPin_offset = 1579; public static final int tcuDownshiftButtonPinMode_offset = 3983; public static final int tcuEnabled_offset = 896; - public static final int tcuSolenoidTable_offset = 19792; + public static final int tcuSolenoidTable_offset = 18404; public static final int tcuUpshiftButtonPin_offset = 1578; public static final int tcuUpshiftButtonPinMode_offset = 3982; public static final int test557pin_offset = 807; @@ -1930,7 +1983,7 @@ public class Fields { public static final int TORQUE_CURVE_SIZE = 8; public static final int torqueRpmBins_offset = 4602; public static final int torqueValues_offset = 4594; - public static final int TOTAL_CONFIG_SIZE = 24400; + public static final int TOTAL_CONFIG_SIZE = 23044; public static final int tps1_1AdcChannel_offset = 520; public static final int tps1_2AdcChannel_offset = 689; public static final int tps1SecondaryMax_offset = 830; @@ -1954,9 +2007,9 @@ public class Fields { public static final int tpsErrorDetectionTooLow_offset = 172; public static final int tpsMax_offset = 170; public static final int tpsMin_offset = 168; - public static final int tpsTpsAccelFromRpmBins_offset = 23632; - public static final int tpsTpsAccelTable_offset = 23376; - public static final int tpsTpsAccelToRpmBins_offset = 23664; + public static final int tpsTpsAccelFromRpmBins_offset = 21988; + public static final int tpsTpsAccelTable_offset = 21732; + public static final int tpsTpsAccelToRpmBins_offset = 22020; public static final int trailingCoilPins10_offset = 1965; public static final int trailingCoilPins11_offset = 1966; public static final int trailingCoilPins12_offset = 1967; @@ -2148,6 +2201,7 @@ public class Fields { public static final int triggerSimulatorPins1_offset = 740; public static final int triggerSimulatorPins2_offset = 741; public static final int triggerSimulatorPins3_offset = 742; + public static final int TRIM_SIZE = 4; public static final char TS_BURN_COMMAND = 'B'; public static final char TS_CHUNK_WRITE_COMMAND = 'C'; public static final int ts_command_e_TS_BENCH_CATEGORY = 22; @@ -2215,7 +2269,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.12.20.all.59744767"; + public static final String TS_SIGNATURE = "rusEFI 2021.12.21.all.241264427"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 732; @@ -2329,7 +2383,7 @@ public class Fields { public static final int vehicleName_offset = 1076; public static final int vehicleSpeedSensorInputPin_offset = 794; public static final int vehicleWeight_offset = 786; - public static final int veLoadBins_offset = 22864; + public static final int veLoadBins_offset = 21348; public static final int veOverrideMode_offset = 1733; public static final int verboseCan2BaseAddress_offset = 1736; public static final int verboseCan_offset = 164; @@ -2337,8 +2391,8 @@ public class Fields { public static final int verboseTLE8888_offset = 748; public static final int verboseTriggerSynchDetails_offset = 1272; public static final int verboseVVTDecoding_offset = 896; - public static final int veRpmBins_offset = 22928; - public static final int veTable_offset = 21840; + public static final int veRpmBins_offset = 21380; + public static final int veTable_offset = 20324; public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int vr_threshold_s_size = 16; @@ -2353,7 +2407,7 @@ public class Fields { public static final int vrThreshold2_pin_offset = 1176; public static final int vrThreshold2_rpmBins_offset = 1180; public static final int vrThreshold2_values_offset = 1186; - public static final int vssFilterReciprocal_offset = 19852; + public static final int vssFilterReciprocal_offset = 18464; public static final int vssGearRatio_offset = 624; public static final int vssToothCount_offset = 626; public static final int vvt_mode_e_VVT_12 = 12; @@ -2385,13 +2439,13 @@ public class Fields { public static final int vvtPins2_offset = 1841; public static final int vvtPins3_offset = 1842; public static final int vvtPins4_offset = 1843; - public static final int vvtTable1_offset = 20432; - public static final int vvtTable1LoadBins_offset = 20496; - public static final int vvtTable1RpmBins_offset = 20528; - public static final int vvtTable2_offset = 20560; - public static final int vvtTable2LoadBins_offset = 20624; - public static final int vvtTable2RpmBins_offset = 20656; - public static final int warning_message_offset = 6312; + public static final int vvtTable1_offset = 19044; + public static final int vvtTable1LoadBins_offset = 19108; + public static final int vvtTable1RpmBins_offset = 19124; + public static final int vvtTable2_offset = 19140; + public static final int vvtTable2LoadBins_offset = 19204; + public static final int vvtTable2RpmBins_offset = 19220; + public static final int warning_message_offset = 5020; public static final int warningLedPin_offset = 1685; public static final int warningPeriod_offset = 1290; public static final int wastegatePositionMax_offset = 726; @@ -3580,78 +3634,106 @@ public class Fields { public static final Field TORQUERPMBINS = Field.create("TORQUERPMBINS", 4602, FieldType.INT16); public static final Field ALIGNMENTFILL_AT_4618 = Field.create("ALIGNMENTFILL_AT_4618", 4618, FieldType.INT8); public static final Field MAINUNUSEDEND = Field.create("MAINUNUSEDEND", 4620, FieldType.INT); - public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 6312, 120, FieldType.STRING); - public static final Field AFTERSTARTCOOLANTBINS = Field.create("AFTERSTARTCOOLANTBINS", 6432, FieldType.FLOAT); - public static final Field AFTERSTARTHOLDTIME = Field.create("AFTERSTARTHOLDTIME", 6464, FieldType.FLOAT); - public static final Field AFTERSTARTENRICH = Field.create("AFTERSTARTENRICH", 6496, FieldType.FLOAT); - public static final Field AFTERSTARTDECAYTIME = Field.create("AFTERSTARTDECAYTIME", 6528, FieldType.FLOAT); - public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 6560, FieldType.INT8); - public static final Field BOOSTRPMBINS = Field.create("BOOSTRPMBINS", 6624, FieldType.INT8); - public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 6632, FieldType.INT8); - public static final Field BOOSTTPSBINS = Field.create("BOOSTTPSBINS", 6696, FieldType.INT8); - public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 6704, FieldType.INT8); - public static final Field PEDALTOTPSPEDALBINS = Field.create("PEDALTOTPSPEDALBINS", 6768, FieldType.INT8); - public static final Field PEDALTOTPSRPMBINS = Field.create("PEDALTOTPSRPMBINS", 6776, FieldType.INT8); - public static final Field CLTCRANKINGCORRBINS = Field.create("CLTCRANKINGCORRBINS", 6784, FieldType.FLOAT); - public static final Field CLTCRANKINGCORR = Field.create("CLTCRANKINGCORR", 6816, FieldType.FLOAT); - public static final Field IDLEADVANCEBINS = Field.create("IDLEADVANCEBINS", 6848, FieldType.INT8); - public static final Field IDLEADVANCE = Field.create("IDLEADVANCE", 6856, FieldType.FLOAT); - public static final Field IDLEVEBINS = Field.create("IDLEVEBINS", 6888, FieldType.INT8); - public static final Field IDLEVE = Field.create("IDLEVE", 6896, FieldType.FLOAT); - public static final Field LUASCRIPT = Field.create("LUASCRIPT", 6928, 8000, FieldType.STRING); - public static final Field CLTFUELCORRBINS = Field.create("CLTFUELCORRBINS", 14928, FieldType.FLOAT); - public static final Field CLTFUELCORR = Field.create("CLTFUELCORR", 14992, FieldType.FLOAT); - public static final Field IATFUELCORRBINS = Field.create("IATFUELCORRBINS", 15056, FieldType.FLOAT); - public static final Field IATFUELCORR = Field.create("IATFUELCORR", 15120, FieldType.FLOAT); - public static final Field CRANKINGFUELCOEF = Field.create("CRANKINGFUELCOEF", 15184, FieldType.FLOAT); - public static final Field CRANKINGFUELBINS = Field.create("CRANKINGFUELBINS", 15216, FieldType.FLOAT); - public static final Field CRANKINGCYCLECOEF = Field.create("CRANKINGCYCLECOEF", 15248, FieldType.FLOAT); - public static final Field CRANKINGCYCLEBINS = Field.create("CRANKINGCYCLEBINS", 15280, FieldType.FLOAT); - public static final Field CLTIDLECORRBINS = Field.create("CLTIDLECORRBINS", 15312, FieldType.FLOAT); - public static final Field CLTIDLECORR = Field.create("CLTIDLECORR", 15376, FieldType.FLOAT); - public static final Field MAFDECODING = Field.create("MAFDECODING", 15440, FieldType.FLOAT); - public static final Field MAFDECODINGBINS = Field.create("MAFDECODINGBINS", 16464, FieldType.FLOAT); - public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 17488, FieldType.FLOAT); - public static final Field IGNITIONIATCORRLOADBINS = Field.create("IGNITIONIATCORRLOADBINS", 18512, FieldType.FLOAT); - public static final Field IGNITIONIATCORRRPMBINS = Field.create("IGNITIONIATCORRRPMBINS", 18576, FieldType.FLOAT); - public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 18640, FieldType.FLOAT); - public static final Field INJPHASELOADBINS = Field.create("INJPHASELOADBINS", 19664, FieldType.FLOAT); - public static final Field INJPHASERPMBINS = Field.create("INJPHASERPMBINS", 19728, FieldType.FLOAT); - public static final Field TCUSOLENOIDTABLE = Field.create("TCUSOLENOIDTABLE", 19792, FieldType.INT8); - public static final Field VSSFILTERRECIPROCAL = Field.create("VSSFILTERRECIPROCAL", 19852, FieldType.FLOAT); - public static final Field MAPESTIMATETABLE = Field.create("MAPESTIMATETABLE", 19856, FieldType.INT16); - public static final Field MAPESTIMATETPSBINS = Field.create("MAPESTIMATETPSBINS", 20368, FieldType.INT16); - public static final Field MAPESTIMATERPMBINS = Field.create("MAPESTIMATERPMBINS", 20400, FieldType.INT16); - public static final Field VVTTABLE1 = Field.create("VVTTABLE1", 20432, FieldType.INT8); - public static final Field VVTTABLE1LOADBINS = Field.create("VVTTABLE1LOADBINS", 20496, FieldType.FLOAT); - public static final Field VVTTABLE1RPMBINS = Field.create("VVTTABLE1RPMBINS", 20528, FieldType.FLOAT); - public static final Field VVTTABLE2 = Field.create("VVTTABLE2", 20560, FieldType.INT8); - public static final Field VVTTABLE2LOADBINS = Field.create("VVTTABLE2LOADBINS", 20624, FieldType.FLOAT); - public static final Field VVTTABLE2RPMBINS = Field.create("VVTTABLE2RPMBINS", 20656, FieldType.FLOAT); - public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 20688, FieldType.FLOAT); - public static final Field IGNITIONLOADBINS = Field.create("IGNITIONLOADBINS", 21712, FieldType.FLOAT); - public static final Field IGNITIONRPMBINS = Field.create("IGNITIONRPMBINS", 21776, FieldType.FLOAT); - public static final Field VETABLE = Field.create("VETABLE", 21840, FieldType.FLOAT); - public static final Field VELOADBINS = Field.create("VELOADBINS", 22864, FieldType.FLOAT); - public static final Field VERPMBINS = Field.create("VERPMBINS", 22928, FieldType.FLOAT); - public static final Field LAMBDATABLE = Field.create("LAMBDATABLE", 22992, FieldType.INT8); - public static final Field LAMBDALOADBINS = Field.create("LAMBDALOADBINS", 23248, FieldType.FLOAT); - public static final Field LAMBDARPMBINS = Field.create("LAMBDARPMBINS", 23312, FieldType.FLOAT); - public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 23376, FieldType.FLOAT); - public static final Field TPSTPSACCELFROMRPMBINS = Field.create("TPSTPSACCELFROMRPMBINS", 23632, FieldType.FLOAT); - public static final Field TPSTPSACCELTORPMBINS = Field.create("TPSTPSACCELTORPMBINS", 23664, FieldType.FLOAT); - public static final Field SCRIPTTABLE1 = Field.create("SCRIPTTABLE1", 23696, FieldType.FLOAT); - public static final Field SCRIPTTABLE1LOADBINS = Field.create("SCRIPTTABLE1LOADBINS", 23952, FieldType.FLOAT); - public static final Field SCRIPTTABLE1RPMBINS = Field.create("SCRIPTTABLE1RPMBINS", 23984, FieldType.FLOAT); - public static final Field SCRIPTTABLE2 = Field.create("SCRIPTTABLE2", 24016, FieldType.INT8); - public static final Field SCRIPTTABLE2LOADBINS = Field.create("SCRIPTTABLE2LOADBINS", 24080, FieldType.FLOAT); - public static final Field SCRIPTTABLE2RPMBINS = Field.create("SCRIPTTABLE2RPMBINS", 24112, FieldType.FLOAT); - public static final Field SCRIPTTABLE3 = Field.create("SCRIPTTABLE3", 24144, FieldType.INT8); - public static final Field SCRIPTTABLE3LOADBINS = Field.create("SCRIPTTABLE3LOADBINS", 24208, FieldType.FLOAT); - public static final Field SCRIPTTABLE3RPMBINS = Field.create("SCRIPTTABLE3RPMBINS", 24240, FieldType.FLOAT); - public static final Field SCRIPTTABLE4 = Field.create("SCRIPTTABLE4", 24272, FieldType.INT8); - public static final Field SCRIPTTABLE4LOADBINS = Field.create("SCRIPTTABLE4LOADBINS", 24336, FieldType.FLOAT); - public static final Field SCRIPTTABLE4RPMBINS = Field.create("SCRIPTTABLE4RPMBINS", 24368, FieldType.FLOAT); + public static final Field WARNING_MESSAGE = Field.create("WARNING_MESSAGE", 5020, 120, FieldType.STRING); + public static final Field AFTERSTARTCOOLANTBINS = Field.create("AFTERSTARTCOOLANTBINS", 5140, FieldType.FLOAT); + public static final Field AFTERSTARTHOLDTIME = Field.create("AFTERSTARTHOLDTIME", 5172, FieldType.FLOAT); + public static final Field AFTERSTARTENRICH = Field.create("AFTERSTARTENRICH", 5204, FieldType.FLOAT); + public static final Field AFTERSTARTDECAYTIME = Field.create("AFTERSTARTDECAYTIME", 5236, FieldType.FLOAT); + public static final Field BOOSTTABLEOPENLOOP = Field.create("BOOSTTABLEOPENLOOP", 5268, FieldType.INT8); + public static final Field BOOSTRPMBINS = Field.create("BOOSTRPMBINS", 5332, FieldType.INT8); + public static final Field BOOSTTABLECLOSEDLOOP = Field.create("BOOSTTABLECLOSEDLOOP", 5340, FieldType.INT8); + public static final Field BOOSTTPSBINS = Field.create("BOOSTTPSBINS", 5404, FieldType.INT8); + public static final Field PEDALTOTPSTABLE = Field.create("PEDALTOTPSTABLE", 5412, FieldType.INT8); + public static final Field PEDALTOTPSPEDALBINS = Field.create("PEDALTOTPSPEDALBINS", 5476, FieldType.INT8); + public static final Field PEDALTOTPSRPMBINS = Field.create("PEDALTOTPSRPMBINS", 5484, FieldType.INT8); + public static final Field CLTCRANKINGCORRBINS = Field.create("CLTCRANKINGCORRBINS", 5492, FieldType.FLOAT); + public static final Field CLTCRANKINGCORR = Field.create("CLTCRANKINGCORR", 5524, FieldType.FLOAT); + public static final Field IDLEADVANCEBINS = Field.create("IDLEADVANCEBINS", 5556, FieldType.INT8); + public static final Field IDLEADVANCE = Field.create("IDLEADVANCE", 5564, FieldType.FLOAT); + public static final Field IDLEVEBINS = Field.create("IDLEVEBINS", 5596, FieldType.INT8); + public static final Field IDLEVE = Field.create("IDLEVE", 5604, FieldType.FLOAT); + public static final Field LUASCRIPT = Field.create("LUASCRIPT", 5636, 8000, FieldType.STRING); + public static final Field CLTFUELCORRBINS = Field.create("CLTFUELCORRBINS", 13636, FieldType.FLOAT); + public static final Field CLTFUELCORR = Field.create("CLTFUELCORR", 13700, FieldType.FLOAT); + public static final Field IATFUELCORRBINS = Field.create("IATFUELCORRBINS", 13764, FieldType.FLOAT); + public static final Field IATFUELCORR = Field.create("IATFUELCORR", 13828, FieldType.FLOAT); + public static final Field CRANKINGFUELCOEF = Field.create("CRANKINGFUELCOEF", 13892, FieldType.FLOAT); + public static final Field CRANKINGFUELBINS = Field.create("CRANKINGFUELBINS", 13924, FieldType.FLOAT); + public static final Field CRANKINGCYCLECOEF = Field.create("CRANKINGCYCLECOEF", 13956, FieldType.FLOAT); + public static final Field CRANKINGCYCLEBINS = Field.create("CRANKINGCYCLEBINS", 13988, FieldType.FLOAT); + public static final Field CLTIDLECORRBINS = Field.create("CLTIDLECORRBINS", 14020, FieldType.FLOAT); + public static final Field CLTIDLECORR = Field.create("CLTIDLECORR", 14084, FieldType.FLOAT); + public static final Field MAFDECODING = Field.create("MAFDECODING", 14148, FieldType.FLOAT); + public static final Field MAFDECODINGBINS = Field.create("MAFDECODINGBINS", 15172, FieldType.FLOAT); + public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 16196, FieldType.FLOAT); + public static final Field IGNITIONIATCORRLOADBINS = Field.create("IGNITIONIATCORRLOADBINS", 17220, FieldType.FLOAT); + public static final Field IGNITIONIATCORRRPMBINS = Field.create("IGNITIONIATCORRRPMBINS", 17284, FieldType.INT16); + public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 17316, FieldType.FLOAT); + public static final Field INJPHASELOADBINS = Field.create("INJPHASELOADBINS", 18340, FieldType.INT16); + public static final Field INJPHASERPMBINS = Field.create("INJPHASERPMBINS", 18372, FieldType.INT16); + public static final Field TCUSOLENOIDTABLE = Field.create("TCUSOLENOIDTABLE", 18404, FieldType.INT8); + public static final Field VSSFILTERRECIPROCAL = Field.create("VSSFILTERRECIPROCAL", 18464, FieldType.FLOAT); + public static final Field MAPESTIMATETABLE = Field.create("MAPESTIMATETABLE", 18468, FieldType.INT16); + public static final Field MAPESTIMATETPSBINS = Field.create("MAPESTIMATETPSBINS", 18980, FieldType.INT16); + public static final Field MAPESTIMATERPMBINS = Field.create("MAPESTIMATERPMBINS", 19012, FieldType.INT16); + public static final Field VVTTABLE1 = Field.create("VVTTABLE1", 19044, FieldType.INT8); + public static final Field VVTTABLE1LOADBINS = Field.create("VVTTABLE1LOADBINS", 19108, FieldType.INT16); + public static final Field VVTTABLE1RPMBINS = Field.create("VVTTABLE1RPMBINS", 19124, FieldType.INT16); + public static final Field VVTTABLE2 = Field.create("VVTTABLE2", 19140, FieldType.INT8); + public static final Field VVTTABLE2LOADBINS = Field.create("VVTTABLE2LOADBINS", 19204, FieldType.INT16); + public static final Field VVTTABLE2RPMBINS = Field.create("VVTTABLE2RPMBINS", 19220, FieldType.INT16); + public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 19236, FieldType.FLOAT); + public static final Field IGNITIONLOADBINS = Field.create("IGNITIONLOADBINS", 20260, FieldType.INT16); + public static final Field IGNITIONRPMBINS = Field.create("IGNITIONRPMBINS", 20292, FieldType.INT16); + public static final Field VETABLE = Field.create("VETABLE", 20324, FieldType.FLOAT); + public static final Field VELOADBINS = Field.create("VELOADBINS", 21348, FieldType.INT16); + public static final Field VERPMBINS = Field.create("VERPMBINS", 21380, FieldType.INT16); + public static final Field LAMBDATABLE = Field.create("LAMBDATABLE", 21412, FieldType.INT8); + public static final Field LAMBDALOADBINS = Field.create("LAMBDALOADBINS", 21668, FieldType.INT16); + public static final Field LAMBDARPMBINS = Field.create("LAMBDARPMBINS", 21700, FieldType.INT16); + public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 21732, FieldType.FLOAT); + public static final Field TPSTPSACCELFROMRPMBINS = Field.create("TPSTPSACCELFROMRPMBINS", 21988, FieldType.FLOAT); + public static final Field TPSTPSACCELTORPMBINS = Field.create("TPSTPSACCELTORPMBINS", 22020, FieldType.FLOAT); + public static final Field SCRIPTTABLE1 = Field.create("SCRIPTTABLE1", 22052, FieldType.FLOAT); + public static final Field SCRIPTTABLE1LOADBINS = Field.create("SCRIPTTABLE1LOADBINS", 22308, FieldType.INT16); + public static final Field SCRIPTTABLE1RPMBINS = Field.create("SCRIPTTABLE1RPMBINS", 22324, FieldType.INT16); + public static final Field SCRIPTTABLE2 = Field.create("SCRIPTTABLE2", 22340, FieldType.INT8); + public static final Field SCRIPTTABLE2LOADBINS = Field.create("SCRIPTTABLE2LOADBINS", 22404, FieldType.INT16); + public static final Field SCRIPTTABLE2RPMBINS = Field.create("SCRIPTTABLE2RPMBINS", 22420, FieldType.INT16); + public static final Field SCRIPTTABLE3 = Field.create("SCRIPTTABLE3", 22436, FieldType.INT8); + public static final Field SCRIPTTABLE3LOADBINS = Field.create("SCRIPTTABLE3LOADBINS", 22500, FieldType.INT16); + public static final Field SCRIPTTABLE3RPMBINS = Field.create("SCRIPTTABLE3RPMBINS", 22516, FieldType.INT16); + public static final Field SCRIPTTABLE4 = Field.create("SCRIPTTABLE4", 22532, FieldType.INT8); + public static final Field SCRIPTTABLE4LOADBINS = Field.create("SCRIPTTABLE4LOADBINS", 22596, FieldType.INT16); + public static final Field SCRIPTTABLE4RPMBINS = Field.create("SCRIPTTABLE4RPMBINS", 22612, FieldType.INT16); + public static final Field IGNTRIMLOADBINS = Field.create("IGNTRIMLOADBINS", 22628, FieldType.INT16); + public static final Field IGNTRIMRPMBINS = Field.create("IGNTRIMRPMBINS", 22636, FieldType.INT16); + public static final Field IGNTRIMS1_TABLE = Field.create("IGNTRIMS1_TABLE", 22644, FieldType.INT8); + public static final Field IGNTRIMS2_TABLE = Field.create("IGNTRIMS2_TABLE", 22660, FieldType.INT8); + public static final Field IGNTRIMS3_TABLE = Field.create("IGNTRIMS3_TABLE", 22676, FieldType.INT8); + public static final Field IGNTRIMS4_TABLE = Field.create("IGNTRIMS4_TABLE", 22692, FieldType.INT8); + public static final Field IGNTRIMS5_TABLE = Field.create("IGNTRIMS5_TABLE", 22708, FieldType.INT8); + public static final Field IGNTRIMS6_TABLE = Field.create("IGNTRIMS6_TABLE", 22724, FieldType.INT8); + public static final Field IGNTRIMS7_TABLE = Field.create("IGNTRIMS7_TABLE", 22740, FieldType.INT8); + public static final Field IGNTRIMS8_TABLE = Field.create("IGNTRIMS8_TABLE", 22756, FieldType.INT8); + public static final Field IGNTRIMS9_TABLE = Field.create("IGNTRIMS9_TABLE", 22772, FieldType.INT8); + public static final Field IGNTRIMS10_TABLE = Field.create("IGNTRIMS10_TABLE", 22788, FieldType.INT8); + public static final Field IGNTRIMS11_TABLE = Field.create("IGNTRIMS11_TABLE", 22804, FieldType.INT8); + public static final Field IGNTRIMS12_TABLE = Field.create("IGNTRIMS12_TABLE", 22820, FieldType.INT8); + public static final Field FUELTRIMLOADBINS = Field.create("FUELTRIMLOADBINS", 22836, FieldType.INT16); + public static final Field FUELTRIMRPMBINS = Field.create("FUELTRIMRPMBINS", 22844, FieldType.INT16); + public static final Field FUELTRIMS1_TABLE = Field.create("FUELTRIMS1_TABLE", 22852, FieldType.INT8); + public static final Field FUELTRIMS2_TABLE = Field.create("FUELTRIMS2_TABLE", 22868, FieldType.INT8); + public static final Field FUELTRIMS3_TABLE = Field.create("FUELTRIMS3_TABLE", 22884, FieldType.INT8); + public static final Field FUELTRIMS4_TABLE = Field.create("FUELTRIMS4_TABLE", 22900, FieldType.INT8); + public static final Field FUELTRIMS5_TABLE = Field.create("FUELTRIMS5_TABLE", 22916, FieldType.INT8); + public static final Field FUELTRIMS6_TABLE = Field.create("FUELTRIMS6_TABLE", 22932, FieldType.INT8); + public static final Field FUELTRIMS7_TABLE = Field.create("FUELTRIMS7_TABLE", 22948, FieldType.INT8); + public static final Field FUELTRIMS8_TABLE = Field.create("FUELTRIMS8_TABLE", 22964, FieldType.INT8); + public static final Field FUELTRIMS9_TABLE = Field.create("FUELTRIMS9_TABLE", 22980, FieldType.INT8); + public static final Field FUELTRIMS10_TABLE = Field.create("FUELTRIMS10_TABLE", 22996, FieldType.INT8); + public static final Field FUELTRIMS11_TABLE = Field.create("FUELTRIMS11_TABLE", 23012, FieldType.INT8); + public static final Field FUELTRIMS12_TABLE = Field.create("FUELTRIMS12_TABLE", 23028, FieldType.INT8); public static final Field[] VALUES = { ENGINETYPE, SENSORSNIFFERRPMTHRESHOLD, @@ -4881,5 +4963,33 @@ public class Fields { SCRIPTTABLE4, SCRIPTTABLE4LOADBINS, SCRIPTTABLE4RPMBINS, + IGNTRIMLOADBINS, + IGNTRIMRPMBINS, + IGNTRIMS1_TABLE, + IGNTRIMS2_TABLE, + IGNTRIMS3_TABLE, + IGNTRIMS4_TABLE, + IGNTRIMS5_TABLE, + IGNTRIMS6_TABLE, + IGNTRIMS7_TABLE, + IGNTRIMS8_TABLE, + IGNTRIMS9_TABLE, + IGNTRIMS10_TABLE, + IGNTRIMS11_TABLE, + IGNTRIMS12_TABLE, + FUELTRIMLOADBINS, + FUELTRIMRPMBINS, + FUELTRIMS1_TABLE, + FUELTRIMS2_TABLE, + FUELTRIMS3_TABLE, + FUELTRIMS4_TABLE, + FUELTRIMS5_TABLE, + FUELTRIMS6_TABLE, + FUELTRIMS7_TABLE, + FUELTRIMS8_TABLE, + FUELTRIMS9_TABLE, + FUELTRIMS10_TABLE, + FUELTRIMS11_TABLE, + FUELTRIMS12_TABLE, }; } diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 1206e8f3a3..bb2acea4bd 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -10,20 +10,20 @@ RUSEFI rusEfi rusEfi - 24400 + 23044 -
- @@ -32,15 +32,15 @@
-
- @@ -49,15 +49,15 @@
-
- @@ -66,16 +66,16 @@
-
-
@@ -83,16 +83,16 @@ -
-
@@ -100,16 +100,16 @@ -
-
@@ -117,16 +117,16 @@ -
-
@@ -134,15 +134,15 @@ -
+
- +
@@ -162,11 +162,11 @@ -
+
@@ -191,11 +191,11 @@ - -
+