diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 1fcd41b487..03d571904d 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 3195023341 -#define TS_SIGNATURE "rusEFI 2020.09.07.all.3195023341" +#define SIGNATURE_HASH 564843613 +#define TS_SIGNATURE "rusEFI 2020.09.07.all.564843613" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index bea4c8595e..b65c28ef8f 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 434850262 -#define TS_SIGNATURE "rusEFI 2020.09.07.frankenso_na6.434850262" +#define SIGNATURE_HASH 2251403878 +#define TS_SIGNATURE "rusEFI 2020.09.07.frankenso_na6.2251403878" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 39c31f9900..0a0a96f52d 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1437275241 -#define TS_SIGNATURE "rusEFI 2020.09.07.kin.1437275241" +#define SIGNATURE_HASH 3396464601 +#define TS_SIGNATURE "rusEFI 2020.09.07.kin.3396464601" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5beab913ae..feebda7c71 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2945813319 -#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f4.2945813319" +#define SIGNATURE_HASH 810512631 +#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f4.810512631" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index af1d21a422..e799f8cec5 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2945813319 -#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f7.2945813319" +#define SIGNATURE_HASH 810512631 +#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f7.810512631" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 114dde53ae..4a617158df 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 190826142 -#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_405.190826142" +#define SIGNATURE_HASH 2491759918 +#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_405.2491759918" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a42cce2d69..4446b363b2 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 190826142 -#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_469.190826142" +#define SIGNATURE_HASH 2491759918 +#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_469.2491759918" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4b8b6cae96..6ce6d63b69 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1570895101 -#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f4.1570895101" +#define SIGNATURE_HASH 3262844749 +#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f4.3262844749" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0bc45f4f3d..44d6444ad8 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1570895101 -#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f7.1570895101" +#define SIGNATURE_HASH 3262844749 +#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f7.3262844749" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 30901f7d27..e850cf4d0c 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index a845562cb4..7253f02989 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.all.3195023341" + signature = "rusEFI 2020.09.07.all.564843613" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.all.3195023341" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.all.564843613" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:06 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2733,7 +2733,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2752,7 +2752,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2795,7 +2795,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2932,7 +2932,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -3003,7 +3003,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3177,7 +3177,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3196,7 +3196,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3387,6 +3387,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3485,7 +3489,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3891,7 +3895,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3907,7 +3911,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4183,10 +4187,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4231,8 +4235,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4240,20 +4244,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4438,7 +4442,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 0e7f802310..f0d9df8a48 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.frankenso_na6.434850262" + signature = "rusEFI 2020.09.07.frankenso_na6.2251403878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.frankenso_na6.434850262" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.frankenso_na6.2251403878" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:31 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:16 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2733,7 +2733,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2752,7 +2752,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2795,7 +2795,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2932,7 +2932,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -3003,7 +3003,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3177,7 +3177,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3196,7 +3196,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3387,6 +3387,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3485,7 +3489,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3891,7 +3895,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3907,7 +3911,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4183,10 +4187,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4231,8 +4235,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4240,20 +4244,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4431,7 +4435,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 3b2d990a16..36c65c5ec7 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.kin.1437275241" + signature = "rusEFI 2020.09.07.kin.3396464601" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.kin.1437275241" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.kin.3396464601" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:49:39 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 15:36:24 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2733,7 +2733,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2752,7 +2752,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2795,7 +2795,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2932,7 +2932,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -3004,7 +3004,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Invert Cam/VVT", invertCamVVTSignal panel = triggerInputComparator - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3178,7 +3178,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3197,7 +3197,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3388,6 +3388,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3486,7 +3490,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3892,7 +3896,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3908,7 +3912,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4184,10 +4188,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4232,8 +4236,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4241,20 +4245,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4439,7 +4443,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 77fa6a914c..88fdae47ce 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.mre_f4.2945813319" + signature = "rusEFI 2020.09.07.mre_f4.810512631" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.mre_f4.2945813319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.mre_f4.810512631" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:15 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2729,7 +2729,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2747,7 +2747,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2790,7 +2790,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2927,7 +2927,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2998,7 +2998,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3172,7 +3172,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3191,7 +3191,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3370,6 +3370,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3468,7 +3472,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3873,7 +3877,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3889,7 +3893,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4157,10 +4161,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4205,8 +4209,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4214,20 +4218,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4406,7 +4410,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 2264cb88eb..733f4d468d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.mre_f7.2945813319" + signature = "rusEFI 2020.09.07.mre_f7.810512631" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.mre_f7.2945813319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.mre_f7.810512631" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:13 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2729,7 +2729,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2747,7 +2747,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2790,7 +2790,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2927,7 +2927,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2998,7 +2998,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3172,7 +3172,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3191,7 +3191,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3370,6 +3370,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3468,7 +3472,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3873,7 +3877,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3889,7 +3893,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4157,10 +4161,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4205,8 +4209,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4214,20 +4218,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4406,7 +4410,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ac7c8316bd..075859f244 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.prometheus_405.190826142" + signature = "rusEFI 2020.09.07.prometheus_405.2491759918" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.prometheus_405.190826142" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.prometheus_405.2491759918" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:34 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:19 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2733,7 +2733,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2748,7 +2748,7 @@ menuDialog = main subMenu = std_separator - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2791,7 +2791,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2928,7 +2928,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2999,7 +2999,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3173,7 +3173,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3192,7 +3192,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3383,6 +3383,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3481,7 +3485,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3887,7 +3891,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3903,7 +3907,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4179,10 +4183,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4227,8 +4231,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4236,20 +4240,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4434,7 +4438,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 3b70d3d5a8..a9578046a7 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.prometheus_469.190826142" + signature = "rusEFI 2020.09.07.prometheus_469.2491759918" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.prometheus_469.190826142" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.prometheus_469.2491759918" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:32 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:18 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2733,7 +2733,7 @@ menuDialog = main subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = allPins1, "Full pinout 1/3" subMenu = allPins2, "Full pinout 2/3" subMenu = allPins3_1_and_2 "Full pinout 3/3" @@ -2748,7 +2748,7 @@ menuDialog = main subMenu = std_separator - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2791,7 +2791,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2928,7 +2928,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2999,7 +2999,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3173,7 +3173,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3192,7 +3192,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3383,6 +3383,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3481,7 +3485,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3887,7 +3891,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3903,7 +3907,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4179,10 +4183,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4227,8 +4231,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4236,20 +4240,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4434,7 +4438,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 76749571ce..b6dfcd3c84 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.proteus_f4.1570895101" + signature = "rusEFI 2020.09.07.proteus_f4.3262844749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.proteus_f4.1570895101" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.proteus_f4.3262844749" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:22 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2727,7 +2727,7 @@ menuDialog = main subMenu = canBusMain, "CAN Bus Communication" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = std_separator @@ -2743,7 +2743,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2786,7 +2786,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2923,7 +2923,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2994,7 +2994,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3168,7 +3168,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3187,7 +3187,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3364,6 +3364,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3460,7 +3464,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3866,7 +3870,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3882,7 +3886,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4148,10 +4152,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4196,8 +4200,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4205,20 +4209,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4393,7 +4397,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 06e9d14b73..e15f4b9c86 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.proteus_f7.1570895101" + signature = "rusEFI 2020.09.07.proteus_f7.3262844749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.proteus_f7.1570895101" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.proteus_f7.3262844749" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:36 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 15:36:21 UTC 2020 pageSize = 20000 page = 1 @@ -1619,7 +1619,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 ignitionLoad = scalar, U16, 136, "%", 0.01, 0 @@ -1774,7 +1774,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1782,7 +1782,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1799,7 +1799,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1816,12 +1816,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -2072,7 +2072,7 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue @@ -2384,14 +2384,14 @@ gaugeCategory = Knock indicator = { sd_status & 8}, "SD Log", "SD Log", white, black, green, black indicator = { sd_status & 16}, "SD Err", "SD Err", white, black, red, black - ; this is required so that the "config error" feature works in TS + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2416,7 +2416,7 @@ gaugeCategory = Knock [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2541,7 +2541,7 @@ gaugeCategory = Knock entry = knock6, "Knock 6", int, "%d" entry = knock7, "Knock 7", int, "%d" entry = knock8, "Knock 8", int, "%d" - + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2649,7 +2649,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2727,7 +2727,7 @@ menuDialog = main subMenu = canBusMain, "CAN Bus Communication" subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - + subMenu = std_separator @@ -2743,7 +2743,7 @@ menuDialog = main subMenu = etbDialog, "Electronic throttle body (beta version)" subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2786,7 +2786,7 @@ cmd_test_spk13 = "Z\x00\x12\x00\x0d" cmd_test_spk14 = "Z\x00\x12\x00\x0e" cmd_test_spk15 = "Z\x00\x12\x00\x0f" cmd_test_spk16 = "Z\x00\x12\x00\x10" - + cmd_test_inj1 = "Z19\x00\x01" cmd_test_inj2 = "Z19\x00\x02" @@ -2923,7 +2923,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2994,7 +2994,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Cam Sync/VVT input", camInputs1 field = "Invert Cam/VVT", invertCamVVTSignal - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } panel = triggerInputs, South, { consumeObdSensors == 0 } @@ -3168,7 +3168,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = "MC33816 cs", mc33816_cs field = "MC33816 rstb", mc33816_rstb field = "MC33816 flag0", mc33816_flag0 @@ -3187,7 +3187,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Hold current target", mc33_i_hold field = "mc33_t_hold_off ?????", mc33_t_hold_off field = "Maximum injection duration", mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3364,6 +3364,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin + field = "DRV8860 CS", drv8860_cs + field = "DRV8860 CS Mode", drv8860_csPinMode + field = "DRV8860 MISO pin", drv8860_miso + field = "DRV8860 SPI", drv8860spiDevice field = "comm status light", communicationLedPin field = "running status light", runningLedPin @@ -3460,7 +3464,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3866,7 +3870,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3882,7 +3886,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - + ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" @@ -4148,10 +4152,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4196,8 +4200,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4205,20 +4209,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" @@ -4393,7 +4397,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - +