First commit (#358)

This commit is contained in:
Antti Muurikainen 2020-04-12 00:31:03 +03:00 committed by GitHub
parent 62e90379f6
commit 53faee1a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -345,7 +345,7 @@ page = 1
;VSS settings ;VSS settings
vssEnable = bits, U08, 102, [0:0], "Off", "On" vssEnable = bits, U08, 102, [0:0], "Off", "On"
vssPullup = bits, U08, 102, [1:1], "Off", "On" vssPullup = bits, U08, 102, [1:1], "Off", "On"
vssPulsesPerKm= scalar, U16, 103. "pulses" 1.0, 0.0, 0.0, 25500, 0 vssPulsesPerKm= scalar, U16, 103, "pulses" 1.0, 0.0, 0.0, 25500, 0
vssSpare = scalar, U08, 105, "%", 1.0, 0, 0, 120, 0 vssSpare = scalar, U08, 105, "%", 1.0, 0, 0, 120, 0
vssRatio1 = scalar, U16, 106, ":1", 0.01, 0, 0, 9.99, 2 vssRatio1 = scalar, U16, 106, ":1", 0.01, 0, 0, 9.99, 2
vssRatio2 = scalar, U16, 108, "%", 0.01, 0, 0, 9.99, 2 vssRatio2 = scalar, U16, 108, "%", 0.01, 0, 0, 9.99, 2
@ -3534,7 +3534,7 @@ cmdtestspk450dc = "E\x03\x0C"
flexFuelCor = scalar, U08, 35, "%", 1.000, 0.000 flexFuelCor = scalar, U08, 35, "%", 1.000, 0.000
flexIgnCor = scalar, U08, 36, "deg", 1.000, 0.000 flexIgnCor = scalar, U08, 36, "deg", 1.000, 0.000
idleLoad = scalar, U08, 37, { bitStringValue( idleUnits , iacAlgorithm ) }, 2.000, 0.000 ; This is a combined variable covering both PWM and stepper IACs. The units used depend on which idle algorithm is chosen idleLoad = scalar, U08, 37, { bitStringValue( idleUnits , iacAlgorithm ) }, { (iacAlgorithm == 2 || iacAlgorithm == 3) ? 1.000 : 2.000 }, 0.000 ; This is a combined variable covering both PWM and stepper IACs. The units and precision used depend on which idle algorithm is chosen
testoutputs = scalar, U08, 38, "bits", 1.000, 0.000 testoutputs = scalar, U08, 38, "bits", 1.000, 0.000
testenabled = bits, U08, 38, [0:0] testenabled = bits, U08, 38, [0:0]
testactive = bits, U08, 38, [1:1] testactive = bits, U08, 38, [1:1]

View File

@ -242,7 +242,7 @@ void idleControl()
} }
BIT_SET(currentStatus.spark, BIT_SPARK_IDLE); //Turn the idle control flag on BIT_SET(currentStatus.spark, BIT_SPARK_IDLE); //Turn the idle control flag on
idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count); idle_pwm_target_value = percentage(currentStatus.idleDuty, idle_pwm_max_count);
currentStatus.idleLoad = currentStatus.idleDuty >> 1; //Idle Load is divided by 2 in order to send to TS currentStatus.idleLoad = currentStatus.idleDuty;
idleOn = true; idleOn = true;
break; break;
@ -264,7 +264,7 @@ void idleControl()
break; break;
} }
BIT_SET(currentStatus.spark, BIT_SPARK_IDLE); //Turn the idle control flag on BIT_SET(currentStatus.spark, BIT_SPARK_IDLE); //Turn the idle control flag on
currentStatus.idleLoad = ((unsigned long)(idle_pwm_target_value * 100UL) / idle_pwm_max_count) >> 1; currentStatus.idleLoad = ((unsigned long)(idle_pwm_target_value * 100UL) / idle_pwm_max_count);
if(currentStatus.idleUpActive == true) { currentStatus.idleDuty += configPage2.idleUpAdder; } //Add Idle Up amount if active if(currentStatus.idleUpActive == true) { currentStatus.idleDuty += configPage2.idleUpAdder; } //Add Idle Up amount if active
} }