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 87decff448..38912dd973 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 Sat Jul 11 02:30:06 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 12 21:35:39 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -699,8 +699,9 @@ struct engine_configuration_s { offset 76 bit 15 */ bool cj125isUrDivided : 1; /** + * Switch between Industrial and Cic PID implementation offset 76 bit 16 */ - bool issue_294_unused : 1; + bool useCicPidForIdle : 1; /** offset 76 bit 17 */ bool useTLE8888_cranking_hack : 1; @@ -3529,4 +3530,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 Sat Jul 11 02:30:06 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 12 21:35:39 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 9220fe04ca..5b55244d68 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -836,7 +836,6 @@ #define issue_294_29_offset 76 #define issue_294_30_offset 76 #define issue_294_31_offset 76 -#define issue_294_unused_offset 76 #define isTunerStudioEnabled_offset 1476 #define isVerboseAlternator_offset 744 #define isVerboseAuxPid1_offset 76 @@ -1064,8 +1063,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.07.11 -#define SIGNATURE_HASH 918909694 +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 422334380 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1326,7 +1325,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.11.kin.918909694" +#define TS_SIGNATURE "rusEFI 2020.07.12.kin.422334380" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1394,6 +1393,7 @@ #define unusedsw_offset 4020 #define unusedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 +#define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 295a72727e..a87e9d9482 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 Sat Jul 11 02:21:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -699,8 +699,9 @@ struct engine_configuration_s { offset 76 bit 15 */ bool cj125isUrDivided : 1; /** + * Switch between Industrial and Cic PID implementation offset 76 bit 16 */ - bool issue_294_unused : 1; + bool useCicPidForIdle : 1; /** offset 76 bit 17 */ bool useTLE8888_cranking_hack : 1; @@ -3529,4 +3530,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 Sat Jul 11 02:21:57 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 8699f3b847..0ded10f7ea 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 Sat Jul 11 02:21:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 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 a2cb295e11..4fb53186cd 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 Sat Jul 11 02:21:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 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 63c4118175..37cf9c346c 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 Sat Jul 11 02:21:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 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 1c8225e14e..5ce5b8fcdd 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 Sat Jul 11 02:21:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 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 f9793e06fc..c27cf1a770 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -836,7 +836,6 @@ #define issue_294_29_offset 76 #define issue_294_30_offset 76 #define issue_294_31_offset 76 -#define issue_294_unused_offset 76 #define isTunerStudioEnabled_offset 1476 #define isVerboseAlternator_offset 744 #define isVerboseAuxPid1_offset 76 @@ -1064,8 +1063,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.07.11 -#define SIGNATURE_HASH 4227575396 +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 3557987126 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1326,7 +1325,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.11.all.4227575396" +#define TS_SIGNATURE "rusEFI 2020.07.12.all.3557987126" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 @@ -1394,6 +1393,7 @@ #define unusedsw_offset 4020 #define unusedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 +#define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 #define useETBforIdleControl_offset 744 #define useFixedBaroCorrFromMap_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 95981507ab..b52de49c56 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.07.11 -#define SIGNATURE_HASH 693441545 -#define TS_SIGNATURE "rusEFI 2020.07.11.all.693441545" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 3557987126 +#define TS_SIGNATURE "rusEFI 2020.07.12.all.3557987126" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index fab3b416bf..37208ff941 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.07.11 -#define SIGNATURE_HASH 4157765866 -#define TS_SIGNATURE "rusEFI 2020.07.11.frankenso_na6.4157765866" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 177602517 +#define TS_SIGNATURE "rusEFI 2020.07.12.frankenso_na6.177602517" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f6eadf28fb..8349a20a8e 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.07.11 -#define SIGNATURE_HASH 3832268947 -#define TS_SIGNATURE "rusEFI 2020.07.11.kin.3832268947" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 422334380 +#define TS_SIGNATURE "rusEFI 2020.07.12.kin.422334380" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index a525cca9c2..4205d1fad8 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.07.11 -#define SIGNATURE_HASH 1621869191 -#define TS_SIGNATURE "rusEFI 2020.07.11.mre_f4.1621869191" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 2649507256 +#define TS_SIGNATURE "rusEFI 2020.07.12.mre_f4.2649507256" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 75050b6b07..8ed5e18fb9 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.07.11 -#define SIGNATURE_HASH 1621869191 -#define TS_SIGNATURE "rusEFI 2020.07.11.mre_f7.1621869191" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 2649507256 +#define TS_SIGNATURE "rusEFI 2020.07.12.mre_f7.2649507256" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 561a992c10..aa85a913d3 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.07.11 -#define SIGNATURE_HASH 3695824013 -#define TS_SIGNATURE "rusEFI 2020.07.11.prometheus_405.3695824013" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 554585010 +#define TS_SIGNATURE "rusEFI 2020.07.12.prometheus_405.554585010" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 1943ecbec3..c426d63641 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.07.11 -#define SIGNATURE_HASH 3695824013 -#define TS_SIGNATURE "rusEFI 2020.07.11.prometheus_469.3695824013" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 554585010 +#define TS_SIGNATURE "rusEFI 2020.07.12.prometheus_469.554585010" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5e4b10037a..f25ed0980d 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.07.11 -#define SIGNATURE_HASH 2764334534 -#define TS_SIGNATURE "rusEFI 2020.07.11.proteus_f4.2764334534" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 1501815545 +#define TS_SIGNATURE "rusEFI 2020.07.12.proteus_f4.1501815545" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index a6c469d074..23f4345d6b 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.07.11 -#define SIGNATURE_HASH 2764334534 -#define TS_SIGNATURE "rusEFI 2020.07.11.proteus_f7.2764334534" +#define SIGNATURE_DATE 2020.07.12 +#define SIGNATURE_HASH 1501815545 +#define TS_SIGNATURE "rusEFI 2020.07.12.proteus_f7.1501815545" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 5b2b8079e8..0a4b3b779b 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 f9e960fade..5f114fa374 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.all.693441545" + signature = "rusEFI 2020.07.12.all.3557987126" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.all.693441545" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.all.3557987126" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:19 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3564,6 +3565,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c32d46a50d..ebbec3a403 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.frankenso_na6.4157765866" + signature = "rusEFI 2020.07.12.frankenso_na6.177602517" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.frankenso_na6.4157765866" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.frankenso_na6.177602517" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:24 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:33 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3564,6 +3565,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 61d81cc952..77136a9950 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.kin.3832268947" + signature = "rusEFI 2020.07.12.kin.422334380" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.kin.3832268947" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.kin.422334380" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:31 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jul 12 21:35:39 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3565,6 +3566,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d034d9c725..c7a2ef55f5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.mre_f4.1621869191" + signature = "rusEFI 2020.07.12.mre_f4.2649507256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.mre_f4.1621869191" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.mre_f4.2649507256" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:31 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3547,6 +3548,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d389bfa488..7e0752a08d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.mre_f7.1621869191" + signature = "rusEFI 2020.07.12.mre_f7.2649507256" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.mre_f7.1621869191" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.mre_f7.2649507256" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:30 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3547,6 +3548,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 24561978ae..af47c87fa6 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.prometheus_405.3695824013" + signature = "rusEFI 2020.07.12.prometheus_405.554585010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.prometheus_405.3695824013" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.prometheus_405.554585010" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:35 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3560,6 +3561,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index d0b7d81400..62cabbb991 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.prometheus_469.3695824013" + signature = "rusEFI 2020.07.12.prometheus_469.554585010" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.prometheus_469.3695824013" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.prometheus_469.554585010" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:34 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3560,6 +3561,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e40268c91e..37e5f8e317 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.proteus_f4.2764334534" + signature = "rusEFI 2020.07.12.proteus_f4.1501815545" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.proteus_f4.2764334534" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.proteus_f4.1501815545" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:38 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3539,6 +3540,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 792b11a51c..145dfa1c0f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.11.proteus_f7.2764334534" + signature = "rusEFI 2020.07.12.proteus_f7.1501815545" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.11.proteus_f7.2764334534" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.12.proteus_f7.1501815545" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 Sat Jul 11 18:37:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:37 UTC 2020 pageSize = 20000 page = 1 @@ -113,7 +113,7 @@ page = 1 isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" - issue_294_unused = bits, U32, 76, [16:16], "false", "true" + useCicPidForIdle = bits, U32, 76, [16:16], "false", "true" useTLE8888_cranking_hack= bits, U32, 76, [17:17], "false", "true" useInstantRpmForIdle = bits, U32, 76, [18:18], "false", "true" absoluteFuelPressure = bits, U32, 76, [19:19], "false", "true" @@ -1197,6 +1197,7 @@ page = 1 etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode." isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position." cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed." + useCicPidForIdle = "Switch between Industrial and Cic PID implementation" absoluteFuelPressure = "If your fuel regulator does not have vacuum line" tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped." tpsErrorDetectionTooHigh = "TPS error detection: what throttle % is unrealistically high?\nAlso used for accelerator pedal error detection if so equiped." @@ -3539,6 +3540,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" + field = "use Cic Pid", useCicPidForIdle field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor field = "derivativeFilterLoss", idle_derivativeFilterLoss 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 efe9f8dd6a..f8035fb708 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 Sat Jul 11 02:21:57 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jul 12 21:35:28 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -830,7 +830,6 @@ public class Fields { public static final int issue_294_29_offset = 76; public static final int issue_294_30_offset = 76; public static final int issue_294_31_offset = 76; - public static final int issue_294_unused_offset = 76; public static final int isTunerStudioEnabled_offset = 1476; public static final int isVerboseAlternator_offset = 744; public static final int isVerboseAuxPid1_offset = 76; @@ -1285,7 +1284,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.11.all.4227575396"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.12.all.3557987126"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1353,6 +1352,7 @@ public class Fields { public static final int unusedsw_offset = 4020; public static final int unusedvref_offset = 4016; public static final int useAdvanceCorrectionsForCranking_offset = 1476; + public static final int useCicPidForIdle_offset = 76; public static final int useConstantDwellDuringCranking_offset = 1464; public static final int useETBforIdleControl_offset = 744; public static final int useFixedBaroCorrFromMap_offset = 1476; @@ -1430,7 +1430,7 @@ public class Fields { public static final Field ISDOUBLESOLENOIDIDLE = Field.create("ISDOUBLESOLENOIDIDLE", 76, FieldType.BIT, 13); public static final Field SHOWSDCARDWARNING = Field.create("SHOWSDCARDWARNING", 76, FieldType.BIT, 14); public static final Field CJ125ISURDIVIDED = Field.create("CJ125ISURDIVIDED", 76, FieldType.BIT, 15); - public static final Field ISSUE_294_UNUSED = Field.create("ISSUE_294_UNUSED", 76, FieldType.BIT, 16); + public static final Field USECICPIDFORIDLE = Field.create("USECICPIDFORIDLE", 76, FieldType.BIT, 16); public static final Field USETLE8888_CRANKING_HACK = Field.create("USETLE8888_CRANKING_HACK", 76, FieldType.BIT, 17); public static final Field USEINSTANTRPMFORIDLE = Field.create("USEINSTANTRPMFORIDLE", 76, FieldType.BIT, 18); public static final Field ABSOLUTEFUELPRESSURE = Field.create("ABSOLUTEFUELPRESSURE", 76, FieldType.BIT, 19); @@ -2428,7 +2428,7 @@ public class Fields { ISDOUBLESOLENOIDIDLE, SHOWSDCARDWARNING, CJ125ISURDIVIDED, - ISSUE_294_UNUSED, + USECICPIDFORIDLE, USETLE8888_CRANKING_HACK, USEINSTANTRPMFORIDLE, ABSOLUTEFUELPRESSURE, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index c752b17bcb..4bf4c326dc 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +