diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 7f0980582f..b32f17f112 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -2268,6 +2268,8 @@ #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true +#define ts_show_main_relay true +#define ts_show_main_relay_microRusEFI_message false #define ts_show_sd_card true #define ts_show_spi true #define ts_show_trigger_comparator true diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index 73e90b6153..63b69d2d28 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -11,3 +11,5 @@ #define ts_show_sd_card true #define ts_show_can_pins false #define ts_show_tunerstudio_port false +#define ts_show_main_relay false +#define ts_show_main_relay_microRusEFI_message true diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e7d5c4c437..1dcd73dd81 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -2268,6 +2268,8 @@ #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true +#define ts_show_main_relay true +#define ts_show_main_relay_microRusEFI_message false #define ts_show_sd_card true #define ts_show_spi true #define ts_show_trigger_comparator false diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 33eabd4287..fa57ffb213 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1551,6 +1551,8 @@ end_struct ! some board files override this value using prepend file #define ts_show_hip9011 true +#define ts_show_main_relay true +#define ts_show_main_relay_microRusEFI_message false #define ts_show_cj125 true #define ts_show_etb true #define ts_show_etb_pins true diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 01b64aca28..624c4f46dd 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1249,7 +1249,7 @@ menuDialog = main subMenu = std_separator # Digital outputs - subMenu = mainRelay, "Main relay" + subMenu = mainRelayDialog, "Main relay" subMenu = starterRelay, "Starter Disable relay" subMenu = fuelPump, "Fuel pump & rail" subMenu = fanSetting, "Fan" @@ -2319,9 +2319,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Controller->Actuator Outputs - dialog = mainRelay, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + dialog = mainRelayDialog, "Main relay output" + field = "microRusEFI main relay control is hard wired on pin #29"@@if_ts_show_main_relay_microRusEFI_message + field = "Pin", mainRelayPin@@if_ts_show_main_relay + field = "Pin mode", mainRelayPinMode@@if_ts_show_main_relay dialog = starterRelay, "Starter relay output" field = "Pin", starterRelayDisablePin diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 0dc594ca8f..22e223c243 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -89,7 +89,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.bat integration\rusefi_config.txt Thu May 14 23:04:50 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 15 12:04:24 EDT 2020 pageSize = 20000 page = 1 @@ -2509,7 +2509,7 @@ menuDialog = main subMenu = std_separator # Digital outputs - subMenu = mainRelay, "Main relay" + subMenu = mainRelayDialog, "Main relay" subMenu = starterRelay, "Starter Disable relay" subMenu = fuelPump, "Fuel pump & rail" subMenu = fanSetting, "Fan" @@ -3569,9 +3569,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Controller->Actuator Outputs - dialog = mainRelay, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + dialog = mainRelayDialog, "Main relay output" + field = "microRusEFI main relay control is hard wired on pin #29" dialog = starterRelay, "Starter relay output" field = "Pin", starterRelayDisablePin