diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9c838bf415..f585235319 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -522,7 +522,8 @@ end_struct custom engine_load_mode_e 1 bits, U08, @OFFSET@, [0:2], @@engine_load_mode_e_enum@@ engine_load_mode_e fuelAlgorithm;This setting controls which fuel quantity control algorithm is used.\nAlpha-N means drive by TPS commonly only used for NA engines\nSpeed Density requires MAP sensor and is the default choice for may installs\nMAF air charge is a cylinder filling based method that uses a mass air flow sensor.; -uint8_t[3] alignmentFill_at_1 +uint8_t ALSMaxTPS;;"%", 1, 0, 0, 10, 0 +uint8_t[2] unusedHerealignmentFill_at_1 custom injection_mode_e 1 bits, U08, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "Single Point" injection_mode_e crankingInjectionMode;This is the injection strategy during engine start. See Fuel/Injection settings for more detail. It is suggested to use "Simultaneous". @@ -1083,7 +1084,7 @@ bit invertVvtControlIntake, "retard","advance";If increased VVT duty cycle incre bit invertVvtControlExhaust,"retard","advance";If increased VVT duty cycle increases the indicated VVT angle, set this to 'advance'. If it decreases, set this to 'retard'. Most intake cams use 'advance', and most exhaust cams use 'retard'. bit useBiQuadOnAuxSpeedSensors bit sdTriggerLog,"trigger","normal";'Trigger' mode will write a high speed log of trigger events (warning: uses lots of space!). 'Normal' mode will write a standard MLG of sensors, engine function, etc. similar to the one captured in TunerStudio. -bit unused_1484_bit_29 +bit ALSActivateInverted bit unused_1484_bit_30 bit tempBooleanForVerySpecialLogic @@ -1551,7 +1552,7 @@ float alsMaxDuration;;"sec", 1, 0, 0.01, 100, 2 int8_t ALSMaxCLT;;"C", 1, 0, 0, 105, 0 uint8_t alsMinTimeBetween;;"", 1, 0, 0, 20000, 0 uint8_t alsEtbPosition;;"", 1, 0, 0, 20000, 0 - int ALSTimingRetard;;"deg", 1, 0, -180, 180, 2 + uint8_t[4] unusedAlignmentFill_at_33 int ALSIdleAdd;;"%", 1, 0, 0, 100, 2 int ALSEtbAdd;;"%", 1, 0, 0, 100, 2 int ALSSkipRatio;;"", 1, 0, 0.1, 2, 1 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index bb3e1f45ad..3884af6d94 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -840,6 +840,24 @@ curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" yBins = scriptTable4LoadBins, fuelingLoad zBins = scriptTable4 + table = IgnRetardTableALS, IgnRetardALS, "Ignition adjustment", 1 + ; constant, variable + xBins = alsIgnRetardrpmBins, RPMValue + yBins = alsIgnRetardLoadBins, TPSValue + zBins = ALSTimingRetardTable + gridHeight = 4.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + + table = FuelAdderTableALS, FuelAdderALS, "Fuel adjustment", 1 + ; constant, variable + xBins = alsFuelAdjustmentrpmBins, RPMValue + yBins = alsFuelAdjustmentLoadBins, TPSValue + zBins = ALSFuelAdjustment + gridHeight = 4.0 + gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. + upDownLabel = "(RICHER)", "(LEANER)" + table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable xBins = baroCorrRpmBins, RPMValue @@ -2104,16 +2122,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "High flow coefficient", tChargeAirCoefMax field = "Max air flow", tChargeAirFlowMax - dialog = alsDialog, "Anti-Lag ALS" - field = "Max Pedal Position", ALSMaxDriverThrottleIntent - field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} - field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} - field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} - field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} - field = "Max Duration", alsMaxDuration - field = "Min Timer Between Activations", alsMinTimeBetween - field = "ETB Position", alsEtbPosition - dialog = tChargeSettings, "Charge temperature estimation" panel = tChargeGeneralSettings panel = tChargeRpmTpsSettings, { tChargeMode == 0} @@ -4215,11 +4223,25 @@ dialog = tcuControls, "Transmission Settings" dialog = smRollingLaunch, "Rolling Launch Settings NOT WORKING" field = "Enable Rolling Launch", rollingLaunchEnabled - ; Racing Features->Rolling Launch - dialog = antiLag, "AntiLag Settings NOT WORKING" - field = "Enable AntiLag", antiLagEnabled - field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } + ; Racing Features->Antilag + dialog = antiLag, "AntiLag Settings" + field = "Enable AntiLag", antiLagEnabled + field = "Activation Mode", antiLagActivationMode + field = "Switch Input", ALSActivatePin, {antiLagActivationMode != @@antiLagActivationMode_e_SWITCH_INPUT_ANTILAG@@ && antiLagEnabled == 1} + field = "ALS Button inverted", ALSActivateInverted, {antiLagActivationMode != @@antiLagActivationMode_e_SWITCH_INPUT_ANTILAG@@ && antiLagEnabled == 1} + field = "ALS Button mode", ALSActivatePinMode, {antiLagActivationMode != @@antiLagActivationMode_e_SWITCH_INPUT_ANTILAG@@ && antiLagEnabled == 1} +; field = "Air supply", antiLagAirAddMode + field = "Max TPS", ALSMaxTPS, {antiLagEnabled == 1} + field = "Min RPM", ALSMinRPM, {antiLagEnabled == 1} + field = "Max RPM", ALSMaxRPM, {antiLagEnabled == 1} + field = "Min CLT", ALSMinCLT, {antiLagEnabled == 1} + field = "Max CLT", ALSMaxCLT, {antiLagEnabled == 1} + field = "Air supply", ALSAirSupply + field = "Idle Air Add", ALSIdleAdd, {ALSAirSupply ==1 && antiLagEnabled == 1} + field = "ETB Air Add", ALSEtbAdd, {ALSAirSupply !=1 &&antiLagEnabled == 1} + field = "Spark Skip Ratio", ALSSkipRatio, {antiLagEnabled == 1} + panel = FuelAdderTableALS + panel = IgnRetardTableALS dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings"