From dd3f5b8668c257b009259d82bdc0d9a1516c0891 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 12 Mar 2019 20:33:13 -0400 Subject: [PATCH] TS command to reset firmware --- firmware/console/binary/tunerstudio.cpp | 2 +- firmware/controllers/injector_central.cpp | 4 ++- firmware/controllers/injector_central.h | 2 +- firmware/tunerstudio/rusefi.ini | 34 +++++++++++++++++++---- firmware/tunerstudio/rusefi.input | 3 ++ 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index be49f87b20..15f6d387cc 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -774,7 +774,7 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin } #if EFI_PROD_CODE || defined(__DOXYGEN__) - runBenchTest(subsystem, index); + executeTSCommand(subsystem, index); #endif /* EFI_PROD_CODE */ sendOkResponse(tsChannel, TS_CRC); } else { diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp index 2f2b6bc07e..54986a6cc3 100644 --- a/firmware/controllers/injector_central.cpp +++ b/firmware/controllers/injector_central.cpp @@ -243,7 +243,7 @@ void OutputPin::unregisterOutput(brain_pin_e oldPin, brain_pin_e newPin) { } } -void runBenchTest(uint16_t subsystem, uint16_t index) { +void executeTSCommand(uint16_t subsystem, uint16_t index) { scheduleMsg(logger, "IO test subsystem=%d index=%d", subsystem, index); if (subsystem == 0x12) { @@ -268,6 +268,8 @@ void runBenchTest(uint16_t subsystem, uint16_t index) { setCallFromPitStop(30000); } else if (subsystem == 0x30) { setEngineType(index); + } else if (subsystem == 0x31) { + setEngineType(DEFAULT_ENGINE_TYPE); } else if (subsystem == 0x79) { scheduleStopEngine(); } diff --git a/firmware/controllers/injector_central.h b/firmware/controllers/injector_central.h index 3f8c859832..10fc1644ae 100644 --- a/firmware/controllers/injector_central.h +++ b/firmware/controllers/injector_central.h @@ -20,6 +20,6 @@ void milBench(void); void initInjectorCentral(Logging *sharedLogger); bool isRunningBenchTest(void); -void runBenchTest(uint16_t subsystem, uint16_t index); +void executeTSCommand(uint16_t subsystem, uint16_t index); #endif /* INJECTOR_CENTRAL_H_ */ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index a030df1f01..6d6ffaf368 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 12 19:08:28 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 12 20:32:30 EDT 2019 pageSize = 20000 page = 1 @@ -1469,6 +1469,7 @@ fileVersion = { 20171101 } ; table_id, map3d_id, "title", page table = fuelTableMAFTbl, fuelTableMAFMap, "Fuel Table", 1 + topicHelp = "fuelHelp" ; constant, variable xBins = fuelRpmBins, RPMValue yBins = fuelLoadBins, MAFValue @@ -1478,6 +1479,7 @@ fileVersion = { 20171101 } upDownLabel = "(RICHER)", "(LEANER)" table = fuelTableTPSTbl, fuelTableTPSMap, "Fuel Table", 1 + topicHelp = "fuelHelp" ; constant, variable xBins = fuelRpmBins, RPMValue yBins = fuelLoadBins, TPSValue @@ -1487,6 +1489,7 @@ fileVersion = { 20171101 } upDownLabel = "(RICHER)", "(LEANER)" table = fuelTableELTbl, fuelTableELMap, "Fuel Table", 1 + topicHelp = "fuelHelp" ; constant, variable xBins = fuelRpmBins, RPMValue yBins = fuelLoadBins, engineLoad @@ -1497,6 +1500,7 @@ fileVersion = { 20171101 } ; move table into a panel? or find a way to add a link to https://rusefi.com//wiki/index.php?title=Manual:Software:TPSTPS table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS Acceleration Extra Fuel(ms)", 1 + topicHelp = "tpstpsHelp" xBins = tpsTpsAccelFromRpmBins, TPSValue yBins = tpsTpsAccelToRpmBins, TPSValue zBins = tpsTpsAccelTable @@ -1577,6 +1581,7 @@ fileVersion = { 20171101 } table = injPhaseTableTbl, injPhaseTableMap, "Injection Phase", 1 + topicHelp = "fuelHelp" ; constant, variable xBins = injPhaseRpmBins, RPMValue yBins = injPhaseLoadBins, engineLoad @@ -2109,6 +2114,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x49\x00\x00" +; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" ; MIATA_NA6_VAF = 57 @@ -2117,6 +2123,7 @@ cmd_set_engine_type_Miata_NA6_VAF = "w\x00\x30\x00\x39" cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F" ; ETB_BENCH_ENGINE = 58 cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" +cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] dialog = fuelTableBottomDialog, "", card @@ -2125,7 +2132,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" panel = fuelTableELTbl, Center dialog = fuelTableRight, "", yAxis - topicHelp = "http://rusefi.com/fuel" + topicHelp = "https://rusefi.com/s/fuel" displayOnlyField = "Fuel Algorithm", fuelAlgorithm panel = fuelTableBottomDialog, Center liveGraph = fuelLive, "Fuel", South @@ -2138,6 +2145,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" gauge = MAPGauge dialog = fuelTableDialog, "Fuel Table", xAxis + topicHelp = "fuelHelp" panel = fuelTableGaugesPanel panel = fuelTableRight @@ -2243,6 +2251,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" field = "Injection Pin 12 ", injectionPins12, {cylindersCount > 11} dialog = injectionSettings, "" + topicHelp = "fuelHelp" panel = baseInjection panel = injChars @@ -2923,11 +2932,11 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" field = " Threshold", engineSnifferRpmThreshold dialog = generalSettings, "General" - field = "http://rusefi.com/support" + field = "https://rusefi.com/s/support" field = "RPM Hard Limit", rpmHardLimit field = "Boost Cut Pressure", boostCutPressure field = "" - field = "http://rusefi.com/fuel" + field = "!https://rusefi.com/s/fuel" field = "Fuel Algorithm", fuelAlgorithm field = "" field = "#System hack's" @@ -2939,6 +2948,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" + topicHelp = "baseHelp" panel = baseEngineConfig panel = generalSettings @@ -3112,8 +3122,21 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" - webHelp = "http://rusefi.com/fuel" + webHelp = "https://rusefi.com/s/fuel" + + help = fuelHelp, "Fuel Control" + text = "More about fuel control on the web" + webHelp = "https://rusefi.com/s/fuel" + help = tpsTpsHelp, "Acceleration Enrichment" + text = "More about Tps To Tps acceleration on the web" + webHelp = "https://rusefi.com/s/tpstps" + + help = baseHelp, "Base Settings Control" + text = "More about Tps To Tps acceleration on the web" + webHelp = "https://rusefi.com/s/fuel" + webHelp = "https://rusefi.com/s/debugmode" + dialog = veTableDialog topicHelp = "veTableDialogHelp" panel = veTableTbl, South @@ -3185,6 +3208,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" commandButton = "Miata NA6 Stage 1", cmd_set_engine_type_Miata_NA6_MAP commandButton = "Miata NB2 MAP", cmd_set_engine_type_Miata_NA2 commandButton = "ETB test bench", cmd_set_engine_type_etb_test + commandButton = "Reset firmware settings", cmd_set_engine_type_default ; Board->ECU stimulator diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index d0d9194673..bf08922145 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1226,6 +1226,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x49\x00\x00" +; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" ; MIATA_NA6_VAF = 57 @@ -1234,6 +1235,7 @@ cmd_set_engine_type_Miata_NA6_VAF = "w\x00\x30\x00\x39" cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F" ; ETB_BENCH_ENGINE = 58 cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" +cmd_set_engine_type_default = "w\x00\x31\x00\x00" [UserDefined] dialog = fuelTableBottomDialog, "", card @@ -2318,6 +2320,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" commandButton = "Miata NA6 Stage 1", cmd_set_engine_type_Miata_NA6_MAP commandButton = "Miata NB2 MAP", cmd_set_engine_type_Miata_NA2 commandButton = "ETB test bench", cmd_set_engine_type_etb_test + commandButton = "Reset firmware settings", cmd_set_engine_type_default ; Board->ECU stimulator