rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-02-13 23:25:42 -05:00
parent f020a0b0a1 fe063d53cd
commit ee211b8a3c
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/config/boards/microrusefi/board_configuration.cpp
View File

@ -59,10 +59,17 @@ static void setLedPins() {
}
static void setupVbatt() {
/*
below 0.4
// 1k high side/1.5k low side = 1.6667 ratio divider
engineConfiguration->analogInputDividerCoefficient = 2.5f / 1.5f;
*/
// 39k high side/10k low side multiplied by above analogInputDividerCoefficient = 8.166666f
// 6.8k high side/10k low side = 1.6667 ratio divider
engineConfiguration->analogInputDividerCoefficient = 16.8f / 10.0f;
// set vbatt_divider 8.16
// R139=39k high side/R141=10k low side multiplied by above analogInputDividerCoefficient = 8.166666f
engineConfiguration->vbattDividerCoeff = (49.0f / 10.0f) * engineConfiguration->analogInputDividerCoefficient;
engineConfiguration->vbattAdcChannel = EFI_ADC_11;

16
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Feb 04 00:55:30 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Wed Feb 12 20:10:22 EST 2020
pageSize = 20000
page = 1
@ -1341,8 +1341,8 @@ fileVersion = { 20191221 }
; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
TPSValue = scalar, S16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,S16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
@ -1375,9 +1375,9 @@ fileVersion = { 20191221 }
; Corrections
injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
iatCorrection = scalar, U16, 64, "%",{1/100}, 0
cltCorrection = scalar, U16, 66, "%",{1/100}, 0
baroCorrection = scalar, U16, 68, "%",{1/100}, 0
iatCorrection = scalar, S16, 64, "%",{1/100}, 0
cltCorrection = scalar, S16, 66, "%",{1/100}, 0
baroCorrection = scalar, S16, 68, "%",{1/100}, 0
fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
; Wall model AE
@ -1393,7 +1393,7 @@ fileVersion = { 20191221 }
; Ignition
ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0
sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0
; Idle & ETB
idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
@ -3116,7 +3116,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = idleSolenoid, "Solenoid"
field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle
field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle
field = "Second Idle Solenoid Pin", secondSolenoidPin, !useStepperIdle && isDoubleSolenoidIdle
field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle }
field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle
dialog = idleStepper, "Stepper"