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 5fd72a331f..0158cc81c3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1884,6 +1884,9 @@ #define servoOutputPins7_offset_hex c4a #define servoOutputPins8_offset 3147 #define servoOutputPins8_offset_hex c4b +#define show_Frankenso_presets true +#define show_microRusEFI_presets true +#define show_test_presets true #define showHumanReadableWarning_offset 976 #define showHumanReadableWarning_offset_hex 3d0 #define showSdCardWarning_offset 76 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 647106d49f..dfebcfad52 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1884,6 +1884,9 @@ #define servoOutputPins7_offset_hex c4a #define servoOutputPins8_offset 3147 #define servoOutputPins8_offset_hex c4b +#define show_Frankenso_presets true +#define show_microRusEFI_presets true +#define show_test_presets true #define showHumanReadableWarning_offset 976 #define showHumanReadableWarning_offset_hex 3d0 #define showSdCardWarning_offset 76 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index a3fb3fbd14..1ec251ff77 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 21 19:29:39 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 21 21:17:49 EDT 2020 pageSize = 20000 page = 1 @@ -2796,12 +2796,21 @@ cmd_reset_controller = "w\x00\xbb\x00\x00" cmd_dfu = "w\x00\xba\x00\x00" ; See 'executeTSCommand' in firmware source code + + +; MRE_MIATA_NB2_MAP = 11 +cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0B" +; MRE_MIATA_NB2_MAF = 15 +cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0F" + ; MIATA_NA6_MAP = 41 -cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" +cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "w\x00\x30\x00\x29" ; MIATA_NA6_VAF = 57 -cmd_set_engine_type_Miata_NA6_VAF = "w\x00\x30\x00\x39" +cmd_set_engine_type_Frankenso_Miata_NA6_VAF = "w\x00\x30\x00\x39" ; MAZDA_MIATA_2003 = 47 -cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F" +cmd_set_engine_type_Frankenso_Miata_NB2 = "w\x00\x30\x00\x2F" + + ; ETB_BENCH_ENGINE = 58 cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" ; ETB_BENCH_ENGINE = 59 @@ -2873,11 +2882,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java - field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20)))} - field = "Ignition Pin 3", ignitionPins3, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9) || (firingOrder == 13) || (firingOrder == 14) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 20)))} - field = "Ignition Pin 4", ignitionPins4, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12) || (firingOrder == 14) || (firingOrder == 16) || (firingOrder == 17) || (firingOrder == 22)))} - field = "Ignition Pin 5", ignitionPins5, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12) || (firingOrder == 15) || (firingOrder == 18)))} - field = "Ignition Pin 6", ignitionPins6, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 13) || (firingOrder == 22)))} + field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23)))} + field = "Ignition Pin 3", ignitionPins3, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9) || (firingOrder == 13) || (firingOrder == 14) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 20) || (firingOrder == 23)))} + field = "Ignition Pin 4", ignitionPins4, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12) || (firingOrder == 14) || (firingOrder == 16) || (firingOrder == 17) || (firingOrder == 22) || (firingOrder == 23)))} + field = "Ignition Pin 5", ignitionPins5, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 23)))} + field = "Ignition Pin 6", ignitionPins6, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 13) || (firingOrder == 22) || (firingOrder == 23)))} field = "Ignition Pin 7", ignitionPins7, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 7) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 11) || (firingOrder == 15) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 22)))} field = "Ignition Pin 8", ignitionPins8, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 8) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11) || (firingOrder == 16) || (firingOrder == 18) || (firingOrder == 19)))} field = "Ignition Pin 9", ignitionPins9, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 9) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 15) || (firingOrder == 22)))} @@ -4188,11 +4197,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEfi controller to apply preset values" field = "!Once you send the command, please reconnect to rusEfi controller in order to read fresh values" - commandButton = "Miata NA6 Stage 0", cmd_set_engine_type_Miata_NA6_VAF - 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 = "TLE8888B test bench", cmd_set_engine_type_8888_test + + commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP + commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF + commandButton = "Reset firmware settings", cmd_set_engine_type_default