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 afa7001fee..599a1c6eb1 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 Sat Dec 04 23:05:03 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:13 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1997,7 +1997,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 976 bit 11 */ - bool unused976b11 : 1 {}; + bool mapCamLookForLowPeaks : 1 {}; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1 {}; @@ -4266,54 +4266,54 @@ struct persistent_config_s { lua_script_t luaScript; /** C - * offset 10272 + * offset 14672 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 10336 + * offset 14736 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 10400 + * offset 14800 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 10464 + * offset 14864 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 10528 + * offset 14928 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 10560 + * offset 14960 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 10592 + * offset 14992 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 10624 + * offset 15024 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 10656 + * offset 15056 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 10720 + * offset 15120 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4321,233 +4321,233 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 10784 + * offset 15184 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 11808 + * offset 16208 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 12832 + * offset 17232 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 13856 + * offset 18256 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 13920 + * offset 18320 */ float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 13984 + * offset 18384 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 15008 + * offset 19408 */ float injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15072 + * offset 19472 */ float injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 15136 + * offset 19536 */ 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 15196 + * offset 19596 */ float vssFilterReciprocal; /** kPa - * offset 15200 + * offset 19600 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 15712 + * offset 20112 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15744 + * offset 20144 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 15776 + * offset 20176 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15840 + * offset 20240 */ float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 15872 + * offset 20272 */ float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 15904 + * offset 20304 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15968 + * offset 20368 */ float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 16000 + * offset 20400 */ float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L - * offset 16032 + * offset 20432 */ float unusedLuaWasHere[64]; /** deg - * offset 16288 + * offset 20688 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 17312 + * offset 21712 */ float ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 17376 + * offset 21776 */ float ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 17440 + * offset 21840 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 18464 + * offset 22864 */ float veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18528 + * offset 22928 */ float veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 18592 + * offset 22992 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 18848 + * offset 23248 */ float lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18912 + * offset 23312 */ float lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 18976 + * offset 23376 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 19232 + * offset 23632 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** * RPM is float and not integer in order to use unified methods for interpolation to - * offset 19264 + * offset 23664 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 19296 + * offset 23696 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19552 + * offset 23952 */ float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19584 + * offset 23984 */ float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19616 + * offset 24016 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19680 + * offset 24080 */ float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19712 + * offset 24112 */ float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19744 + * offset 24144 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19808 + * offset 24208 */ float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19840 + * offset 24240 */ float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19872 + * offset 24272 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19936 + * offset 24336 */ float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19968 + * offset 24368 */ float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 20000*/ + /** total size 24400*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Dec 04 23:05:03 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:13 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 9638e75415..f3c6cdd0cb 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 @@ -515,10 +515,10 @@ #define CLT_TIMING_CURVE_SIZE 8 #define cltCrankingCorr_offset 6512 #define cltCrankingCorrBins_offset 6480 -#define cltFuelCorr_offset 10336 -#define cltFuelCorrBins_offset 10272 -#define cltIdleCorr_offset 10720 -#define cltIdleCorrBins_offset 10656 +#define cltFuelCorr_offset 14736 +#define cltFuelCorrBins_offset 14672 +#define cltIdleCorr_offset 15120 +#define cltIdleCorrBins_offset 15056 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 #define cltRevLimitRpm_offset 3332 @@ -606,10 +606,10 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingCycleBins_offset 10624 -#define crankingCycleCoef_offset 10592 -#define crankingFuelBins_offset 10560 -#define crankingFuelCoef_offset 10528 +#define crankingCycleBins_offset 15024 +#define crankingCycleCoef_offset 14992 +#define crankingFuelBins_offset 14960 +#define crankingFuelCoef_offset 14928 #define crankingIACposition_offset 2228 #define crankingInjectionMode_offset 424 #define crankingTimingAngle_offset 436 @@ -1253,8 +1253,8 @@ #define iat_tempC_1_offset 284 #define iat_tempC_2_offset 288 #define iat_tempC_3_offset 292 -#define iatFuelCorr_offset 10464 -#define iatFuelCorrBins_offset 10400 +#define iatFuelCorr_offset 14864 +#define iatFuelCorrBins_offset 14800 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 696 #define idle_derivativeFilterLoss_offset 516 @@ -1328,10 +1328,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 100 -#define ignitionIatCorrLoadBins_offset 13856 -#define ignitionIatCorrRpmBins_offset 13920 -#define ignitionIatCorrTable_offset 12832 -#define ignitionLoadBins_offset 17312 +#define ignitionIatCorrLoadBins_offset 18256 +#define ignitionIatCorrRpmBins_offset 18320 +#define ignitionIatCorrTable_offset 17232 +#define ignitionLoadBins_offset 21712 #define ignitionMode_offset 440 #define ignitionPinMode_offset 649 #define ignitionPins10_offset 645 @@ -1346,8 +1346,8 @@ #define ignitionPins7_offset 642 #define ignitionPins8_offset 643 #define ignitionPins9_offset 644 -#define ignitionRpmBins_offset 17376 -#define ignitionTable_offset 16288 +#define ignitionRpmBins_offset 21776 +#define ignitionTable_offset 20688 #define ignOverrideMode_offset 2128 #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 @@ -1367,7 +1367,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 428 -#define injectionPhase_offset 13984 +#define injectionPhase_offset 18384 #define injectionPinMode_offset 648 #define injectionPins10_offset 633 #define injectionPins11_offset 634 @@ -1407,8 +1407,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 2510 #define injectorPressureType_offset 2129 -#define injPhaseLoadBins_offset 15008 -#define injPhaseRpmBins_offset 15072 +#define injPhaseLoadBins_offset 19408 +#define injPhaseRpmBins_offset 19472 #define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 @@ -1466,9 +1466,9 @@ #define knockRetardMaximum_offset 614 #define knockRetardReapplyRate_offset 613 #define knockSamplingDuration_offset 2512 -#define lambdaLoadBins_offset 18848 -#define lambdaRpmBins_offset 18912 -#define lambdaTable_offset 18592 +#define lambdaLoadBins_offset 23248 +#define lambdaRpmBins_offset 23312 +#define lambdaTable_offset 22992 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1516,7 +1516,7 @@ #define lps25BaroSensorSda_offset 1459 #define LUA_ANALOG_INPUT_COUNT 8 #define LUA_PWM_COUNT 8 -#define LUA_SCRIPT_SIZE 3600 +#define LUA_SCRIPT_SIZE 8000 #define luaOutputPins1_offset 1220 #define luaOutputPins2_offset 1221 #define luaOutputPins3_offset 1222 @@ -1535,8 +1535,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 543 -#define mafDecoding_offset 10784 -#define mafDecodingBins_offset 11808 +#define mafDecoding_offset 15184 +#define mafDecodingBins_offset 16208 #define mafSensorType_offset 948 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 @@ -1566,12 +1566,13 @@ #define mapCamAveragingLength_offset 619 #define mapCamDetectionAnglePosition_offset 552 #define mapCamDetectionThreshold_offset 615 +#define mapCamLookForLowPeaks_offset 976 #define mapCamSkipFactor_offset 764 #define mapErrorDetectionTooHigh_offset 1780 #define mapErrorDetectionTooLow_offset 1776 -#define mapEstimateRpmBins_offset 15744 -#define mapEstimateTable_offset 15200 -#define mapEstimateTpsBins_offset 15712 +#define mapEstimateRpmBins_offset 20144 +#define mapEstimateTable_offset 19600 +#define mapEstimateTpsBins_offset 20112 #define mapHighValueVoltage_offset 2212 #define mapLowValueVoltage_offset 2208 #define mapMinBufferLength_offset 812 @@ -1671,7 +1672,7 @@ #define pedalToTpsRpmBins_offset 6472 #define pedalToTpsTable_offset 6400 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 20000 +#define persistent_config_s_size 24400 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1776,18 +1777,18 @@ #define scriptSettingName6_offset 3708 #define scriptSettingName7_offset 3724 #define scriptSettingName8_offset 3740 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 +#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 scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1820,7 +1821,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 4275303766 +#define SIGNATURE_HASH 2585556016 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1961,7 +1962,7 @@ #define tcuDownshiftButtonPin_offset 1819 #define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 -#define tcuSolenoidTable_offset 15136 +#define tcuSolenoidTable_offset 19536 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 #define test557pin_offset 3101 @@ -2008,7 +2009,7 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" -#define TOTAL_CONFIG_SIZE 20000 +#define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 512 #define tps1_2AdcChannel_offset 681 #define tps1SecondaryMax_offset 822 @@ -2032,9 +2033,9 @@ #define tpsErrorDetectionTooLow_offset 84 #define tpsMax_offset 82 #define tpsMin_offset 80 -#define tpsTpsAccelFromRpmBins_offset 19232 -#define tpsTpsAccelTable_offset 18976 -#define tpsTpsAccelToRpmBins_offset 19264 +#define tpsTpsAccelFromRpmBins_offset 23632 +#define tpsTpsAccelTable_offset 23376 +#define tpsTpsAccelToRpmBins_offset 23664 #define trailingCoilPins10_offset 2349 #define trailingCoilPins11_offset 2350 #define trailingCoilPins12_offset 2351 @@ -2338,7 +2339,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen_cypress.4275303766" +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen_cypress.2585556016" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2387,7 +2388,6 @@ #define unused4028_offset 4028 #define unused6312_offset 6312 #define unused970_offset 970 -#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 @@ -2446,7 +2446,7 @@ #define unusedFiller_4703_offset 4703 #define unusedLaunchRpmThreshold_offset 1032 #define unusedLogFormat_offset 496 -#define unusedLuaWasHere_offset 16032 +#define unusedLuaWasHere_offset 20432 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 #define unusedOutputWhereHere_offset 794 @@ -2495,15 +2495,15 @@ #define vehicleName_offset 1160 #define vehicleSpeedSensorInputPin_offset 968 #define vehicleWeight_offset 1456 -#define veLoadBins_offset 18464 +#define veLoadBins_offset 22864 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 #define verboseVVTDecoding_offset 976 -#define veRpmBins_offset 18528 -#define veTable_offset 17440 +#define veRpmBins_offset 22928 +#define veTable_offset 21840 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2519,7 +2519,7 @@ #define vrThreshold2_pin_offset 1260 #define vrThreshold2_rpmBins_offset 1264 #define vrThreshold2_values_offset 1270 -#define vssFilterReciprocal_offset 15196 +#define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 #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_MAP_V_TWIN" @@ -2552,12 +2552,12 @@ #define vvtPins2_offset 2221 #define vvtPins3_offset 2222 #define vvtPins4_offset 2223 -#define vvtTable1_offset 15776 -#define vvtTable1LoadBins_offset 15840 -#define vvtTable1RpmBins_offset 15872 -#define vvtTable2_offset 15904 -#define vvtTable2LoadBins_offset 15968 -#define vvtTable2RpmBins_offset 16000 +#define vvtTable1_offset 20176 +#define vvtTable1LoadBins_offset 20240 +#define vvtTable1RpmBins_offset 20272 +#define vvtTable2_offset 20304 +#define vvtTable2LoadBins_offset 20368 +#define vvtTable2RpmBins_offset 20400 #define warning_message_offset 6000 #define warningLedPin_offset 2041 #define warningPeriod_offset 1498 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 ff724ce078..a433ef2d07 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 Sat Dec 04 23:05:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:10 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1997,7 +1997,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 976 bit 11 */ - bool unused976b11 : 1 {}; + bool mapCamLookForLowPeaks : 1 {}; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1 {}; @@ -4260,54 +4260,54 @@ struct persistent_config_s { lua_script_t luaScript; /** C - * offset 10244 + * offset 14644 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 10308 + * offset 14708 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 10372 + * offset 14772 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 10436 + * offset 14836 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 10500 + * offset 14900 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 10532 + * offset 14932 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 10564 + * offset 14964 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 10596 + * offset 14996 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 10628 + * offset 15028 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 10692 + * offset 15092 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4315,233 +4315,233 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 10756 + * offset 15156 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 11780 + * offset 16180 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 12804 + * offset 17204 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 13828 + * offset 18228 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 13892 + * offset 18292 */ float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 13956 + * offset 18356 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 14980 + * offset 19380 */ float injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15044 + * offset 19444 */ float injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 15108 + * offset 19508 */ 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 15168 + * offset 19568 */ float vssFilterReciprocal; /** kPa - * offset 15172 + * offset 19572 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 15684 + * offset 20084 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15716 + * offset 20116 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 15748 + * offset 20148 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15812 + * offset 20212 */ float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 15844 + * offset 20244 */ float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 15876 + * offset 20276 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15940 + * offset 20340 */ float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 15972 + * offset 20372 */ float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L - * offset 16004 + * offset 20404 */ float unusedLuaWasHere[64]; /** deg - * offset 16260 + * offset 20660 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 17284 + * offset 21684 */ float ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 17348 + * offset 21748 */ float ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 17412 + * offset 21812 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 18436 + * offset 22836 */ float veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18500 + * offset 22900 */ float veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 18564 + * offset 22964 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 18820 + * offset 23220 */ float lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18884 + * offset 23284 */ float lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 18948 + * offset 23348 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 19204 + * offset 23604 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** * RPM is float and not integer in order to use unified methods for interpolation to - * offset 19236 + * offset 23636 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 19268 + * offset 23668 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19524 + * offset 23924 */ float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19556 + * offset 23956 */ float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19588 + * offset 23988 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19652 + * offset 24052 */ float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19684 + * offset 24084 */ float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19716 + * offset 24116 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19780 + * offset 24180 */ float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19812 + * offset 24212 */ float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19844 + * offset 24244 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19908 + * offset 24308 */ float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19940 + * offset 24340 */ float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 19972*/ + /** total size 24372*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Dec 04 23:05:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:10 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 ecd2dd8db8..e8851d3490 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -500,10 +500,10 @@ #define CLT_TIMING_CURVE_SIZE 8 #define cltCrankingCorr_offset 6484 #define cltCrankingCorrBins_offset 6452 -#define cltFuelCorr_offset 10308 -#define cltFuelCorrBins_offset 10244 -#define cltIdleCorr_offset 10692 -#define cltIdleCorrBins_offset 10628 +#define cltFuelCorr_offset 14708 +#define cltFuelCorrBins_offset 14644 +#define cltIdleCorr_offset 15092 +#define cltIdleCorrBins_offset 15028 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 #define cltRevLimitRpm_offset 3304 @@ -591,10 +591,10 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3096 #define crankingAdvanceBins_offset 3080 -#define crankingCycleBins_offset 10596 -#define crankingCycleCoef_offset 10564 -#define crankingFuelBins_offset 10532 -#define crankingFuelCoef_offset 10500 +#define crankingCycleBins_offset 14996 +#define crankingCycleCoef_offset 14964 +#define crankingFuelBins_offset 14932 +#define crankingFuelCoef_offset 14900 #define crankingIACposition_offset 2224 #define crankingInjectionMode_offset 424 #define crankingTimingAngle_offset 436 @@ -1238,8 +1238,8 @@ #define iat_tempC_1_offset 284 #define iat_tempC_2_offset 288 #define iat_tempC_3_offset 292 -#define iatFuelCorr_offset 10436 -#define iatFuelCorrBins_offset 10372 +#define iatFuelCorr_offset 14836 +#define iatFuelCorrBins_offset 14772 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 696 #define idle_derivativeFilterLoss_offset 516 @@ -1313,10 +1313,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 100 -#define ignitionIatCorrLoadBins_offset 13828 -#define ignitionIatCorrRpmBins_offset 13892 -#define ignitionIatCorrTable_offset 12804 -#define ignitionLoadBins_offset 17284 +#define ignitionIatCorrLoadBins_offset 18228 +#define ignitionIatCorrRpmBins_offset 18292 +#define ignitionIatCorrTable_offset 17204 +#define ignitionLoadBins_offset 21684 #define ignitionMode_offset 440 #define ignitionPinMode_offset 649 #define ignitionPins10_offset 645 @@ -1331,8 +1331,8 @@ #define ignitionPins7_offset 642 #define ignitionPins8_offset 643 #define ignitionPins9_offset 644 -#define ignitionRpmBins_offset 17348 -#define ignitionTable_offset 16260 +#define ignitionRpmBins_offset 21748 +#define ignitionTable_offset 20660 #define ignOverrideMode_offset 2128 #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 @@ -1352,7 +1352,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 428 -#define injectionPhase_offset 13956 +#define injectionPhase_offset 18356 #define injectionPinMode_offset 648 #define injectionPins10_offset 633 #define injectionPins11_offset 634 @@ -1392,8 +1392,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 2502 #define injectorPressureType_offset 2129 -#define injPhaseLoadBins_offset 14980 -#define injPhaseRpmBins_offset 15044 +#define injPhaseLoadBins_offset 19380 +#define injPhaseRpmBins_offset 19444 #define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 @@ -1451,9 +1451,9 @@ #define knockRetardMaximum_offset 614 #define knockRetardReapplyRate_offset 613 #define knockSamplingDuration_offset 2504 -#define lambdaLoadBins_offset 18820 -#define lambdaRpmBins_offset 18884 -#define lambdaTable_offset 18564 +#define lambdaLoadBins_offset 23220 +#define lambdaRpmBins_offset 23284 +#define lambdaTable_offset 22964 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1501,7 +1501,7 @@ #define lps25BaroSensorSda_offset 1459 #define LUA_ANALOG_INPUT_COUNT 8 #define LUA_PWM_COUNT 8 -#define LUA_SCRIPT_SIZE 3600 +#define LUA_SCRIPT_SIZE 8000 #define luaOutputPins1_offset 1220 #define luaOutputPins2_offset 1221 #define luaOutputPins3_offset 1222 @@ -1520,8 +1520,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 543 -#define mafDecoding_offset 10756 -#define mafDecodingBins_offset 11780 +#define mafDecoding_offset 15156 +#define mafDecodingBins_offset 16180 #define mafSensorType_offset 948 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 @@ -1551,12 +1551,13 @@ #define mapCamAveragingLength_offset 619 #define mapCamDetectionAnglePosition_offset 552 #define mapCamDetectionThreshold_offset 615 +#define mapCamLookForLowPeaks_offset 976 #define mapCamSkipFactor_offset 764 #define mapErrorDetectionTooHigh_offset 1780 #define mapErrorDetectionTooLow_offset 1776 -#define mapEstimateRpmBins_offset 15716 -#define mapEstimateTable_offset 15172 -#define mapEstimateTpsBins_offset 15684 +#define mapEstimateRpmBins_offset 20116 +#define mapEstimateTable_offset 19572 +#define mapEstimateTpsBins_offset 20084 #define mapHighValueVoltage_offset 2212 #define mapLowValueVoltage_offset 2208 #define mapMinBufferLength_offset 812 @@ -1656,7 +1657,7 @@ #define pedalToTpsRpmBins_offset 6444 #define pedalToTpsTable_offset 6372 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 19972 +#define persistent_config_s_size 24372 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1761,18 +1762,18 @@ #define scriptSettingName6_offset 3680 #define scriptSettingName7_offset 3696 #define scriptSettingName8_offset 3712 -#define scriptTable1_offset 19268 -#define scriptTable1LoadBins_offset 19524 -#define scriptTable1RpmBins_offset 19556 -#define scriptTable2_offset 19588 -#define scriptTable2LoadBins_offset 19652 -#define scriptTable2RpmBins_offset 19684 -#define scriptTable3_offset 19716 -#define scriptTable3LoadBins_offset 19780 -#define scriptTable3RpmBins_offset 19812 -#define scriptTable4_offset 19844 -#define scriptTable4LoadBins_offset 19908 -#define scriptTable4RpmBins_offset 19940 +#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 scriptTableName1_offset 3536 #define scriptTableName2_offset 3552 #define scriptTableName3_offset 3568 @@ -1805,7 +1806,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 24525226 +#define SIGNATURE_HASH 1706670284 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1946,7 +1947,7 @@ #define tcuDownshiftButtonPin_offset 1819 #define tcuDownshiftButtonPinMode_offset 4487 #define tcuEnabled_offset 976 -#define tcuSolenoidTable_offset 15108 +#define tcuSolenoidTable_offset 19508 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4486 #define test557pin_offset 3073 @@ -1993,7 +1994,7 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" -#define TOTAL_CONFIG_SIZE 19972 +#define TOTAL_CONFIG_SIZE 24372 #define tps1_1AdcChannel_offset 512 #define tps1_2AdcChannel_offset 681 #define tps1SecondaryMax_offset 822 @@ -2017,9 +2018,9 @@ #define tpsErrorDetectionTooLow_offset 84 #define tpsMax_offset 82 #define tpsMin_offset 80 -#define tpsTpsAccelFromRpmBins_offset 19204 -#define tpsTpsAccelTable_offset 18948 -#define tpsTpsAccelToRpmBins_offset 19236 +#define tpsTpsAccelFromRpmBins_offset 23604 +#define tpsTpsAccelTable_offset 23348 +#define tpsTpsAccelToRpmBins_offset 23636 #define trailingCoilPins10_offset 2341 #define trailingCoilPins11_offset 2342 #define trailingCoilPins12_offset 2343 @@ -2323,7 +2324,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.05.kin.24525226" +#define TS_SIGNATURE "rusEFI 2021.12.05.kin.1706670284" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2372,7 +2373,6 @@ #define unused4028_offset 4000 #define unused6312_offset 6284 #define unused970_offset 970 -#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 @@ -2431,7 +2431,7 @@ #define unusedFiller_4703_offset 4675 #define unusedLaunchRpmThreshold_offset 1032 #define unusedLogFormat_offset 496 -#define unusedLuaWasHere_offset 16004 +#define unusedLuaWasHere_offset 20404 #define unusedOldBiquad_offset 2323 #define unusedOutputFreqWhereHere_offset 832 #define unusedOutputWhereHere_offset 794 @@ -2480,15 +2480,15 @@ #define vehicleName_offset 1160 #define vehicleSpeedSensorInputPin_offset 968 #define vehicleWeight_offset 1456 -#define veLoadBins_offset 18436 +#define veLoadBins_offset 22836 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 #define verboseVVTDecoding_offset 976 -#define veRpmBins_offset 18500 -#define veTable_offset 17412 +#define veRpmBins_offset 22900 +#define veTable_offset 21812 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2504,7 +2504,7 @@ #define vrThreshold2_pin_offset 1260 #define vrThreshold2_rpmBins_offset 1264 #define vrThreshold2_values_offset 1270 -#define vssFilterReciprocal_offset 15168 +#define vssFilterReciprocal_offset 19568 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 #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_MAP_V_TWIN" @@ -2529,12 +2529,12 @@ #define vvtOffsetsPadding_offset 1232 #define vvtOutputFrequency1_offset 2244 #define vvtPins1_offset 2220 -#define vvtTable1_offset 15748 -#define vvtTable1LoadBins_offset 15812 -#define vvtTable1RpmBins_offset 15844 -#define vvtTable2_offset 15876 -#define vvtTable2LoadBins_offset 15940 -#define vvtTable2RpmBins_offset 15972 +#define vvtTable1_offset 20148 +#define vvtTable1LoadBins_offset 20212 +#define vvtTable1RpmBins_offset 20244 +#define vvtTable2_offset 20276 +#define vvtTable2LoadBins_offset 20340 +#define vvtTable2RpmBins_offset 20372 #define warning_message_offset 5972 #define warningLedPin_offset 2041 #define warningPeriod_offset 1498 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 02c93e5d8e..8cf5297b2c 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 Sat Dec 04 23:05:06 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 Sun Dec 05 19:41:16 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1997,7 +1997,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 976 bit 11 */ - bool unused976b11 : 1 {}; + bool mapCamLookForLowPeaks : 1 {}; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1 {}; @@ -4266,54 +4266,54 @@ struct persistent_config_s { lua_script_t luaScript; /** C - * offset 10272 + * offset 14672 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 10336 + * offset 14736 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 10400 + * offset 14800 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 10464 + * offset 14864 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 10528 + * offset 14928 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 10560 + * offset 14960 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 10592 + * offset 14992 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 10624 + * offset 15024 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 10656 + * offset 15056 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 10720 + * offset 15120 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4321,233 +4321,233 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 10784 + * offset 15184 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 11808 + * offset 16208 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 12832 + * offset 17232 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 13856 + * offset 18256 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 13920 + * offset 18320 */ float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 13984 + * offset 18384 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 15008 + * offset 19408 */ float injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15072 + * offset 19472 */ float injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 15136 + * offset 19536 */ 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 15196 + * offset 19596 */ float vssFilterReciprocal; /** kPa - * offset 15200 + * offset 19600 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 15712 + * offset 20112 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15744 + * offset 20144 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 15776 + * offset 20176 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15840 + * offset 20240 */ float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 15872 + * offset 20272 */ float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 15904 + * offset 20304 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15968 + * offset 20368 */ float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 16000 + * offset 20400 */ float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L - * offset 16032 + * offset 20432 */ float unusedLuaWasHere[64]; /** deg - * offset 16288 + * offset 20688 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 17312 + * offset 21712 */ float ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 17376 + * offset 21776 */ float ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 17440 + * offset 21840 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 18464 + * offset 22864 */ float veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18528 + * offset 22928 */ float veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 18592 + * offset 22992 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 18848 + * offset 23248 */ float lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18912 + * offset 23312 */ float lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 18976 + * offset 23376 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 19232 + * offset 23632 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** * RPM is float and not integer in order to use unified methods for interpolation to - * offset 19264 + * offset 23664 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 19296 + * offset 23696 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19552 + * offset 23952 */ float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19584 + * offset 23984 */ float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19616 + * offset 24016 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19680 + * offset 24080 */ float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19712 + * offset 24112 */ float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19744 + * offset 24144 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19808 + * offset 24208 */ float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19840 + * offset 24240 */ float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19872 + * offset 24272 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19936 + * offset 24336 */ float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19968 + * offset 24368 */ float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 20000*/ + /** total size 24400*/ }; // 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 Sat Dec 04 23:05:06 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 Sun Dec 05 19:41:16 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 124da6381b..d0c6d8222a 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 @@ -527,10 +527,10 @@ #define CLT_TIMING_CURVE_SIZE 8 #define cltCrankingCorr_offset 6512 #define cltCrankingCorrBins_offset 6480 -#define cltFuelCorr_offset 10336 -#define cltFuelCorrBins_offset 10272 -#define cltIdleCorr_offset 10720 -#define cltIdleCorrBins_offset 10656 +#define cltFuelCorr_offset 14736 +#define cltFuelCorrBins_offset 14672 +#define cltIdleCorr_offset 15120 +#define cltIdleCorrBins_offset 15056 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 #define cltRevLimitRpm_offset 3332 @@ -618,10 +618,10 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingCycleBins_offset 10624 -#define crankingCycleCoef_offset 10592 -#define crankingFuelBins_offset 10560 -#define crankingFuelCoef_offset 10528 +#define crankingCycleBins_offset 15024 +#define crankingCycleCoef_offset 14992 +#define crankingFuelBins_offset 14960 +#define crankingFuelCoef_offset 14928 #define crankingIACposition_offset 2228 #define crankingInjectionMode_offset 424 #define crankingTimingAngle_offset 436 @@ -1265,8 +1265,8 @@ #define iat_tempC_1_offset 284 #define iat_tempC_2_offset 288 #define iat_tempC_3_offset 292 -#define iatFuelCorr_offset 10464 -#define iatFuelCorrBins_offset 10400 +#define iatFuelCorr_offset 14864 +#define iatFuelCorrBins_offset 14800 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 696 #define idle_derivativeFilterLoss_offset 516 @@ -1340,10 +1340,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 100 -#define ignitionIatCorrLoadBins_offset 13856 -#define ignitionIatCorrRpmBins_offset 13920 -#define ignitionIatCorrTable_offset 12832 -#define ignitionLoadBins_offset 17312 +#define ignitionIatCorrLoadBins_offset 18256 +#define ignitionIatCorrRpmBins_offset 18320 +#define ignitionIatCorrTable_offset 17232 +#define ignitionLoadBins_offset 21712 #define ignitionMode_offset 440 #define ignitionPinMode_offset 649 #define ignitionPins10_offset 645 @@ -1358,8 +1358,8 @@ #define ignitionPins7_offset 642 #define ignitionPins8_offset 643 #define ignitionPins9_offset 644 -#define ignitionRpmBins_offset 17376 -#define ignitionTable_offset 16288 +#define ignitionRpmBins_offset 21776 +#define ignitionTable_offset 20688 #define ignOverrideMode_offset 2128 #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 @@ -1379,7 +1379,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 428 -#define injectionPhase_offset 13984 +#define injectionPhase_offset 18384 #define injectionPinMode_offset 648 #define injectionPins10_offset 633 #define injectionPins11_offset 634 @@ -1419,8 +1419,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 2510 #define injectorPressureType_offset 2129 -#define injPhaseLoadBins_offset 15008 -#define injPhaseRpmBins_offset 15072 +#define injPhaseLoadBins_offset 19408 +#define injPhaseRpmBins_offset 19472 #define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 @@ -1478,9 +1478,9 @@ #define knockRetardMaximum_offset 614 #define knockRetardReapplyRate_offset 613 #define knockSamplingDuration_offset 2512 -#define lambdaLoadBins_offset 18848 -#define lambdaRpmBins_offset 18912 -#define lambdaTable_offset 18592 +#define lambdaLoadBins_offset 23248 +#define lambdaRpmBins_offset 23312 +#define lambdaTable_offset 22992 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1528,7 +1528,7 @@ #define lps25BaroSensorSda_offset 1459 #define LUA_ANALOG_INPUT_COUNT 8 #define LUA_PWM_COUNT 8 -#define LUA_SCRIPT_SIZE 3600 +#define LUA_SCRIPT_SIZE 8000 #define luaOutputPins1_offset 1220 #define luaOutputPins2_offset 1221 #define luaOutputPins3_offset 1222 @@ -1547,8 +1547,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 543 -#define mafDecoding_offset 10784 -#define mafDecodingBins_offset 11808 +#define mafDecoding_offset 15184 +#define mafDecodingBins_offset 16208 #define mafSensorType_offset 948 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 @@ -1578,12 +1578,13 @@ #define mapCamAveragingLength_offset 619 #define mapCamDetectionAnglePosition_offset 552 #define mapCamDetectionThreshold_offset 615 +#define mapCamLookForLowPeaks_offset 976 #define mapCamSkipFactor_offset 764 #define mapErrorDetectionTooHigh_offset 1780 #define mapErrorDetectionTooLow_offset 1776 -#define mapEstimateRpmBins_offset 15744 -#define mapEstimateTable_offset 15200 -#define mapEstimateTpsBins_offset 15712 +#define mapEstimateRpmBins_offset 20144 +#define mapEstimateTable_offset 19600 +#define mapEstimateTpsBins_offset 20112 #define mapHighValueVoltage_offset 2212 #define mapLowValueVoltage_offset 2208 #define mapMinBufferLength_offset 812 @@ -1683,7 +1684,7 @@ #define pedalToTpsRpmBins_offset 6472 #define pedalToTpsTable_offset 6400 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 20000 +#define persistent_config_s_size 24400 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1788,18 +1789,18 @@ #define scriptSettingName6_offset 3708 #define scriptSettingName7_offset 3724 #define scriptSettingName8_offset 3740 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 +#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 scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1833,7 +1834,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 127665338 +#define SIGNATURE_HASH 1666418140 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1974,7 +1975,7 @@ #define tcuDownshiftButtonPin_offset 1819 #define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 -#define tcuSolenoidTable_offset 15136 +#define tcuSolenoidTable_offset 19536 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 #define test557pin_offset 3101 @@ -2021,7 +2022,7 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" -#define TOTAL_CONFIG_SIZE 20000 +#define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 512 #define tps1_2AdcChannel_offset 681 #define tps1SecondaryMax_offset 822 @@ -2045,9 +2046,9 @@ #define tpsErrorDetectionTooLow_offset 84 #define tpsMax_offset 82 #define tpsMin_offset 80 -#define tpsTpsAccelFromRpmBins_offset 19232 -#define tpsTpsAccelTable_offset 18976 -#define tpsTpsAccelToRpmBins_offset 19264 +#define tpsTpsAccelFromRpmBins_offset 23632 +#define tpsTpsAccelTable_offset 23376 +#define tpsTpsAccelToRpmBins_offset 23664 #define trailingCoilPins10_offset 2349 #define trailingCoilPins11_offset 2350 #define trailingCoilPins12_offset 2351 @@ -2351,7 +2352,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.12.05.subaru_eg33_f7.127665338" +#define TS_SIGNATURE "rusEFI 2021.12.05.subaru_eg33_f7.1666418140" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2400,7 +2401,6 @@ #define unused4028_offset 4028 #define unused6312_offset 6312 #define unused970_offset 970 -#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 @@ -2459,7 +2459,7 @@ #define unusedFiller_4703_offset 4703 #define unusedLaunchRpmThreshold_offset 1032 #define unusedLogFormat_offset 496 -#define unusedLuaWasHere_offset 16032 +#define unusedLuaWasHere_offset 20432 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 #define unusedOutputWhereHere_offset 794 @@ -2508,15 +2508,15 @@ #define vehicleName_offset 1160 #define vehicleSpeedSensorInputPin_offset 968 #define vehicleWeight_offset 1456 -#define veLoadBins_offset 18464 +#define veLoadBins_offset 22864 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 #define verboseVVTDecoding_offset 976 -#define veRpmBins_offset 18528 -#define veTable_offset 17440 +#define veRpmBins_offset 22928 +#define veTable_offset 21840 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2532,7 +2532,7 @@ #define vrThreshold2_pin_offset 1260 #define vrThreshold2_rpmBins_offset 1264 #define vrThreshold2_values_offset 1270 -#define vssFilterReciprocal_offset 15196 +#define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 #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_MAP_V_TWIN" @@ -2565,12 +2565,12 @@ #define vvtPins2_offset 2221 #define vvtPins3_offset 2222 #define vvtPins4_offset 2223 -#define vvtTable1_offset 15776 -#define vvtTable1LoadBins_offset 15840 -#define vvtTable1RpmBins_offset 15872 -#define vvtTable2_offset 15904 -#define vvtTable2LoadBins_offset 15968 -#define vvtTable2RpmBins_offset 16000 +#define vvtTable1_offset 20176 +#define vvtTable1LoadBins_offset 20240 +#define vvtTable1RpmBins_offset 20272 +#define vvtTable2_offset 20304 +#define vvtTable2LoadBins_offset 20368 +#define vvtTable2RpmBins_offset 20400 #define warning_message_offset 6000 #define warningLedPin_offset 2041 #define warningPeriod_offset 1498 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index f9bc5883c3..d087869f4c 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 Sat Dec 04 23:05:10 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:22 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1997,7 +1997,7 @@ struct engine_configuration_s { bool stftIgnoreErrorMagnitude : 1 {}; /** offset 976 bit 11 */ - bool unused976b11 : 1 {}; + bool mapCamLookForLowPeaks : 1 {}; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1 {}; @@ -4266,54 +4266,54 @@ struct persistent_config_s { lua_script_t luaScript; /** C - * offset 10272 + * offset 14672 */ float cltFuelCorrBins[CLT_CURVE_SIZE]; /** ratio - * offset 10336 + * offset 14736 */ float cltFuelCorr[CLT_CURVE_SIZE]; /** C - * offset 10400 + * offset 14800 */ float iatFuelCorrBins[IAT_CURVE_SIZE]; /** ratio - * offset 10464 + * offset 14864 */ float iatFuelCorr[IAT_CURVE_SIZE]; /** ratio - * offset 10528 + * offset 14928 */ float crankingFuelCoef[CRANKING_CURVE_SIZE]; /** C - * offset 10560 + * offset 14960 */ float crankingFuelBins[CRANKING_CURVE_SIZE]; /** ratio - * offset 10592 + * offset 14992 */ float crankingCycleCoef[CRANKING_CURVE_SIZE]; /** counter - * offset 10624 + * offset 15024 */ float crankingCycleBins[CRANKING_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller C - * offset 10656 + * offset 15056 */ float cltIdleCorrBins[CLT_CURVE_SIZE]; /** * CLT-based idle position multiplier for simple manual idle controller ratio - * offset 10720 + * offset 15120 */ float cltIdleCorr[CLT_CURVE_SIZE]; /** @@ -4321,233 +4321,233 @@ struct persistent_config_s { * kg/hour value. * By the way 2.081989116 kg/h = 1 ft3/m kg/hour - * offset 10784 + * offset 15184 */ float mafDecoding[MAF_DECODING_COUNT]; /** V - * offset 11808 + * offset 16208 */ float mafDecodingBins[MAF_DECODING_COUNT]; /** deg - * offset 12832 + * offset 17232 */ float ignitionIatCorrTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Temperature - * offset 13856 + * offset 18256 */ float ignitionIatCorrLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 13920 + * offset 18320 */ float ignitionIatCorrRpmBins[IGN_RPM_COUNT]; /** deg - * offset 13984 + * offset 18384 */ float injectionPhase[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 15008 + * offset 19408 */ float injPhaseLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15072 + * offset 19472 */ float injPhaseRpmBins[FUEL_RPM_COUNT]; /** onoff - * offset 15136 + * offset 19536 */ 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 15196 + * offset 19596 */ float vssFilterReciprocal; /** kPa - * offset 15200 + * offset 19600 */ uint16_t mapEstimateTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** % TPS - * offset 15712 + * offset 20112 */ scaled_channel mapEstimateTpsBins[FUEL_LOAD_COUNT]; /** RPM - * offset 15744 + * offset 20144 */ uint16_t mapEstimateRpmBins[FUEL_RPM_COUNT]; /** value - * offset 15776 + * offset 20176 */ uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15840 + * offset 20240 */ float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 15872 + * offset 20272 */ float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 15904 + * offset 20304 */ uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 15968 + * offset 20368 */ float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 16000 + * offset 20400 */ float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L - * offset 16032 + * offset 20432 */ float unusedLuaWasHere[64]; /** deg - * offset 16288 + * offset 20688 */ float ignitionTable[IGN_RPM_COUNT][IGN_LOAD_COUNT]; /** Load - * offset 17312 + * offset 21712 */ float ignitionLoadBins[IGN_LOAD_COUNT]; /** RPM - * offset 17376 + * offset 21776 */ float ignitionRpmBins[IGN_RPM_COUNT]; /** % - * offset 17440 + * offset 21840 */ float veTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** kPa - * offset 18464 + * offset 22864 */ float veLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18528 + * offset 22928 */ float veRpmBins[FUEL_RPM_COUNT]; /** lambda - * offset 18592 + * offset 22992 */ scaled_channel lambdaTable[FUEL_RPM_COUNT][FUEL_LOAD_COUNT]; /** - * offset 18848 + * offset 23248 */ float lambdaLoadBins[FUEL_LOAD_COUNT]; /** RPM - * offset 18912 + * offset 23312 */ float lambdaRpmBins[FUEL_RPM_COUNT]; /** value - * offset 18976 + * offset 23376 */ float tpsTpsAccelTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; /** from - * offset 19232 + * offset 23632 */ float tpsTpsAccelFromRpmBins[TPS_TPS_ACCEL_TABLE]; /** * RPM is float and not integer in order to use unified methods for interpolation to - * offset 19264 + * offset 23664 */ float tpsTpsAccelToRpmBins[TPS_TPS_ACCEL_TABLE]; /** value - * offset 19296 + * offset 23696 */ float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19552 + * offset 23952 */ float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19584 + * offset 23984 */ float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19616 + * offset 24016 */ uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19680 + * offset 24080 */ float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19712 + * offset 24112 */ float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19744 + * offset 24144 */ uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19808 + * offset 24208 */ float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19840 + * offset 24240 */ float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value - * offset 19872 + * offset 24272 */ uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L - * offset 19936 + * offset 24336 */ float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM - * offset 19968 + * offset 24368 */ float scriptTable4RpmBins[SCRIPT_TABLE_8]; - /** total size 20000*/ + /** total size 24400*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Dec 04 23:05:10 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:22 UTC 2021 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 43b08f9d82..a8a736b63f 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -515,10 +515,10 @@ #define CLT_TIMING_CURVE_SIZE 8 #define cltCrankingCorr_offset 6512 #define cltCrankingCorrBins_offset 6480 -#define cltFuelCorr_offset 10336 -#define cltFuelCorrBins_offset 10272 -#define cltIdleCorr_offset 10720 -#define cltIdleCorrBins_offset 10656 +#define cltFuelCorr_offset 14736 +#define cltFuelCorrBins_offset 14672 +#define cltIdleCorr_offset 15120 +#define cltIdleCorrBins_offset 15056 #define cltIdleRpm_offset 1960 #define cltIdleRpmBins_offset 1896 #define cltRevLimitRpm_offset 3332 @@ -606,10 +606,10 @@ #define cranking_rpm_offset 92 #define crankingAdvance_offset 3124 #define crankingAdvanceBins_offset 3108 -#define crankingCycleBins_offset 10624 -#define crankingCycleCoef_offset 10592 -#define crankingFuelBins_offset 10560 -#define crankingFuelCoef_offset 10528 +#define crankingCycleBins_offset 15024 +#define crankingCycleCoef_offset 14992 +#define crankingFuelBins_offset 14960 +#define crankingFuelCoef_offset 14928 #define crankingIACposition_offset 2228 #define crankingInjectionMode_offset 424 #define crankingTimingAngle_offset 436 @@ -1253,8 +1253,8 @@ #define iat_tempC_1_offset 284 #define iat_tempC_2_offset 288 #define iat_tempC_3_offset 292 -#define iatFuelCorr_offset 10464 -#define iatFuelCorrBins_offset 10400 +#define iatFuelCorr_offset 14864 +#define iatFuelCorrBins_offset 14800 #define IDLE_ADVANCE_CURVE_SIZE 8 #define idle_antiwindupFreq_offset 696 #define idle_derivativeFilterLoss_offset 516 @@ -1328,10 +1328,10 @@ #define ignition_mode_e_IM_TWO_COILS 3 #define ignition_mode_e_IM_WASTED_SPARK 2 #define ignitionDwellForCrankingMs_offset 100 -#define ignitionIatCorrLoadBins_offset 13856 -#define ignitionIatCorrRpmBins_offset 13920 -#define ignitionIatCorrTable_offset 12832 -#define ignitionLoadBins_offset 17312 +#define ignitionIatCorrLoadBins_offset 18256 +#define ignitionIatCorrRpmBins_offset 18320 +#define ignitionIatCorrTable_offset 17232 +#define ignitionLoadBins_offset 21712 #define ignitionMode_offset 440 #define ignitionPinMode_offset 649 #define ignitionPins10_offset 645 @@ -1346,8 +1346,8 @@ #define ignitionPins7_offset 642 #define ignitionPins8_offset 643 #define ignitionPins9_offset 644 -#define ignitionRpmBins_offset 17376 -#define ignitionTable_offset 16288 +#define ignitionRpmBins_offset 21776 +#define ignitionTable_offset 20688 #define ignOverrideMode_offset 2128 #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 @@ -1367,7 +1367,7 @@ #define injection_mode_e_IM_SIMULTANEOUS 0 #define injection_mode_e_IM_SINGLE_POINT 3 #define injectionMode_offset 428 -#define injectionPhase_offset 13984 +#define injectionPhase_offset 18384 #define injectionPinMode_offset 648 #define injectionPins10_offset 633 #define injectionPins11_offset 634 @@ -1407,8 +1407,8 @@ #define InjectorNonlinearMode_INJ_PolynomialAdder 1 #define injectorNonlinearMode_offset 2510 #define injectorPressureType_offset 2129 -#define injPhaseLoadBins_offset 15008 -#define injPhaseRpmBins_offset 15072 +#define injPhaseLoadBins_offset 19408 +#define injPhaseRpmBins_offset 19472 #define invertCamVVTSignal_offset 976 #define invertPrimaryTriggerSignal_offset 1464 #define invertSecondaryTriggerSignal_offset 1464 @@ -1466,9 +1466,9 @@ #define knockRetardMaximum_offset 614 #define knockRetardReapplyRate_offset 613 #define knockSamplingDuration_offset 2512 -#define lambdaLoadBins_offset 18848 -#define lambdaRpmBins_offset 18912 -#define lambdaTable_offset 18592 +#define lambdaLoadBins_offset 23248 +#define lambdaRpmBins_offset 23312 +#define lambdaTable_offset 22992 #define launchActivateDelay_offset 1060 #define launchActivatePin_offset 991 #define launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH 2 @@ -1516,7 +1516,7 @@ #define lps25BaroSensorSda_offset 1459 #define LUA_ANALOG_INPUT_COUNT 8 #define LUA_PWM_COUNT 8 -#define LUA_SCRIPT_SIZE 3600 +#define LUA_SCRIPT_SIZE 8000 #define luaOutputPins1_offset 1220 #define luaOutputPins2_offset 1221 #define luaOutputPins3_offset 1222 @@ -1535,8 +1535,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 543 -#define mafDecoding_offset 10784 -#define mafDecodingBins_offset 11808 +#define mafDecoding_offset 15184 +#define mafDecodingBins_offset 16208 #define mafSensorType_offset 948 #define MAIN_HELP_URL "http://www.rusefi.com/" #define mainRelayPin_offset 706 @@ -1566,12 +1566,13 @@ #define mapCamAveragingLength_offset 619 #define mapCamDetectionAnglePosition_offset 552 #define mapCamDetectionThreshold_offset 615 +#define mapCamLookForLowPeaks_offset 976 #define mapCamSkipFactor_offset 764 #define mapErrorDetectionTooHigh_offset 1780 #define mapErrorDetectionTooLow_offset 1776 -#define mapEstimateRpmBins_offset 15744 -#define mapEstimateTable_offset 15200 -#define mapEstimateTpsBins_offset 15712 +#define mapEstimateRpmBins_offset 20144 +#define mapEstimateTable_offset 19600 +#define mapEstimateTpsBins_offset 20112 #define mapHighValueVoltage_offset 2212 #define mapLowValueVoltage_offset 2208 #define mapMinBufferLength_offset 812 @@ -1671,7 +1672,7 @@ #define pedalToTpsRpmBins_offset 6472 #define pedalToTpsTable_offset 6400 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 20000 +#define persistent_config_s_size 24400 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1776,18 +1777,18 @@ #define scriptSettingName6_offset 3708 #define scriptSettingName7_offset 3724 #define scriptSettingName8_offset 3740 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 +#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 scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1820,7 +1821,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 3290829546 +#define SIGNATURE_HASH 2699662220 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1961,7 +1962,7 @@ #define tcuDownshiftButtonPin_offset 1819 #define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 -#define tcuSolenoidTable_offset 15136 +#define tcuSolenoidTable_offset 19536 #define tcuUpshiftButtonPin_offset 1818 #define tcuUpshiftButtonPinMode_offset 4514 #define test557pin_offset 3101 @@ -2008,7 +2009,7 @@ #define TOOTH_PACKET_COUNT 1000 #define TOOTH_PACKET_SIZE 2 #define TOP_DEAD_CENTER_MESSAGE "r" -#define TOTAL_CONFIG_SIZE 20000 +#define TOTAL_CONFIG_SIZE 24400 #define tps1_1AdcChannel_offset 512 #define tps1_2AdcChannel_offset 681 #define tps1SecondaryMax_offset 822 @@ -2032,9 +2033,9 @@ #define tpsErrorDetectionTooLow_offset 84 #define tpsMax_offset 82 #define tpsMin_offset 80 -#define tpsTpsAccelFromRpmBins_offset 19232 -#define tpsTpsAccelTable_offset 18976 -#define tpsTpsAccelToRpmBins_offset 19264 +#define tpsTpsAccelFromRpmBins_offset 23632 +#define tpsTpsAccelTable_offset 23376 +#define tpsTpsAccelToRpmBins_offset 23664 #define trailingCoilPins10_offset 2349 #define trailingCoilPins11_offset 2350 #define trailingCoilPins12_offset 2351 @@ -2338,7 +2339,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.12.05.all.3290829546" +#define TS_SIGNATURE "rusEFI 2021.12.05.all.2699662220" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2387,7 +2388,6 @@ #define unused4028_offset 4028 #define unused6312_offset 6312 #define unused970_offset 970 -#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 @@ -2446,7 +2446,7 @@ #define unusedFiller_4703_offset 4703 #define unusedLaunchRpmThreshold_offset 1032 #define unusedLogFormat_offset 496 -#define unusedLuaWasHere_offset 16032 +#define unusedLuaWasHere_offset 20432 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 #define unusedOutputWhereHere_offset 794 @@ -2495,15 +2495,15 @@ #define vehicleName_offset 1160 #define vehicleSpeedSensorInputPin_offset 968 #define vehicleWeight_offset 1456 -#define veLoadBins_offset 18464 +#define veLoadBins_offset 22864 #define veOverrideMode_offset 2109 #define verboseCan2BaseAddress_offset 2112 #define verboseCanBaseAddress_offset 756 #define verboseTLE8888_offset 744 #define verboseTriggerSynchDetails_offset 1476 #define verboseVVTDecoding_offset 976 -#define veRpmBins_offset 18528 -#define veTable_offset 17440 +#define veRpmBins_offset 22928 +#define veTable_offset 21840 #define VM_VVT_INACTIVE 0 #define VOLTAGE_1_BYTE_PACKING_DIV 0.02 #define VR_THRESHOLD_COUNT 2 @@ -2519,7 +2519,7 @@ #define vrThreshold2_pin_offset 1260 #define vrThreshold2_rpmBins_offset 1264 #define vrThreshold2_values_offset 1270 -#define vssFilterReciprocal_offset 15196 +#define vssFilterReciprocal_offset 19596 #define vssGearRatio_offset 616 #define vssToothCount_offset 618 #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_MAP_V_TWIN" @@ -2552,12 +2552,12 @@ #define vvtPins2_offset 2221 #define vvtPins3_offset 2222 #define vvtPins4_offset 2223 -#define vvtTable1_offset 15776 -#define vvtTable1LoadBins_offset 15840 -#define vvtTable1RpmBins_offset 15872 -#define vvtTable2_offset 15904 -#define vvtTable2LoadBins_offset 15968 -#define vvtTable2RpmBins_offset 16000 +#define vvtTable1_offset 20176 +#define vvtTable1LoadBins_offset 20240 +#define vvtTable1RpmBins_offset 20272 +#define vvtTable2_offset 20304 +#define vvtTable2LoadBins_offset 20368 +#define vvtTable2RpmBins_offset 20400 #define warning_message_offset 6000 #define warningLedPin_offset 2041 #define warningPeriod_offset 1498 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index fc8e93c51e..e8a3df553d 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 3290829546 -#define TS_SIGNATURE "rusEFI 2021.12.05.all.3290829546" +#define SIGNATURE_HASH 2699662220 +#define TS_SIGNATURE "rusEFI 2021.12.05.all.2699662220" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ef110202ad..23ed67deb7 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 3639404493 -#define TS_SIGNATURE "rusEFI 2021.12.05.atlas.3639404493" +#define SIGNATURE_HASH 3156436651 +#define TS_SIGNATURE "rusEFI 2021.12.05.atlas.3156436651" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index be58801cd5..94c9b3f474 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 3290829546 -#define TS_SIGNATURE "rusEFI 2021.12.05.f429-discovery.3290829546" +#define SIGNATURE_HASH 2699662220 +#define TS_SIGNATURE "rusEFI 2021.12.05.f429-discovery.2699662220" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b9123b834f..778e66f2a8 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 3188999939 -#define TS_SIGNATURE "rusEFI 2021.12.05.frankenso_na6.3188999939" +#define SIGNATURE_HASH 3671836261 +#define TS_SIGNATURE "rusEFI 2021.12.05.frankenso_na6.3671836261" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index de64aabba2..454cb71365 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 1643389539 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen-nb1.1643389539" +#define SIGNATURE_HASH 87794437 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen-nb1.87794437" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 8209f7b9e8..fe1eb8cc73 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 2141352011 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen121nissan.2141352011" +#define SIGNATURE_HASH 460189997 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen121nissan.460189997" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 565468584d..491e5bf83d 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 2609198816 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen121vag.2609198816" +#define SIGNATURE_HASH 4283086726 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen121vag.4283086726" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 70ac1f9a2d..f368130a74 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 1591769421 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen128.1591769421" +#define SIGNATURE_HASH 976222251 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen128.976222251" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index e0a4d74db2..2878abb4af 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 3874623564 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen154hyundai.3874623564" +#define SIGNATURE_HASH 2185072938 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen154hyundai.2185072938" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 64462a0ba2..7e881de7a6 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 815502682 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen72.815502682" +#define SIGNATURE_HASH 1414796348 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen72.1414796348" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 0b462057af..f66241c673 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 2224425129 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen81.2224425129" +#define SIGNATURE_HASH 3763964367 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen81.3763964367" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 06635ab0bc..ba5d60e31f 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 1709605813 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen88bmw.1709605813" +#define SIGNATURE_HASH 19464915 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen88bmw.19464915" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index dc43a2745c..4ce19ad1b3 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 2988135490 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellenNA6.2988135490" +#define SIGNATURE_HASH 3604272420 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellenNA6.3604272420" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index f6251ce6f0..d221a69cea 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 4275303766 -#define TS_SIGNATURE "rusEFI 2021.12.05.hellen_cypress.4275303766" +#define SIGNATURE_HASH 2585556016 +#define TS_SIGNATURE "rusEFI 2021.12.05.hellen_cypress.2585556016" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 79e62c6d72..3ad906fd27 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 24525226 -#define TS_SIGNATURE "rusEFI 2021.12.05.kin.24525226" +#define SIGNATURE_HASH 1706670284 +#define TS_SIGNATURE "rusEFI 2021.12.05.kin.1706670284" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 19d06990ec..2c99798d17 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 1996580958 -#define TS_SIGNATURE "rusEFI 2021.12.05.mre_f4.1996580958" +#define SIGNATURE_HASH 332327224 +#define TS_SIGNATURE "rusEFI 2021.12.05.mre_f4.332327224" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 866cb83f70..08100aedbb 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 1996580958 -#define TS_SIGNATURE "rusEFI 2021.12.05.mre_f7.1996580958" +#define SIGNATURE_HASH 332327224 +#define TS_SIGNATURE "rusEFI 2021.12.05.mre_f7.332327224" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9dd0b7bdd7..074aad0a03 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 2496449292 -#define TS_SIGNATURE "rusEFI 2021.12.05.prometheus_405.2496449292" +#define SIGNATURE_HASH 4026747498 +#define TS_SIGNATURE "rusEFI 2021.12.05.prometheus_405.4026747498" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f6bc0b31c1..ac4d0a4898 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 2496449292 -#define TS_SIGNATURE "rusEFI 2021.12.05.prometheus_469.2496449292" +#define SIGNATURE_HASH 4026747498 +#define TS_SIGNATURE "rusEFI 2021.12.05.prometheus_469.4026747498" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5c0497b968..593a40d170 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 2014832965 -#define TS_SIGNATURE "rusEFI 2021.12.05.proteus_f4.2014832965" +#define SIGNATURE_HASH 483944483 +#define TS_SIGNATURE "rusEFI 2021.12.05.proteus_f4.483944483" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 3e0dc7c4d4..def8731288 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 2014832965 -#define TS_SIGNATURE "rusEFI 2021.12.05.proteus_f7.2014832965" +#define SIGNATURE_HASH 483944483 +#define TS_SIGNATURE "rusEFI 2021.12.05.proteus_f7.483944483" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 72ddef53c0..554c65c06f 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 127665338 -#define TS_SIGNATURE "rusEFI 2021.12.05.subaru_eg33_f7.127665338" +#define SIGNATURE_HASH 1666418140 +#define TS_SIGNATURE "rusEFI 2021.12.05.subaru_eg33_f7.1666418140" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 66c70abf8f..ab60d5b874 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.05.all.3290829546" + signature = "rusEFI 2021.12.05.all.2699662220" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.all.3290829546" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.all.2699662220" ; 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 Sun Dec 05 04:35:15 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:07 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5751,6 +5751,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index ecea517e40..33f1b75cf6 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.05.atlas.3639404493" + signature = "rusEFI 2021.12.05.atlas.3156436651" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.atlas.3639404493" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.atlas.3156436651" ; 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 Sun Dec 05 04:35:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:04 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5742,6 +5742,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 98e7031819..95643ec650 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.05.f429-discovery.3290829546" + signature = "rusEFI 2021.12.05.f429-discovery.2699662220" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.f429-discovery.3290829546" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.f429-discovery.2699662220" ; 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 Sun Dec 05 04:34:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:07 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5751,6 +5751,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 10c6fe0b4c..dbfa26476a 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.05.frankenso_na6.3188999939" + signature = "rusEFI 2021.12.05.frankenso_na6.3671836261" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.frankenso_na6.3188999939" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.frankenso_na6.3671836261" ; 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 Sun Dec 05 04:35:00 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:47 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5751,6 +5751,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 976627d170..f13fe8a2ef 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.05.hellen-nb1.1643389539" + signature = "rusEFI 2021.12.05.hellen-nb1.87794437" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen-nb1.1643389539" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen-nb1.87794437" ; 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 Sun Dec 05 04:34:50 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:33 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5715,6 +5715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2ca85389b0..21b2e9ad83 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.05.hellen121nissan.2141352011" + signature = "rusEFI 2021.12.05.hellen121nissan.460189997" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen121nissan.2141352011" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen121nissan.460189997" ; 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 Sun Dec 05 04:34:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:16 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5716,6 +5716,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c3a0120350..9f6808db79 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.05.hellen121vag.2609198816" + signature = "rusEFI 2021.12.05.hellen121vag.4283086726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen121vag.2609198816" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen121vag.4283086726" ; 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 Sun Dec 05 04:34:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:13 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5718,6 +5718,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 1b6b531fe1..5b68ba0bc3 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.05.hellen128.1591769421" + signature = "rusEFI 2021.12.05.hellen128.976222251" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen128.1591769421" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen128.976222251" ; 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 Sun Dec 05 04:34:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:10 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5716,6 +5716,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index e57f510d13..b23ac5d383 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.05.hellen154hyundai.3874623564" + signature = "rusEFI 2021.12.05.hellen154hyundai.2185072938" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen154hyundai.3874623564" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen154hyundai.2185072938" ; 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 Sun Dec 05 04:34:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:20 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5715,6 +5715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 853a2cc1f5..73bc66c620 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.05.hellen72.815502682" + signature = "rusEFI 2021.12.05.hellen72.1414796348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen72.815502682" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen72.1414796348" ; 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 Sun Dec 05 04:34:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:26 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5715,6 +5715,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index d2f17a7557..417c3fcf29 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.05.hellen81.2224425129" + signature = "rusEFI 2021.12.05.hellen81.3763964367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen81.2224425129" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen81.3763964367" ; 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 Sun Dec 05 04:34:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:30 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5712,6 +5712,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 273358eae4..defdd998d1 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.05.hellen88bmw.1709605813" + signature = "rusEFI 2021.12.05.hellen88bmw.19464915" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen88bmw.1709605813" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen88bmw.19464915" ; 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 Sun Dec 05 04:34:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:23 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5713,6 +5713,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 53118636dd..c5742ec7df 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.05.hellenNA6.2988135490" + signature = "rusEFI 2021.12.05.hellenNA6.3604272420" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellenNA6.2988135490" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellenNA6.3604272420" ; 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 Sun Dec 05 04:34:52 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:36 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5716,6 +5716,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index f85fc4affa..5c47e84f8f 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.05.hellen_cypress.4275303766" + signature = "rusEFI 2021.12.05.hellen_cypress.2585556016" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.hellen_cypress.4275303766" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.hellen_cypress.2585556016" ; 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 Sun Dec 05 04:35:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:13 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5751,6 +5751,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 614cd58c9c..241dc560ee 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.05.kin.24525226" + signature = "rusEFI 2021.12.05.kin.1706670284" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.kin.24525226" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.kin.1706670284" ; 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 Sun Dec 05 04:35:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Dec 05 19:41:10 UTC 2021 -pageSize = 19972 +pageSize = 24372 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -495,7 +495,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1273,66 +1273,66 @@ idleAdvanceBins = array, F32, 6516, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6548, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6580, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6612, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6644, 3600 -cltFuelCorrBins = array, F32, 10244, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10308, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10372, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10436, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10500, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10532, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10564, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10596, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10628, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10692, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10756, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11780, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12804, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13828, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13892, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13956, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 14980, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15044, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15108, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15168, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15172, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15684, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15716, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15748, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15812, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15844, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15876, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15940, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 15972, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16004, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16260, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17284, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17348, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17412, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18436, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18500, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6644, 8000 +cltFuelCorrBins = array, F32, 14644, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14708, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14772, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14836, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14900, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14932, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14964, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 14996, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15028, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15092, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15156, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16180, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17204, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18228, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18292, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18356, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19380, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19444, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19508, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19568, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19572, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20084, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20116, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20148, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20212, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20244, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20276, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20340, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20372, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20404, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18564, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22964, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18564, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22964, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18820, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18884, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18948, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19204, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19236, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19268, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19524, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19556, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19588, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19652, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19684, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19716, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19780, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19812, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19844, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19908, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 19972 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5718,6 +5718,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c3a262b495..3ea84885d4 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.05.mre_f4.1996580958" + signature = "rusEFI 2021.12.05.mre_f4.332327224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.mre_f4.1996580958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.mre_f4.332327224" ; 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 Sun Dec 05 04:34:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:43 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5721,6 +5721,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a76cfbb7ee..aaeb17815b 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.05.mre_f7.1996580958" + signature = "rusEFI 2021.12.05.mre_f7.332327224" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.mre_f7.1996580958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.mre_f7.332327224" ; 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 Sun Dec 05 04:34:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:40 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5721,6 +5721,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index dd26009af6..748123eb9d 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.05.prometheus_405.2496449292" + signature = "rusEFI 2021.12.05.prometheus_405.4026747498" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.prometheus_405.2496449292" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.prometheus_405.4026747498" ; 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 Sun Dec 05 04:35:05 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:53 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5746,6 +5746,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index e815fd298d..645e15d7eb 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.05.prometheus_469.2496449292" + signature = "rusEFI 2021.12.05.prometheus_469.4026747498" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.prometheus_469.2496449292" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.prometheus_469.4026747498" ; 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 Sun Dec 05 04:35:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:50 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5746,6 +5746,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 16207d7cdc..e05d5505df 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.05.proteus_f4.2014832965" + signature = "rusEFI 2021.12.05.proteus_f4.483944483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.proteus_f4.2014832965" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.proteus_f4.483944483" ; 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 Sun Dec 05 04:35:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:01 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5714,6 +5714,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index c9348d9c58..3b14bcfe28 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.05.proteus_f7.2014832965" + signature = "rusEFI 2021.12.05.proteus_f7.483944483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.proteus_f7.2014832965" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.proteus_f7.483944483" ; 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 Sun Dec 05 04:35:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:40:57 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5714,6 +5714,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 60982ac305..b90a670757 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.05.subaru_eg33_f7.127665338" + signature = "rusEFI 2021.12.05.subaru_eg33_f7.1666418140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.12.05.subaru_eg33_f7.127665338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.12.05.subaru_eg33_f7.1666418140" ; 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 Sun Dec 05 04:35:21 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 Sun Dec 05 19:41:16 UTC 2021 -pageSize = 20000 +pageSize = 24400 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", "UNUSED28", "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" engineSnifferRpmThreshold = scalar, S32, 4, "RPM", 1, 0, 0, 30000, 0 @@ -498,7 +498,7 @@ enableCanVss = bits, U32, 976, [7:7], "false", "true" enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning = bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude = bits, U32, 976, [10:10], "false", "true" -unused976b11 = bits, U32, 976, [11:11], "false", "true" +mapCamLookForLowPeaks = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1295,66 +1295,66 @@ idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0, 18000, 2 idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2 idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0, 18000, 2 idleVe = array, F32, 6640, [8], "%", 1, 0, 0, 999, 2 -luaScript = string, ASCII, 6672, 3600 -cltFuelCorrBins = array, F32, 10272, [16], "C", 1, 0, -100, 250, 2 -cltFuelCorr = array, F32, 10336, [16], "ratio", 1, 0, 0, 5, 2 -iatFuelCorrBins = array, F32, 10400, [16], "C", 1, 0, -100, 250, 2 -iatFuelCorr = array, F32, 10464, [16], "ratio", 1, 0, 0, 5, 2 -crankingFuelCoef = array, F32, 10528, [8], "ratio", 1, 0, 0.1, 50, 2 -crankingFuelBins = array, F32, 10560, [8], "C", 1, 0, -80, 170, 2 -crankingCycleCoef = array, F32, 10592, [8], "ratio", 1, 0, 0, 5, 2 -crankingCycleBins = array, F32, 10624, [8], "counter", 1, 0, -80, 170, 0 -cltIdleCorrBins = array, F32, 10656, [16], "C", 1, 0, -100, 250, 2 -cltIdleCorr = array, F32, 10720, [16], "ratio", 1, 0, 0, 10, 2 -mafDecoding = array, F32, 10784, [256], "kg/hour", 1, 0, -500, 4000, 2 -mafDecodingBins = array, F32, 11808, [256], "V", 1, 0, -5, 150, 2 -ignitionIatCorrTable = array, F32, 12832, [16x16], "deg", 1, 0, -720, 720, 2 -ignitionIatCorrLoadBins = array, F32, 13856, [16], "Temperature", 1, 0, 0, 500, 2 -ignitionIatCorrRpmBins = array, F32, 13920, [16], "RPM", 1, 0, 0, 18000, 2 -injectionPhase = array, F32, 13984, [16x16], "deg", 1, 0, -720, 720, 2 -injPhaseLoadBins = array, F32, 15008, [16], "Load", 1, 0, 0, 500, 2 -injPhaseRpmBins = array, F32, 15072, [16], "RPM", 1, 0, 0, 18000, 2 -tcuSolenoidTable = array, U08, 15136, [6x10], "onoff", 1, 0, 0, 1, 0 -vssFilterReciprocal = scalar, F32, 15196, "Hz", 1, 0, 2, 20, 2 -mapEstimateTable = array, U16, 15200, [16x16], "kPa", 0.01, 0, 0, 100, 2 -mapEstimateTpsBins = array, U16, 15712, [16], "% TPS", 0.01, 0, 0, 100, 1 -mapEstimateRpmBins = array, U16, 15744, [16], "RPM", 1, 0, 0, 18000, 0 -vvtTable1 = array, U08, 15776, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable1LoadBins = array, F32, 15840, [8], "L", 1, 0, 0, 255, 0 -vvtTable1RpmBins = array, F32, 15872, [8], "RPM", 1, 0, 0, 25500, 2 -vvtTable2 = array, U08, 15904, [8x8], "value", 1, 0, 0, 255, 0 -vvtTable2LoadBins = array, F32, 15968, [8], "L", 1, 0, 0, 255, 0 -vvtTable2RpmBins = array, F32, 16000, [8], "RPM", 1, 0, 0, 25500, 2 -unusedLuaWasHere = array, F32, 16032, [64], "L", 1, 0, 0, 255, 0 -ignitionTable = array, F32, 16288, [16x16], "deg", 1, 0, -20, 90, 2 -ignitionLoadBins = array, F32, 17312, [16], "Load", 1, 0, 0, 500, 2 -ignitionRpmBins = array, F32, 17376, [16], "RPM", 1, 0, 0, 18000, 2 -veTable = array, F32, 17440, [16x16], "%", 1, 0, 0, 999, 2 -veLoadBins = array, F32, 18464, [16], "kPa", 1, 0, 0, 400, 2 -veRpmBins = array, F32, 18528, [16], "RPM", 1, 0, 0, 18000, 2 +luaScript = string, ASCII, 6672, 8000 +cltFuelCorrBins = array, F32, 14672, [16], "C", 1, 0, -100, 250, 2 +cltFuelCorr = array, F32, 14736, [16], "ratio", 1, 0, 0, 5, 2 +iatFuelCorrBins = array, F32, 14800, [16], "C", 1, 0, -100, 250, 2 +iatFuelCorr = array, F32, 14864, [16], "ratio", 1, 0, 0, 5, 2 +crankingFuelCoef = array, F32, 14928, [8], "ratio", 1, 0, 0.1, 50, 2 +crankingFuelBins = array, F32, 14960, [8], "C", 1, 0, -80, 170, 2 +crankingCycleCoef = array, F32, 14992, [8], "ratio", 1, 0, 0, 5, 2 +crankingCycleBins = array, F32, 15024, [8], "counter", 1, 0, -80, 170, 0 +cltIdleCorrBins = array, F32, 15056, [16], "C", 1, 0, -100, 250, 2 +cltIdleCorr = array, F32, 15120, [16], "ratio", 1, 0, 0, 10, 2 +mafDecoding = array, F32, 15184, [256], "kg/hour", 1, 0, -500, 4000, 2 +mafDecodingBins = array, F32, 16208, [256], "V", 1, 0, -5, 150, 2 +ignitionIatCorrTable = array, F32, 17232, [16x16], "deg", 1, 0, -720, 720, 2 +ignitionIatCorrLoadBins = array, F32, 18256, [16], "Temperature", 1, 0, 0, 500, 2 +ignitionIatCorrRpmBins = array, F32, 18320, [16], "RPM", 1, 0, 0, 18000, 2 +injectionPhase = array, F32, 18384, [16x16], "deg", 1, 0, -720, 720, 2 +injPhaseLoadBins = array, F32, 19408, [16], "Load", 1, 0, 0, 500, 2 +injPhaseRpmBins = array, F32, 19472, [16], "RPM", 1, 0, 0, 18000, 2 +tcuSolenoidTable = array, U08, 19536, [6x10], "onoff", 1, 0, 0, 1, 0 +vssFilterReciprocal = scalar, F32, 19596, "Hz", 1, 0, 2, 20, 2 +mapEstimateTable = array, U16, 19600, [16x16], "kPa", 0.01, 0, 0, 100, 2 +mapEstimateTpsBins = array, U16, 20112, [16], "% TPS", 0.01, 0, 0, 100, 1 +mapEstimateRpmBins = array, U16, 20144, [16], "RPM", 1, 0, 0, 18000, 0 +vvtTable1 = array, U08, 20176, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable1LoadBins = array, F32, 20240, [8], "L", 1, 0, 0, 255, 0 +vvtTable1RpmBins = array, F32, 20272, [8], "RPM", 1, 0, 0, 25500, 2 +vvtTable2 = array, U08, 20304, [8x8], "value", 1, 0, 0, 255, 0 +vvtTable2LoadBins = array, F32, 20368, [8], "L", 1, 0, 0, 255, 0 +vvtTable2RpmBins = array, F32, 20400, [8], "RPM", 1, 0, 0, 25500, 2 +unusedLuaWasHere = array, F32, 20432, [64], "L", 1, 0, 0, 255, 0 +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 #if LAMBDA -lambdaTable = array, U08, 18592, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 +lambdaTable = array, U08, 22992, [16x16], "lambda", 0.006802721088435374, 0, 0.6, 1.5, 2 #else -lambdaTable = array, U08, 18592, [16x16], "afr", 0.1, 0, 0, 25, 1 +lambdaTable = array, U08, 22992, [16x16], "afr", 0.1, 0, 0, 25, 1 #endif -lambdaLoadBins = array, F32, 18848, [16], "", 1, 0, 0, 500, 2 -lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 -tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 -tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 -tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 -; total TS size = 20000 +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 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" engineSnifferRpmThreshold = "Engine sniffer would be disabled above this rpm\nset engineSnifferRpmThreshold X" @@ -5737,6 +5737,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "mapCamDetectionThreshold", mapCamDetectionThreshold field = "mapCamAveragingLength", mapCamAveragingLength field = "mapCamSkipFactor", mapCamSkipFactor + field = "mapCamLookForLowPeaks", mapCamLookForLowPeaks field = "#System hacks" field = "Global fuel correction", globalFuelCorrection field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex 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 51ddf2bfc0..fa91646168 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 Sun Dec 05 03:34:32 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Dec 05 19:41:22 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -496,10 +496,10 @@ public class Fields { public static final int CLT_TIMING_CURVE_SIZE = 8; public static final int cltCrankingCorr_offset = 6512; public static final int cltCrankingCorrBins_offset = 6480; - public static final int cltFuelCorr_offset = 10336; - public static final int cltFuelCorrBins_offset = 10272; - public static final int cltIdleCorr_offset = 10720; - public static final int cltIdleCorrBins_offset = 10656; + public static final int cltFuelCorr_offset = 14736; + public static final int cltFuelCorrBins_offset = 14672; + public static final int cltIdleCorr_offset = 15120; + public static final int cltIdleCorrBins_offset = 15056; public static final int cltIdleRpm_offset = 1960; public static final int cltIdleRpmBins_offset = 1896; public static final int cltRevLimitRpm_offset = 3332; @@ -586,10 +586,10 @@ public class Fields { public static final int cranking_rpm_offset = 92; public static final int crankingAdvance_offset = 3124; public static final int crankingAdvanceBins_offset = 3108; - public static final int crankingCycleBins_offset = 10624; - public static final int crankingCycleCoef_offset = 10592; - public static final int crankingFuelBins_offset = 10560; - public static final int crankingFuelCoef_offset = 10528; + public static final int crankingCycleBins_offset = 15024; + public static final int crankingCycleCoef_offset = 14992; + public static final int crankingFuelBins_offset = 14960; + public static final int crankingFuelCoef_offset = 14928; public static final int crankingIACposition_offset = 2228; public static final int crankingInjectionMode_offset = 424; public static final int crankingTimingAngle_offset = 436; @@ -1215,8 +1215,8 @@ public class Fields { public static final int iat_tempC_1_offset = 284; public static final int iat_tempC_2_offset = 288; public static final int iat_tempC_3_offset = 292; - public static final int iatFuelCorr_offset = 10464; - public static final int iatFuelCorrBins_offset = 10400; + public static final int iatFuelCorr_offset = 14864; + public static final int iatFuelCorrBins_offset = 14800; public static final int IDLE_ADVANCE_CURVE_SIZE = 8; public static final int idle_antiwindupFreq_offset = 696; public static final int idle_derivativeFilterLoss_offset = 516; @@ -1285,10 +1285,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 = 100; - public static final int ignitionIatCorrLoadBins_offset = 13856; - public static final int ignitionIatCorrRpmBins_offset = 13920; - public static final int ignitionIatCorrTable_offset = 12832; - public static final int ignitionLoadBins_offset = 17312; + public static final int ignitionIatCorrLoadBins_offset = 18256; + public static final int ignitionIatCorrRpmBins_offset = 18320; + public static final int ignitionIatCorrTable_offset = 17232; + public static final int ignitionLoadBins_offset = 21712; public static final int ignitionMode_offset = 440; public static final int ignitionPinMode_offset = 649; public static final int ignitionPins10_offset = 645; @@ -1303,8 +1303,8 @@ public class Fields { public static final int ignitionPins7_offset = 642; public static final int ignitionPins8_offset = 643; public static final int ignitionPins9_offset = 644; - public static final int ignitionRpmBins_offset = 17376; - public static final int ignitionTable_offset = 16288; + public static final int ignitionRpmBins_offset = 21776; + public static final int ignitionTable_offset = 20688; public static final int ignOverrideMode_offset = 2128; public static final int imu_type_e_IMU_MM5_10 = 2; public static final int imu_type_e_IMU_NONE = 0; @@ -1321,7 +1321,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 = 428; - public static final int injectionPhase_offset = 13984; + public static final int injectionPhase_offset = 18384; public static final int injectionPinMode_offset = 648; public static final int injectionPins10_offset = 633; public static final int injectionPins11_offset = 634; @@ -1358,8 +1358,8 @@ public class Fields { public static final int InjectorNonlinearMode_INJ_PolynomialAdder = 1; public static final int injectorNonlinearMode_offset = 2510; public static final int injectorPressureType_offset = 2129; - public static final int injPhaseLoadBins_offset = 15008; - public static final int injPhaseRpmBins_offset = 15072; + public static final int injPhaseLoadBins_offset = 19408; + public static final int injPhaseRpmBins_offset = 19472; public static final int invertCamVVTSignal_offset = 976; public static final int invertPrimaryTriggerSignal_offset = 1464; public static final int invertSecondaryTriggerSignal_offset = 1464; @@ -1417,9 +1417,9 @@ public class Fields { public static final int knockRetardMaximum_offset = 614; public static final int knockRetardReapplyRate_offset = 613; public static final int knockSamplingDuration_offset = 2512; - public static final int lambdaLoadBins_offset = 18848; - public static final int lambdaRpmBins_offset = 18912; - public static final int lambdaTable_offset = 18592; + 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 launchActivateDelay_offset = 1060; public static final int launchActivatePin_offset = 991; public static final int launchActivationMode_e_ALWAYS_ACTIVE_LAUNCH = 2; @@ -1462,7 +1462,7 @@ public class Fields { public static final int lps25BaroSensorSda_offset = 1459; public static final int LUA_ANALOG_INPUT_COUNT = 8; public static final int LUA_PWM_COUNT = 8; - public static final int LUA_SCRIPT_SIZE = 3600; + public static final int LUA_SCRIPT_SIZE = 8000; public static final int luaOutputPins1_offset = 1220; public static final int luaOutputPins2_offset = 1221; public static final int luaOutputPins3_offset = 1222; @@ -1478,8 +1478,8 @@ public class Fields { 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 = 543; - public static final int mafDecoding_offset = 10784; - public static final int mafDecodingBins_offset = 11808; + public static final int mafDecoding_offset = 15184; + public static final int mafDecodingBins_offset = 16208; public static final int mafSensorType_offset = 948; public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int mainRelayPin_offset = 706; @@ -1509,12 +1509,13 @@ public class Fields { public static final int mapCamAveragingLength_offset = 619; public static final int mapCamDetectionAnglePosition_offset = 552; public static final int mapCamDetectionThreshold_offset = 615; + public static final int mapCamLookForLowPeaks_offset = 976; public static final int mapCamSkipFactor_offset = 764; public static final int mapErrorDetectionTooHigh_offset = 1780; public static final int mapErrorDetectionTooLow_offset = 1776; - public static final int mapEstimateRpmBins_offset = 15744; - public static final int mapEstimateTable_offset = 15200; - public static final int mapEstimateTpsBins_offset = 15712; + public static final int mapEstimateRpmBins_offset = 20144; + public static final int mapEstimateTable_offset = 19600; + public static final int mapEstimateTpsBins_offset = 20112; public static final int mapHighValueVoltage_offset = 2212; public static final int mapLowValueVoltage_offset = 2208; public static final int mapMinBufferLength_offset = 812; @@ -1609,7 +1610,7 @@ public class Fields { public static final int pedalToTpsPedalBins_offset = 6464; public static final int pedalToTpsRpmBins_offset = 6472; public static final int pedalToTpsTable_offset = 6400; - public static final int persistent_config_s_size = 20000; + public static final int persistent_config_s_size = 24400; 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; @@ -1708,18 +1709,18 @@ public class Fields { public static final int scriptSettingName6_offset = 3708; public static final int scriptSettingName7_offset = 3724; public static final int scriptSettingName8_offset = 3740; - public static final int scriptTable1_offset = 19296; - public static final int scriptTable1LoadBins_offset = 19552; - public static final int scriptTable1RpmBins_offset = 19584; - public static final int scriptTable2_offset = 19616; - public static final int scriptTable2LoadBins_offset = 19680; - public static final int scriptTable2RpmBins_offset = 19712; - public static final int scriptTable3_offset = 19744; - public static final int scriptTable3LoadBins_offset = 19808; - public static final int scriptTable3RpmBins_offset = 19840; - public static final int scriptTable4_offset = 19872; - public static final int scriptTable4LoadBins_offset = 19936; - public static final int scriptTable4RpmBins_offset = 19968; + 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 scriptTableName1_offset = 3564; public static final int scriptTableName2_offset = 3580; public static final int scriptTableName3_offset = 3596; @@ -1880,7 +1881,7 @@ public class Fields { public static final int tcuDownshiftButtonPin_offset = 1819; public static final int tcuDownshiftButtonPinMode_offset = 4515; public static final int tcuEnabled_offset = 976; - public static final int tcuSolenoidTable_offset = 15136; + public static final int tcuSolenoidTable_offset = 19536; public static final int tcuUpshiftButtonPin_offset = 1818; public static final int tcuUpshiftButtonPinMode_offset = 4514; public static final int test557pin_offset = 3101; @@ -1924,7 +1925,7 @@ public class Fields { public static final int TOOTH_PACKET_COUNT = 1000; public static final int TOOTH_PACKET_SIZE = 2; public static final String TOP_DEAD_CENTER_MESSAGE = "r"; - public static final int TOTAL_CONFIG_SIZE = 20000; + public static final int TOTAL_CONFIG_SIZE = 24400; public static final int tps1_1AdcChannel_offset = 512; public static final int tps1_2AdcChannel_offset = 681; public static final int tps1SecondaryMax_offset = 822; @@ -1948,9 +1949,9 @@ public class Fields { public static final int tpsErrorDetectionTooLow_offset = 84; public static final int tpsMax_offset = 82; public static final int tpsMin_offset = 80; - public static final int tpsTpsAccelFromRpmBins_offset = 19232; - public static final int tpsTpsAccelTable_offset = 18976; - public static final int tpsTpsAccelToRpmBins_offset = 19264; + 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 trailingCoilPins10_offset = 2349; public static final int trailingCoilPins11_offset = 2350; public static final int trailingCoilPins12_offset = 2351; @@ -2209,7 +2210,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.05.all.3290829546"; + public static final String TS_SIGNATURE = "rusEFI 2021.12.05.all.2699662220"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2255,7 +2256,6 @@ public class Fields { public static final int unused4028_offset = 4028; public static final int unused6312_offset = 6312; public static final int unused970_offset = 970; - public static final int unused976b11_offset = 976; public static final int unused_1484_bit_24_offset = 1476; public static final int unused_1484_bit_25_offset = 1476; public static final int unused_1484_bit_26_offset = 1476; @@ -2314,7 +2314,7 @@ public class Fields { public static final int unusedFiller_4703_offset = 4703; public static final int unusedLaunchRpmThreshold_offset = 1032; public static final int unusedLogFormat_offset = 496; - public static final int unusedLuaWasHere_offset = 16032; + public static final int unusedLuaWasHere_offset = 20432; public static final int unusedOldBiquad_offset = 2331; public static final int unusedOutputFreqWhereHere_offset = 832; public static final int unusedOutputWhereHere_offset = 794; @@ -2361,15 +2361,15 @@ public class Fields { public static final int vehicleName_offset = 1160; public static final int vehicleSpeedSensorInputPin_offset = 968; public static final int vehicleWeight_offset = 1456; - public static final int veLoadBins_offset = 18464; + public static final int veLoadBins_offset = 22864; public static final int veOverrideMode_offset = 2109; public static final int verboseCan2BaseAddress_offset = 2112; public static final int verboseCanBaseAddress_offset = 756; public static final int verboseTLE8888_offset = 744; public static final int verboseTriggerSynchDetails_offset = 1476; public static final int verboseVVTDecoding_offset = 976; - public static final int veRpmBins_offset = 18528; - public static final int veTable_offset = 17440; + public static final int veRpmBins_offset = 22928; + public static final int veTable_offset = 21840; 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; @@ -2384,7 +2384,7 @@ public class Fields { public static final int vrThreshold2_pin_offset = 1260; public static final int vrThreshold2_rpmBins_offset = 1264; public static final int vrThreshold2_values_offset = 1270; - public static final int vssFilterReciprocal_offset = 15196; + public static final int vssFilterReciprocal_offset = 19596; public static final int vssGearRatio_offset = 616; public static final int vssToothCount_offset = 618; public static final int vvt_mode_e_VVT_2JZ = 2; @@ -2415,12 +2415,12 @@ public class Fields { public static final int vvtPins2_offset = 2221; public static final int vvtPins3_offset = 2222; public static final int vvtPins4_offset = 2223; - public static final int vvtTable1_offset = 15776; - public static final int vvtTable1LoadBins_offset = 15840; - public static final int vvtTable1RpmBins_offset = 15872; - public static final int vvtTable2_offset = 15904; - public static final int vvtTable2LoadBins_offset = 15968; - public static final int vvtTable2RpmBins_offset = 16000; + public static final int vvtTable1_offset = 20176; + public static final int vvtTable1LoadBins_offset = 20240; + public static final int vvtTable1RpmBins_offset = 20272; + public static final int vvtTable2_offset = 20304; + public static final int vvtTable2LoadBins_offset = 20368; + public static final int vvtTable2RpmBins_offset = 20400; public static final int warning_message_offset = 6000; public static final int warningLedPin_offset = 2041; public static final int warningPeriod_offset = 1498; @@ -2852,7 +2852,7 @@ public class Fields { public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 8); public static final Field SHOWHUMANREADABLEWARNING = Field.create("SHOWHUMANREADABLEWARNING", 976, FieldType.BIT, 9); public static final Field STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 976, FieldType.BIT, 10); - public static final Field UNUSED976B11 = Field.create("UNUSED976B11", 976, FieldType.BIT, 11); + public static final Field MAPCAMLOOKFORLOWPEAKS = Field.create("MAPCAMLOOKFORLOWPEAKS", 976, FieldType.BIT, 11); public static final Field ENABLESOFTWAREKNOCK = Field.create("ENABLESOFTWAREKNOCK", 976, FieldType.BIT, 12); public static final Field VERBOSEVVTDECODING = Field.create("VERBOSEVVTDECODING", 976, FieldType.BIT, 13); public static final Field INVERTCAMVVTSIGNAL = Field.create("INVERTCAMVVTSIGNAL", 976, FieldType.BIT, 14); @@ -3661,61 +3661,61 @@ public class Fields { public static final Field IDLEADVANCE = Field.create("IDLEADVANCE", 6576, FieldType.FLOAT); public static final Field IDLEVEBINS = Field.create("IDLEVEBINS", 6608, FieldType.FLOAT); public static final Field IDLEVE = Field.create("IDLEVE", 6640, FieldType.FLOAT); - public static final Field LUASCRIPT = Field.create("LUASCRIPT", 6672, 3600, FieldType.STRING); - public static final Field CLTFUELCORRBINS = Field.create("CLTFUELCORRBINS", 10272, FieldType.FLOAT); - public static final Field CLTFUELCORR = Field.create("CLTFUELCORR", 10336, FieldType.FLOAT); - public static final Field IATFUELCORRBINS = Field.create("IATFUELCORRBINS", 10400, FieldType.FLOAT); - public static final Field IATFUELCORR = Field.create("IATFUELCORR", 10464, FieldType.FLOAT); - public static final Field CRANKINGFUELCOEF = Field.create("CRANKINGFUELCOEF", 10528, FieldType.FLOAT); - public static final Field CRANKINGFUELBINS = Field.create("CRANKINGFUELBINS", 10560, FieldType.FLOAT); - public static final Field CRANKINGCYCLECOEF = Field.create("CRANKINGCYCLECOEF", 10592, FieldType.FLOAT); - public static final Field CRANKINGCYCLEBINS = Field.create("CRANKINGCYCLEBINS", 10624, FieldType.FLOAT); - public static final Field CLTIDLECORRBINS = Field.create("CLTIDLECORRBINS", 10656, FieldType.FLOAT); - public static final Field CLTIDLECORR = Field.create("CLTIDLECORR", 10720, FieldType.FLOAT); - public static final Field MAFDECODING = Field.create("MAFDECODING", 10784, FieldType.FLOAT); - public static final Field MAFDECODINGBINS = Field.create("MAFDECODINGBINS", 11808, FieldType.FLOAT); - public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 12832, FieldType.FLOAT); - public static final Field IGNITIONIATCORRLOADBINS = Field.create("IGNITIONIATCORRLOADBINS", 13856, FieldType.FLOAT); - public static final Field IGNITIONIATCORRRPMBINS = Field.create("IGNITIONIATCORRRPMBINS", 13920, FieldType.FLOAT); - public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 13984, FieldType.FLOAT); - public static final Field INJPHASELOADBINS = Field.create("INJPHASELOADBINS", 15008, FieldType.FLOAT); - public static final Field INJPHASERPMBINS = Field.create("INJPHASERPMBINS", 15072, FieldType.FLOAT); - public static final Field TCUSOLENOIDTABLE = Field.create("TCUSOLENOIDTABLE", 15136, FieldType.INT8); - public static final Field VSSFILTERRECIPROCAL = Field.create("VSSFILTERRECIPROCAL", 15196, FieldType.FLOAT); - public static final Field MAPESTIMATETABLE = Field.create("MAPESTIMATETABLE", 15200, FieldType.INT16); - public static final Field MAPESTIMATETPSBINS = Field.create("MAPESTIMATETPSBINS", 15712, FieldType.INT16); - public static final Field MAPESTIMATERPMBINS = Field.create("MAPESTIMATERPMBINS", 15744, FieldType.INT16); - public static final Field VVTTABLE1 = Field.create("VVTTABLE1", 15776, FieldType.INT8); - public static final Field VVTTABLE1LOADBINS = Field.create("VVTTABLE1LOADBINS", 15840, FieldType.FLOAT); - public static final Field VVTTABLE1RPMBINS = Field.create("VVTTABLE1RPMBINS", 15872, FieldType.FLOAT); - public static final Field VVTTABLE2 = Field.create("VVTTABLE2", 15904, FieldType.INT8); - public static final Field VVTTABLE2LOADBINS = Field.create("VVTTABLE2LOADBINS", 15968, FieldType.FLOAT); - public static final Field VVTTABLE2RPMBINS = Field.create("VVTTABLE2RPMBINS", 16000, FieldType.FLOAT); - public static final Field UNUSEDLUAWASHERE = Field.create("UNUSEDLUAWASHERE", 16032, FieldType.FLOAT); - public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 16288, FieldType.FLOAT); - public static final Field IGNITIONLOADBINS = Field.create("IGNITIONLOADBINS", 17312, FieldType.FLOAT); - public static final Field IGNITIONRPMBINS = Field.create("IGNITIONRPMBINS", 17376, FieldType.FLOAT); - public static final Field VETABLE = Field.create("VETABLE", 17440, FieldType.FLOAT); - public static final Field VELOADBINS = Field.create("VELOADBINS", 18464, FieldType.FLOAT); - public static final Field VERPMBINS = Field.create("VERPMBINS", 18528, FieldType.FLOAT); - public static final Field LAMBDATABLE = Field.create("LAMBDATABLE", 18592, FieldType.INT8); - public static final Field LAMBDALOADBINS = Field.create("LAMBDALOADBINS", 18848, FieldType.FLOAT); - public static final Field LAMBDARPMBINS = Field.create("LAMBDARPMBINS", 18912, FieldType.FLOAT); - public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 18976, FieldType.FLOAT); - public static final Field TPSTPSACCELFROMRPMBINS = Field.create("TPSTPSACCELFROMRPMBINS", 19232, FieldType.FLOAT); - public static final Field TPSTPSACCELTORPMBINS = Field.create("TPSTPSACCELTORPMBINS", 19264, FieldType.FLOAT); - public static final Field SCRIPTTABLE1 = Field.create("SCRIPTTABLE1", 19296, FieldType.FLOAT); - public static final Field SCRIPTTABLE1LOADBINS = Field.create("SCRIPTTABLE1LOADBINS", 19552, FieldType.FLOAT); - public static final Field SCRIPTTABLE1RPMBINS = Field.create("SCRIPTTABLE1RPMBINS", 19584, FieldType.FLOAT); - public static final Field SCRIPTTABLE2 = Field.create("SCRIPTTABLE2", 19616, FieldType.INT8); - public static final Field SCRIPTTABLE2LOADBINS = Field.create("SCRIPTTABLE2LOADBINS", 19680, FieldType.FLOAT); - public static final Field SCRIPTTABLE2RPMBINS = Field.create("SCRIPTTABLE2RPMBINS", 19712, FieldType.FLOAT); - public static final Field SCRIPTTABLE3 = Field.create("SCRIPTTABLE3", 19744, FieldType.INT8); - public static final Field SCRIPTTABLE3LOADBINS = Field.create("SCRIPTTABLE3LOADBINS", 19808, FieldType.FLOAT); - public static final Field SCRIPTTABLE3RPMBINS = Field.create("SCRIPTTABLE3RPMBINS", 19840, FieldType.FLOAT); - public static final Field SCRIPTTABLE4 = Field.create("SCRIPTTABLE4", 19872, FieldType.INT8); - public static final Field SCRIPTTABLE4LOADBINS = Field.create("SCRIPTTABLE4LOADBINS", 19936, FieldType.FLOAT); - public static final Field SCRIPTTABLE4RPMBINS = Field.create("SCRIPTTABLE4RPMBINS", 19968, FieldType.FLOAT); + public static final Field LUASCRIPT = Field.create("LUASCRIPT", 6672, 8000, FieldType.STRING); + public static final Field CLTFUELCORRBINS = Field.create("CLTFUELCORRBINS", 14672, FieldType.FLOAT); + public static final Field CLTFUELCORR = Field.create("CLTFUELCORR", 14736, FieldType.FLOAT); + public static final Field IATFUELCORRBINS = Field.create("IATFUELCORRBINS", 14800, FieldType.FLOAT); + public static final Field IATFUELCORR = Field.create("IATFUELCORR", 14864, FieldType.FLOAT); + public static final Field CRANKINGFUELCOEF = Field.create("CRANKINGFUELCOEF", 14928, FieldType.FLOAT); + public static final Field CRANKINGFUELBINS = Field.create("CRANKINGFUELBINS", 14960, FieldType.FLOAT); + public static final Field CRANKINGCYCLECOEF = Field.create("CRANKINGCYCLECOEF", 14992, FieldType.FLOAT); + public static final Field CRANKINGCYCLEBINS = Field.create("CRANKINGCYCLEBINS", 15024, FieldType.FLOAT); + public static final Field CLTIDLECORRBINS = Field.create("CLTIDLECORRBINS", 15056, FieldType.FLOAT); + public static final Field CLTIDLECORR = Field.create("CLTIDLECORR", 15120, FieldType.FLOAT); + public static final Field MAFDECODING = Field.create("MAFDECODING", 15184, FieldType.FLOAT); + public static final Field MAFDECODINGBINS = Field.create("MAFDECODINGBINS", 16208, FieldType.FLOAT); + public static final Field IGNITIONIATCORRTABLE = Field.create("IGNITIONIATCORRTABLE", 17232, FieldType.FLOAT); + public static final Field IGNITIONIATCORRLOADBINS = Field.create("IGNITIONIATCORRLOADBINS", 18256, FieldType.FLOAT); + public static final Field IGNITIONIATCORRRPMBINS = Field.create("IGNITIONIATCORRRPMBINS", 18320, FieldType.FLOAT); + public static final Field INJECTIONPHASE = Field.create("INJECTIONPHASE", 18384, FieldType.FLOAT); + public static final Field INJPHASELOADBINS = Field.create("INJPHASELOADBINS", 19408, FieldType.FLOAT); + public static final Field INJPHASERPMBINS = Field.create("INJPHASERPMBINS", 19472, FieldType.FLOAT); + public static final Field TCUSOLENOIDTABLE = Field.create("TCUSOLENOIDTABLE", 19536, FieldType.INT8); + public static final Field VSSFILTERRECIPROCAL = Field.create("VSSFILTERRECIPROCAL", 19596, FieldType.FLOAT); + public static final Field MAPESTIMATETABLE = Field.create("MAPESTIMATETABLE", 19600, FieldType.INT16); + public static final Field MAPESTIMATETPSBINS = Field.create("MAPESTIMATETPSBINS", 20112, FieldType.INT16); + public static final Field MAPESTIMATERPMBINS = Field.create("MAPESTIMATERPMBINS", 20144, FieldType.INT16); + public static final Field VVTTABLE1 = Field.create("VVTTABLE1", 20176, FieldType.INT8); + public static final Field VVTTABLE1LOADBINS = Field.create("VVTTABLE1LOADBINS", 20240, FieldType.FLOAT); + public static final Field VVTTABLE1RPMBINS = Field.create("VVTTABLE1RPMBINS", 20272, FieldType.FLOAT); + public static final Field VVTTABLE2 = Field.create("VVTTABLE2", 20304, FieldType.INT8); + public static final Field VVTTABLE2LOADBINS = Field.create("VVTTABLE2LOADBINS", 20368, FieldType.FLOAT); + public static final Field VVTTABLE2RPMBINS = Field.create("VVTTABLE2RPMBINS", 20400, FieldType.FLOAT); + public static final Field UNUSEDLUAWASHERE = Field.create("UNUSEDLUAWASHERE", 20432, 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[] VALUES = { ENGINETYPE, ENGINESNIFFERRPMTHRESHOLD, @@ -4127,7 +4127,7 @@ public class Fields { ENABLEINNOVATELC2, SHOWHUMANREADABLEWARNING, STFTIGNOREERRORMAGNITUDE, - UNUSED976B11, + MAPCAMLOOKFORLOWPEAKS, ENABLESOFTWAREKNOCK, VERBOSEVVTDECODING, INVERTCAMVVTSIGNAL, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index a6b1abbed7..b0a14dae23 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -10,20 +10,20 @@ RUSEFI rusEfi rusEfi - 20000 + 24400 -
- @@ -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 @@ - -
+