diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index fddf5689a1..fbf1dd8f7e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 01:22:43 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3541,4 +3541,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 02 17:45:49 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 01:22:43 UTC 2020 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 e2e01f0676..7d46a7c43d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1078,8 +1078,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3824537910 +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1418689465 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1349,7 +1349,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910" +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1418689465" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 8eb7893b8b..61cdc5d0d1 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3541,4 +3541,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 9eebce4569..cdfd4f7cc4 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 27d156831c..21a69cdd4b 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 52d1ba5493..3b22c1ddd7 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index af38e8ebb3..8b7aac827a 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 89e8958df7..74806a6d99 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1078,8 +1078,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 785059244 +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 2578556707 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1349,7 +1349,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244" +#define TS_SIGNATURE "rusEFI 2020.08.03.all.2578556707" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index c39c8a97f2..33041e0d08 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 785059244 -#define TS_SIGNATURE "rusEFI 2020.08.02.all.785059244" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 2578556707 +#define TS_SIGNATURE "rusEFI 2020.08.03.all.2578556707" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d425b08874..8ac7a77e2b 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 4031537487 -#define TS_SIGNATURE "rusEFI 2020.08.02.frankenso_na6.4031537487" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1194773440 +#define TS_SIGNATURE "rusEFI 2020.08.03.frankenso_na6.1194773440" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index d283db199d..9bbc51ac86 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3824537910 -#define TS_SIGNATURE "rusEFI 2020.08.02.kin.3824537910" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1418689465 +#define TS_SIGNATURE "rusEFI 2020.08.03.kin.1418689465" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1e79edf76f..725e438f83 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 1731582754 -#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f4.1731582754" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 3494867373 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f4.3494867373" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index b07775a7af..04f9ee8ff3 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 1731582754 -#define TS_SIGNATURE "rusEFI 2020.08.02.mre_f7.1731582754" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 3494867373 +#define TS_SIGNATURE "rusEFI 2020.08.03.mre_f7.3494867373" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index eb802ffe22..3e2dba5ca6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3688355112 -#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_405.3688355112" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1823309735 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_405.1823309735" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6b020d27c6..ceeeea7091 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 3688355112 -#define TS_SIGNATURE "rusEFI 2020.08.02.prometheus_469.3688355112" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 1823309735 +#define TS_SIGNATURE "rusEFI 2020.08.03.prometheus_469.1823309735" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 71417f2a68..69604db7b9 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 2740616291 -#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f4.2740616291" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 337696492 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f4.337696492" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0898b058a4..aaa4ef6390 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.08.02 -#define SIGNATURE_HASH 2740616291 -#define TS_SIGNATURE "rusEFI 2020.08.02.proteus_f7.2740616291" +#define SIGNATURE_DATE 2020.08.03 +#define SIGNATURE_HASH 337696492 +#define TS_SIGNATURE "rusEFI 2020.08.03.proteus_f7.337696492" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 7bdd14401a..0f8e97e713 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 8c62c0c6fc..85f1c209aa 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.08.02.all.785059244" + signature = "rusEFI 2020.08.03.all.2578556707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.all.785059244" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.all.2578556707" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:38 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3092,20 +3092,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index ab3cf90260..e3a9085981 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.08.02.frankenso_na6.4031537487" + signature = "rusEFI 2020.08.03.frankenso_na6.1194773440" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.frankenso_na6.4031537487" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.frankenso_na6.1194773440" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:42 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:37 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3092,20 +3092,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index f64ba1164e..a4e1642350 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.08.02.kin.3824537910" + signature = "rusEFI 2020.08.03.kin.1418689465" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.kin.3824537910" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.kin.1418689465" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 03 01:22:43 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3093,20 +3093,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ae8f2090a1..9f889fc377 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.08.02.mre_f4.1731582754" + signature = "rusEFI 2020.08.03.mre_f4.3494867373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.mre_f4.1731582754" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.mre_f4.3494867373" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:41 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:36 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3087,20 +3087,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 35dd3431d9..5208db3482 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.08.02.mre_f7.1731582754" + signature = "rusEFI 2020.08.03.mre_f7.3494867373" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.mre_f7.1731582754" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.mre_f7.3494867373" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:40 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:34 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3087,20 +3087,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 78554c6621..2942d3203c 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.08.02.prometheus_405.3688355112" + signature = "rusEFI 2020.08.03.prometheus_405.1823309735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.prometheus_405.3688355112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.prometheus_405.1823309735" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:45 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:39 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3088,20 +3088,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7349c7b22e..875460385f 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.08.02.prometheus_469.3688355112" + signature = "rusEFI 2020.08.03.prometheus_469.1823309735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.prometheus_469.3688355112" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.prometheus_469.1823309735" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:44 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:38 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3088,20 +3088,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b8397ed9c6..923aeb6770 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.08.02.proteus_f4.2740616291" + signature = "rusEFI 2020.08.03.proteus_f4.337696492" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.proteus_f4.2740616291" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.proteus_f4.337696492" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:42 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3083,20 +3083,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 55434d89a5..19ceddbbdb 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.08.02.proteus_f7.2740616291" + signature = "rusEFI 2020.08.03.proteus_f7.337696492" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.02.proteus_f7.2740616291" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.03.proteus_f7.337696492" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sun Aug 02 17:45:46 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:40 UTC 2020 pageSize = 20000 page = 1 @@ -396,7 +396,7 @@ page = 1 hip9011IntHoldPin = bits, U08, 754, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hip9011IntHoldPinMode = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" verboseCanBaseAddress = scalar, U32, 756, "", 1, 0, 0, 536870911, 0 - mc33_hvolt = scalar, U08, 760, "v", 1, 0, 0, 100, 0 + mc33_hvolt = scalar, U08, 760, "v", 1, 0, 40, 70, 0 acIdleExtraMin = scalar, U08, 761, "Percent", 1, 0, 0, 255, 0 unusedHere = array, U08, 762, [2], "units", 1, 0, -20, 100, 0 gpioPinModes1 = bits, U08, 764, [0:1], "default", "default inverted", "open collector", "open collector inverted" @@ -1087,15 +1087,15 @@ page = 1 gppwm4_loadBins = array, U08, 4416, [8], "load", 1, 0, 0.0, 250, 0 gppwm4_rpmBins = array, U08, 4424, [8], "RPM", 50, 0, 0.0, 12000.0, 0 gppwm4_table = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0 - mc33_i_boost = scalar, U16, 4496, "X", 1, 0.0, 0, 64000, 0 - mc33_i_peak = scalar, U16, 4498, "X", 1, 0.0, 0, 64000, 0 - mc33_i_hold = scalar, U16, 4500, "X", 1, 0.0, 0, 64000, 0 - mc33_t_max_boost = scalar, U16, 4502, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_off = scalar, U16, 4504, "X", 1, 0.0, 0, 64000, 0 - mc33_t_peak_tot = scalar, U16, 4506, "X", 1, 0.0, 0, 64000, 0 - mc33_t_bypass = scalar, U16, 4508, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_off = scalar, U16, 4510, "X", 1, 0.0, 0, 64000, 0 - mc33_t_hold_tot = scalar, U16, 4512, "X", 1, 0.0, 0, 64000, 0 + mc33_i_boost = scalar, U16, 4496, "mA", 1, 0.0, 1000, 25000, 0 + mc33_i_peak = scalar, U16, 4498, "mA", 1, 0.0, 1000, 20000, 0 + mc33_i_hold = scalar, U16, 4500, "mA", 1, 0.0, 1000, 20000, 0 + mc33_t_max_boost = scalar, U16, 4502, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_off = scalar, U16, 4504, "us", 1, 0.0, 0, 10000, 0 + mc33_t_peak_tot = scalar, U16, 4506, "us", 1, 0.0, 0, 10000, 0 + mc33_t_bypass = scalar, U16, 4508, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_off = scalar, U16, 4510, "us", 1, 0.0, 0, 10000, 0 + mc33_t_hold_tot = scalar, U16, 4512, "us", 1, 0.0, 0, 10000, 0 alignmentFill_at_4514 = array, U08, 4514, [2], "units", 1, 0, -20, 100, 0 mainUnusedEnd = array, S32, 4516, [371], "units", 1, 0, -20, 100, 0 warning_message = string, ASCII, 6000, 120 @@ -3083,20 +3083,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalGauges, East dialog = mc33Dialog, "GDI Dreams" - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 - field = "mc33972 SPI", mc33972spiDevice - field = mc33_hvolt, mc33_hvolt - field = mc33_i_boost, mc33_i_boost - field = mc33_i_peak, mc33_i_peak - field = mc33_i_hold, mc33_i_hold - field = mc33_t_max_boost, mc33_t_max_boost - field = mc33_t_peak_off, mc33_t_peak_off - field = mc33_t_peak_tot, mc33_t_peak_tot - field = mc33_t_bypass, mc33_t_bypass - field = mc33_t_hold_off, mc33_t_hold_off - field = mc33_t_hold_tot, mc33_t_hold_tot + field = "MC33816 cs", mc33816_cs + field = "MC33816 rstb", mc33816_rstb + field = "MC33816 flag0", mc33816_flag0 + field = "MC33816 SPI Device", mc33972spiDevice + + field = "Boost voltage", mc33_hvolt + + field = "Boost current target", mc33_i_boost + field = "Max boost time (timeout)", mc33_t_max_boost + field = "Boost -> Peak Bypass Time", mc33_t_peak_off + + field = "Peak current target", mc33_i_peak + field = "Peak time", mc33_t_peak_tot + field = "Peak -> Hold Bypass Time", mc33_t_bypass + + 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 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 621800da38..30ba193669 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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 gen_config.sh integration/rusefi_config.txt Sun Aug 02 17:45:38 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 03 01:22:33 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1060,7 +1060,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 785059244; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1309,7 +1308,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.02.all.785059244"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.03.all.2578556707"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index ec746f584a..a65108d395 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +