From 736957a8756131f8b5d655e56038ef3c50b92d59 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 25 Mar 2020 00:58:59 -0400 Subject: [PATCH] startStopDialog --- .../controllers/algo/engine_configuration.cpp | 3 ++- firmware/integration/rusefi_config.txt | 14 +++++------- firmware/tunerstudio/rusefi.input | 18 ++++++++------- .../com/rusefi/config/generated/Fields.java | 22 +++++++++---------- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ec43e111fd..6d5b17b2c4 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -678,9 +678,10 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { config->fsioFormulas[i][0] = 0; } - CONFIG(mapMinBufferLength) = 1; + CONFIG(startCrankingDuration) = 7; + engineConfiguration->idlePidRpmDeadZone = 50; engineConfiguration->startOfCrankingPrimingPulse = 0; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1632720cca..fff9f63eb9 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -495,7 +495,7 @@ custom spi_device_e 1 bits,U32, @OFFSET@, [0:7], "Off", "SPI1", "SPI2", "SPI3" float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, 0, 1000.0, 2 float adcVcc;; "volts", 1, 0.0, 0, 6.0, 3 - float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking + float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking;"Deg", 1, 0, 0, 100, 0 brain_input_pin_e[CAM_INPUTS_COUNT iterate] camInputs;+Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660 struct afr_sensor_s @@ -672,7 +672,7 @@ pin_output_mode_e hip9011IntHoldPinMode; ! 536870911 = 2^29-1, the maximum valid extended ID uint32_t verboseCanBaseAddress;;"", 1, 0, 0, 536870911, 0 - int unrealisticRpmThreashold; + int unusedOneMoreHere pin_output_mode_e[FSIO_COMMAND_COUNT iterate] gpioPinModes; @@ -693,11 +693,9 @@ custom uart_device_e 1 bits,U32, @OFFSET@, [0:7], "Off", "UART1", "UART2", "UA int mapMinBufferLength;;"count", 1, 0, 0, 24, 0 int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0 int16_t stepperParkingExtraSteps;;"%", 1, 0, 0, 3000.0, 0 - float antilagTimeout - uint16_t antiLagRpmTreshold - uint16_t anotherUnused - - + float unusedAntilagTimeout; + int16_t antiLagRpmTreshold; + int16_t startCrankingDuration;Maximum time to crank starter;"Seconds", 1, 0, 0, 30, 0 brain_pin_e triggerErrorPin;+This pin is used for debugging - snap a logic analyzer on it and see if it's ever high pin_output_mode_e triggerErrorPinMode; @@ -950,7 +948,7 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:7], @@pin_mode_e_enum@@ float alternator_antiwindupFreq;; "x", 1, 0.0, -1000000, 1000000, 4 int16_t tps2Min;Closed throttle#2. todo: extract these two fields into a structure\nSee also tps2_1AdcChannel\nset tps2_min X;"ADC", 1, 0, 0, 1023, 0 int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps2_max X;"ADC", 1, 0, 0, 1023, 0 - output_pin_e starterControlPin;See also startStopButton + output_pin_e starterControlPin;See also startStopButtonPin pin_input_mode_e startStopButtonMode; uint8_t[1] unusedFormerWarmupAfrPid; uint8_t tachPulsePerRev;;"Pulse", 1, 0, 1.0, 255.0, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index dec44a5e2d..f78adab6f4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1772,11 +1772,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Aux Pin #4", auxPidPins4 field = "test557pin", test557pin field = "Fan Pin", fanPin - field = "Fan Pin Mode", fanPinMode field = "Main Relay Pin", mainRelayPin - field = "Main Relay Mode", mainRelayPinMode - field = "Starter Relay Pin", starterRelayPin - field = "Starter Relay Mode", starterRelayPinMode + field = "Starter Relay Pin", starterRelayDisablePin field = "aux valve #1", auxValves1 field = "aux valve #2", auxValves2 @@ -2141,8 +2138,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Pin mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayPin - field = "Pin mode", starterRelayPinMode + field = "Pin", starterRelayDisablePin + field = "Pin mode", starterRelayDisableMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin @@ -2274,13 +2271,18 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Min", alternatorControl_minValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0} field = "#% duty = Pterm + Iterm + Dterm + offset%" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + dialog = startStopDialog, "Start/Stop Button" + field = "Start/Stop Button Pin", startStopButtonPin + field = "Start/Stop Button Mode", startStopButtonMode + field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator + panel = startStopDialog + dialog = speedSensorLeft field = "Input pin", vehicleSpeedSensorInputPin diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 814cfbe07e..43ee3a80f7 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Mar 24 22:51:16 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Mar 25 00:28:20 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -57,15 +57,12 @@ public class Fields { public static final int alternatorPwmFrequency_offset = 2256; public static final int ambiguousOperationMode_offset = 488; public static final int analogInputDividerCoefficient_offset = 460; - public static final int anotherUnused_offset = 826; public static final int antiLagActivatePin_offset = 990; public static final int antiLagActivationMode_offset = 1024; public static final int antiLagActivationMode_offset_hex = 400; public static final int antiLagEnabled_offset = 76; public static final int antiLagRpmTreshold_offset = 824; public static final int antiLagRpmTreshold_offset_hex = 338; - public static final int antilagTimeout_offset = 820; - public static final int antilagTimeout_offset_hex = 334; public static final int autoTuneCltThreshold_offset = 2420; public static final int autoTuneCltThreshold_offset_hex = 974; public static final int autoTuneTpsQuietPeriod_offset = 2428; @@ -1176,6 +1173,7 @@ public class Fields { public static final int spi3mosiPin_offset = 934; public static final int spi3SckMode_offset = 2602; public static final int spi3sckPin_offset = 936; + public static final int startCrankingDuration_offset = 826; public static final int starterControlPin_offset = 1772; public static final int starterRelayDisableMode_offset = 809; public static final int starterRelayDisableMode_offset_hex = 329; @@ -1374,7 +1372,6 @@ public class Fields { public static final int twoWireBatchIgnition_offset = 1476; public static final int twoWireBatchInjection_offset = 1476; public static final int uartConsoleSerialSpeed_offset = 2076; - public static final int unrealisticRpmThreashold_offset = 760; public static final int unused1059_offset = 3964; public static final int unused1234234_offset = 2042; public static final int unused_1484_bit_24_offset = 1476; @@ -1387,6 +1384,8 @@ public class Fields { public static final int unused_1484_bit_31_offset = 1476; public static final int unused_former_warmup_target_afr_offset = 2096; public static final int unused_former_warmup_target_afr_offset_hex = 830; + public static final int unusedAntilagTimeout_offset = 820; + public static final int unusedAntilagTimeout_offset_hex = 334; public static final int unusedAtOldBoardConfigurationEnd_offset = 1064; public static final int unusedAtOldBoardConfigurationEnd_offset_hex = 428; public static final int unusedBit4_1476_offset = 1476; @@ -1419,6 +1418,7 @@ public class Fields { public static final int unusedErrorPin_offset = 2040; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedFormerWarmupAfrPid_offset = 1774; + public static final int unusedOneMoreHere_offset = 760; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2713; public static final int unusedSpiPadding7_offset = 4005; @@ -1803,7 +1803,7 @@ public class Fields { public static final Field HIP9011INTHOLDPIN = Field.create("HIP9011INTHOLDPIN", 754, FieldType.INT8, brain_pin_e); public static final Field HIP9011INTHOLDPINMODE = Field.create("HIP9011INTHOLDPINMODE", 755, FieldType.INT8, pin_output_mode_e); public static final Field VERBOSECANBASEADDRESS = Field.create("VERBOSECANBASEADDRESS", 756, FieldType.INT); - public static final Field UNREALISTICRPMTHREASHOLD = Field.create("UNREALISTICRPMTHREASHOLD", 760, FieldType.INT); + public static final Field UNUSEDONEMOREHERE = Field.create("UNUSEDONEMOREHERE", 760, FieldType.INT); public static final Field GPIOPINMODES1 = Field.create("GPIOPINMODES1", 764, FieldType.INT8, pin_output_mode_e); public static final Field GPIOPINMODES2 = Field.create("GPIOPINMODES2", 765, FieldType.INT8, pin_output_mode_e); public static final Field GPIOPINMODES3 = Field.create("GPIOPINMODES3", 766, FieldType.INT8, pin_output_mode_e); @@ -1854,9 +1854,9 @@ public class Fields { public static final Field MAPMINBUFFERLENGTH = Field.create("MAPMINBUFFERLENGTH", 812, FieldType.INT); public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT16); public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT16); - public static final Field ANTILAGTIMEOUT = Field.create("ANTILAGTIMEOUT", 820, FieldType.FLOAT); + public static final Field UNUSEDANTILAGTIMEOUT = Field.create("UNUSEDANTILAGTIMEOUT", 820, FieldType.FLOAT); public static final Field ANTILAGRPMTRESHOLD = Field.create("ANTILAGRPMTRESHOLD", 824, FieldType.INT16); - public static final Field ANOTHERUNUSED = Field.create("ANOTHERUNUSED", 826, FieldType.INT16); + public static final Field STARTCRANKINGDURATION = Field.create("STARTCRANKINGDURATION", 826, FieldType.INT16); public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 828, FieldType.INT8, brain_pin_e); public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 829, FieldType.INT8, pin_output_mode_e); public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 830, FieldType.INT8, output_pin_e); @@ -2713,7 +2713,7 @@ public class Fields { HIP9011INTHOLDPIN, HIP9011INTHOLDPINMODE, VERBOSECANBASEADDRESS, - UNREALISTICRPMTHREASHOLD, + UNUSEDONEMOREHERE, GPIOPINMODES1, GPIOPINMODES2, GPIOPINMODES3, @@ -2764,9 +2764,9 @@ public class Fields { MAPMINBUFFERLENGTH, IDLEPIDDEACTIVATIONTPSTHRESHOLD, STEPPERPARKINGEXTRASTEPS, - ANTILAGTIMEOUT, + UNUSEDANTILAGTIMEOUT, ANTILAGRPMTRESHOLD, - ANOTHERUNUSED, + STARTCRANKINGDURATION, TRIGGERERRORPIN, TRIGGERERRORPINMODE, ACRELAYPIN,