diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index ed2fad05ab..587e87891a 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Sep 17 10:01:50 EEST 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:07 UTC 2020 // see also gen_config_and_enums.bat @@ -972,6 +972,21 @@ case ZIL_130: } return NULL; } +const char *getEtb_function_e(etb_function_e value){ +switch(value) { +case ETB_IdleValve: + return "ETB_IdleValve"; +case ETB_None: + return "ETB_None"; +case ETB_Throttle1: + return "ETB_Throttle1"; +case ETB_Throttle2: + return "ETB_Throttle2"; +case ETB_Wastegate: + return "ETB_Wastegate"; + } + return NULL; +} const char *getGear_e(gear_e value){ switch(value) { case GEAR_1: diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h index 393dea0295..21146f7d48 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Sep 17 08:26:48 EEST 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:07 UTC 2020 // see also gen_config_and_enums.bat @@ -26,6 +26,7 @@ const char *getDisplay_mode_e(display_mode_e value); const char *getEgo_sensor_e(ego_sensor_e value); const char *getEngine_load_mode_e(engine_load_mode_e value); const char *getEngine_type_e(engine_type_e value); +const char *getEtb_function_e(etb_function_e value); const char *getGear_e(gear_e value); const char *getGppwm_channel_e(gppwm_channel_e value); const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value); diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 2e719f974d..8e43fce8ec 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 18:47:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:30 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1781,11 +1781,8 @@ struct engine_configuration_s { offset 976 bit 10 */ bool stftIgnoreErrorMagnitude : 1; /** - * Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve. - * Set the primary TPS to the cable-operated throttle's sensor - * Set the secondary TPS to the mini ETB's position sensor(s). offset 976 bit 11 */ - bool dcMotorIdleValve : 1; + bool unused976b11 : 1; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1; @@ -3727,4 +3724,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 18:47:03 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:30 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index baf215bad3..d8226b1ac6 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -319,7 +319,6 @@ #define cutSparkOnHardLimit_offset 1464 #define cylinderBore_offset 408 #define cylindersCount_offset 400 -#define dcMotorIdleValve_offset 976 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_2", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_AUX_PID_1", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_FSIO_SPECIAL", "DBG_43", "DBG_44" #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION_1_7", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "FSIO_EXPRESSION_8_14", "FSIO_SPECIAL", "Mode43", "Mode44" #define debugMapAveraging_offset 807 @@ -1172,7 +1171,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1025426525 +#define SIGNATURE_HASH 2525243351 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1484,7 +1483,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.28.hellen_cypress.1025426525" +#define TS_SIGNATURE "rusEFI 2020.09.28.hellen_cypress.2525243351" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1516,6 +1515,7 @@ #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 +#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 5a053b5916..aee117e9bf 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 07 14:17:13 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:07 UTC 2020 // see also gen_config_and_enums.bat @@ -768,6 +768,21 @@ case ZIL_130: } return NULL; } +const char *getEtb_function_e(etb_function_e value){ +switch(value) { +case ETB_IdleValve: + return "ETB_IdleValve"; +case ETB_None: + return "ETB_None"; +case ETB_Throttle1: + return "ETB_Throttle1"; +case ETB_Throttle2: + return "ETB_Throttle2"; +case ETB_Wastegate: + return "ETB_Wastegate"; + } + return NULL; +} const char *getGear_e(gear_e value){ switch(value) { case GEAR_1: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h index 34254161ae..21146f7d48 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 07 14:17:13 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:07 UTC 2020 // see also gen_config_and_enums.bat @@ -26,6 +26,7 @@ const char *getDisplay_mode_e(display_mode_e value); const char *getEgo_sensor_e(ego_sensor_e value); const char *getEngine_load_mode_e(engine_load_mode_e value); const char *getEngine_type_e(engine_type_e value); +const char *getEtb_function_e(etb_function_e value); const char *getGear_e(gear_e value); const char *getGppwm_channel_e(gppwm_channel_e value); const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value); 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 7227edd2c0..c7859ffdbe 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 Mon Sep 28 18:47:01 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:28 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1781,11 +1781,8 @@ struct engine_configuration_s { offset 976 bit 10 */ bool stftIgnoreErrorMagnitude : 1; /** - * Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve. - * Set the primary TPS to the cable-operated throttle's sensor - * Set the secondary TPS to the mini ETB's position sensor(s). offset 976 bit 11 */ - bool dcMotorIdleValve : 1; + bool unused976b11 : 1; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1; @@ -3727,4 +3724,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 Mon Sep 28 18:47:01 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:28 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 55b90d84b2..30e7bba39e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -319,7 +319,6 @@ #define cutSparkOnHardLimit_offset 1464 #define cylinderBore_offset 408 #define cylindersCount_offset 400 -#define dcMotorIdleValve_offset 976 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_2", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_AUX_PID_1", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_FSIO_SPECIAL", "DBG_43", "DBG_44" #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION_1_7", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "FSIO_EXPRESSION_8_14", "FSIO_SPECIAL", "Mode43", "Mode44" #define debugMapAveraging_offset 807 @@ -1172,7 +1171,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1812135591 +#define SIGNATURE_HASH 3348634925 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1484,7 +1483,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.28.kin.1812135591" +#define TS_SIGNATURE "rusEFI 2020.09.28.kin.3348634925" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1516,6 +1515,7 @@ #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 +#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index b594993c94..69207a021c 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 07 14:17:12 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:06 UTC 2020 // see also gen_config_and_enums.bat @@ -906,6 +906,21 @@ case ZIL_130: } return NULL; } +const char *getEtb_function_e(etb_function_e value){ +switch(value) { +case ETB_IdleValve: + return "ETB_IdleValve"; +case ETB_None: + return "ETB_None"; +case ETB_Throttle1: + return "ETB_Throttle1"; +case ETB_Throttle2: + return "ETB_Throttle2"; +case ETB_Wastegate: + return "ETB_Wastegate"; + } + return NULL; +} const char *getGear_e(gear_e value){ switch(value) { case GEAR_1: diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index b1b0348596..40e3be8e3a 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 07 14:17:12 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Mon Sep 28 20:34:06 UTC 2020 // see also gen_config_and_enums.bat @@ -26,6 +26,7 @@ const char *getDisplay_mode_e(display_mode_e value); const char *getEgo_sensor_e(ego_sensor_e value); const char *getEngine_load_mode_e(engine_load_mode_e value); const char *getEngine_type_e(engine_type_e value); +const char *getEtb_function_e(etb_function_e value); const char *getGear_e(gear_e value); const char *getGppwm_channel_e(gppwm_channel_e value); const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index db8a89e7cc..9d4e6bd328 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 Mon Sep 28 18:46:40 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1781,11 +1781,8 @@ struct engine_configuration_s { offset 976 bit 10 */ bool stftIgnoreErrorMagnitude : 1; /** - * Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve. - * Set the primary TPS to the cable-operated throttle's sensor - * Set the secondary TPS to the mini ETB's position sensor(s). offset 976 bit 11 */ - bool dcMotorIdleValve : 1; + bool unused976b11 : 1; /** offset 976 bit 12 */ bool enableSoftwareKnock : 1; @@ -3727,4 +3724,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 Mon Sep 28 18:46:40 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 40a838b24d..c8c17c1b46 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 Mon Sep 28 18:46:40 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 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 a2f5162ef5..986ece7fd4 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 Mon Sep 28 18:46:40 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 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 0b5833dca8..5fffd47591 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 Mon Sep 28 18:46:40 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 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 20a3179158..e9e2f196bc 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 Mon Sep 28 18:46:40 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 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 c836193ecd..bdffb90a76 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -319,7 +319,6 @@ #define cutSparkOnHardLimit_offset 1464 #define cylinderBore_offset 408 #define cylindersCount_offset 400 -#define dcMotorIdleValve_offset 976 #define debug_mode_e_auto_enum "DBG_ALTERNATOR_PID", "DBG_TPS_ACCEL", "DBG_2", "DBG_IDLE_CONTROL", "DBG_EL_ACCEL", "DBG_TRIGGER_COUNTERS", "DBG_FSIO_ADC", "DBG_AUX_PID_1", "DBG_VVT", "DBG_CRANKING_DETAILS", "DBG_IGNITION_TIMING", "DBG_FUEL_PID_CORRECTION", "DBG_VEHICLE_SPEED_SENSOR", "DBG_SD_CARD", "DBG_SR5_PROTOCOL", "DBG_KNOCK", "DBG_16", "DBG_ELECTRONIC_THROTTLE_PID", "DBG_EXECUTOR", "DBG_BENCH_TEST", "DBG_AUX_VALVES", "DBG_ANALOG_INPUTS", "DBG_INSTANT_RPM", "DBG_FSIO_EXPRESSION_1_7", "DBG_STATUS", "DBG_CJ125", "DBG_CAN", "DBG_MAP", "DBG_METRICS", "DBG_ELECTRONIC_THROTTLE_EXTRA", "DBG_ION", "DBG_TLE8888", "DBG_ANALOG_INPUTS2", "DBG_DWELL_METRIC", "DBG_34", "DBG_ETB_LOGIC", "DBG_BOOST", "DBG_START_STOP", "DBG_LAUNCH", "DBG_ETB_AUTOTUNE", "DBG_COMPOSITE_LOG", "DBG_FSIO_EXPRESSION_8_14", "DBG_FSIO_SPECIAL", "DBG_43", "DBG_44" #define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION_1_7", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "FSIO_COMPOSITE_LOG", "FSIO_EXPRESSION_8_14", "FSIO_SPECIAL", "Mode43", "Mode44" #define debugMapAveraging_offset 807 @@ -1172,7 +1171,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 2279195939 +#define SIGNATURE_HASH 742598313 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define solenoidPadding_offset 1198 @@ -1484,7 +1483,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.28.all.2279195939" +#define TS_SIGNATURE "rusEFI 2020.09.28.all.742598313" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1516,6 +1515,7 @@ #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 +#define unused976b11_offset 976 #define unused_1484_bit_24_offset 1476 #define unused_1484_bit_25_offset 1476 #define unused_1484_bit_26_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f8eb2e34b6..f957547c3c 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 2279195939 -#define TS_SIGNATURE "rusEFI 2020.09.28.all.2279195939" +#define SIGNATURE_HASH 742598313 +#define TS_SIGNATURE "rusEFI 2020.09.28.all.742598313" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b21b49c3c6..db5934e897 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 541238040 -#define TS_SIGNATURE "rusEFI 2020.09.28.frankenso_na6.541238040" +#define SIGNATURE_HASH 2346205330 +#define TS_SIGNATURE "rusEFI 2020.09.28.frankenso_na6.2346205330" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 0ea18e57fc..b3d85db2f3 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1025426525 -#define TS_SIGNATURE "rusEFI 2020.09.28.hellen_cypress.1025426525" +#define SIGNATURE_HASH 2525243351 +#define TS_SIGNATURE "rusEFI 2020.09.28.hellen_cypress.2525243351" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 25dc16b1be..5965c61ca5 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1812135591 -#define TS_SIGNATURE "rusEFI 2020.09.28.kin.1812135591" +#define SIGNATURE_HASH 3348634925 +#define TS_SIGNATURE "rusEFI 2020.09.28.kin.3348634925" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 9807e79486..5c6219c479 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1887582900 -#define TS_SIGNATURE "rusEFI 2020.09.28.mre_f4.1887582900" +#define SIGNATURE_HASH 3675838782 +#define TS_SIGNATURE "rusEFI 2020.09.28.mre_f4.3675838782" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 00e8cef802..92ca79dcaf 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 1887582900 -#define TS_SIGNATURE "rusEFI 2020.09.28.mre_f7.1887582900" +#define SIGNATURE_HASH 3675838782 +#define TS_SIGNATURE "rusEFI 2020.09.28.mre_f7.3675838782" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e2de0dcfd7..74b19545ea 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 854994000 -#define TS_SIGNATURE "rusEFI 2020.09.28.prometheus_405.854994000" +#define SIGNATURE_HASH 2574045146 +#define TS_SIGNATURE "rusEFI 2020.09.28.prometheus_405.2574045146" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a6880271d4..cc29009521 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 854994000 -#define TS_SIGNATURE "rusEFI 2020.09.28.prometheus_469.854994000" +#define SIGNATURE_HASH 2574045146 +#define TS_SIGNATURE "rusEFI 2020.09.28.prometheus_469.2574045146" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 3efcb4ac60..5d9d4d59e9 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 2510301958 -#define TS_SIGNATURE "rusEFI 2020.09.28.proteus_f4.2510301958" +#define SIGNATURE_HASH 3088779436 +#define TS_SIGNATURE "rusEFI 2020.09.28.proteus_f4.3088779436" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 5eebdcfe75..2149fbff49 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.09.28 -#define SIGNATURE_HASH 2510301958 -#define TS_SIGNATURE "rusEFI 2020.09.28.proteus_f7.2510301958" +#define SIGNATURE_HASH 3088779436 +#define TS_SIGNATURE "rusEFI 2020.09.28.proteus_f7.3088779436" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d7c7a52af8..4a94435fab 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 6e5d9fa32a..dc7983da71 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.09.28.all.2279195939" + signature = "rusEFI 2020.09.28.all.742598313" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.all.2279195939" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.all.742598313" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:40 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4383,12 +4382,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4404,7 +4402,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index dd42dbb686..36a49e7619 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.09.28.frankenso_na6.541238040" + signature = "rusEFI 2020.09.28.frankenso_na6.2346205330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.frankenso_na6.541238040" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.frankenso_na6.2346205330" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:20 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4383,12 +4382,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4404,7 +4402,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 00d8d6803f..3ebf1dc6be 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.28.hellen_cypress.1025426525" + signature = "rusEFI 2020.09.28.hellen_cypress.2525243351" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.hellen_cypress.1025426525" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.hellen_cypress.2525243351" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 18:47:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:30 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4383,12 +4382,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4404,7 +4402,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 2895341354..a012b6bb0d 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.09.28.kin.1812135591" + signature = "rusEFI 2020.09.28.kin.3348634925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.kin.1812135591" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.kin.3348634925" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:47:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 28 20:34:28 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4384,12 +4383,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4405,7 +4403,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 12ddba1453..3c9a47a3a3 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.09.28.mre_f4.1887582900" + signature = "rusEFI 2020.09.28.mre_f4.3675838782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.mre_f4.1887582900" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.mre_f4.3675838782" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:18 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4358,12 +4357,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4379,7 +4377,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e005137308..4b56eb3d23 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.09.28.mre_f7.1887582900" + signature = "rusEFI 2020.09.28.mre_f7.3675838782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.mre_f7.1887582900" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.mre_f7.3675838782" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:42 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:11 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4358,12 +4357,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4379,7 +4377,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index fc98e2c285..b5370d1b2a 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.09.28.prometheus_405.854994000" + signature = "rusEFI 2020.09.28.prometheus_405.2574045146" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.prometheus_405.854994000" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.prometheus_405.2574045146" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:23 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4379,12 +4378,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4400,7 +4398,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 78a9687136..5537eb4703 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.09.28.prometheus_469.854994000" + signature = "rusEFI 2020.09.28.prometheus_469.2574045146" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.prometheus_469.854994000" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.prometheus_469.2574045146" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:21 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4379,12 +4378,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4400,7 +4398,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b34206ad13..1483fb4562 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.09.28.proteus_f4.2510301958" + signature = "rusEFI 2020.09.28.proteus_f4.3088779436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.proteus_f4.2510301958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.proteus_f4.3088779436" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:47:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:27 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4348,12 +4347,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4369,7 +4367,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7e617dc3c8..30b1ece4da 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.09.28.proteus_f7.2510301958" + signature = "rusEFI 2020.09.28.proteus_f7.3088779436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.28.proteus_f7.2510301958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.28.proteus_f7.3088779436" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Mon Sep 28 18:46:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:25 UTC 2020 pageSize = 20000 page = 1 @@ -542,7 +542,7 @@ page = 1 enableInnovateLC2 = bits, U32, 976, [8:8], "false", "true" showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" - dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" + unused976b11 = bits, U32, 976, [11:11], "false", "true" enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" @@ -1292,7 +1292,6 @@ page = 1 sensorChartMode = "rusEfi console Sensor Sniffer mode" useHbridges = "If enabled we use two H-bridges to drive stepper idle air valve" stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;" - dcMotorIdleValve = "Used on some German vehicles around late 90s: cable-operated throttle and DC motor idle air valve.\nSet the primary TPS to the cable-operated throttle's sensor\nSet the secondary TPS to the mini ETB's position sensor(s)." consumeObdSensors = "This property is useful if using rusEFI as TCM or BCM only\nenable consumeObdSensors" boostControlPin = "Wastegate control Solenoid" launchSpeedTreshold = "Disabled above this speed" @@ -4348,12 +4347,11 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogLeft field = "https://rusefi.com/s/etb" - field = "Late 90s German DC Motor idle", dcMotorIdleValve, { throttlePedalPositionAdcChannel == 0 } field = "Detailed status in console", isVerboseETB field = "Disable ETB Motor", pauseEtbControl ; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility ; criteria for the same panel when used in multiple places - panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) || dcMotorIdleValve } + panel = hbridgeHardware, { throttlePedalPositionAdcChannel != 0 || (useStepperIdle && useHbridges) } dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" @@ -4369,7 +4367,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = etbDialogRight panel = etbIdleDialog, { throttlePedalPositionAdcChannel != 0 } - panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) || dcMotorIdleValve } + panel = etbPidDialog, { (throttlePedalPositionAdcChannel != 0) } panel = etbAutotune ; Neutral position handling not yet implemented! 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 7d816c7e87..88bfb1804e 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 Mon Sep 28 18:46:40 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 28 20:34:08 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -309,7 +309,6 @@ public class Fields { public static final int cutSparkOnHardLimit_offset = 1464; public static final int cylinderBore_offset = 408; public static final int cylindersCount_offset = 400; - public static final int dcMotorIdleValve_offset = 976; public static final int debugMapAveraging_offset = 807; public static final int debugMode_offset = 2092; public static final int debugTriggerSync_offset = 676; @@ -1127,6 +1126,7 @@ 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 = 742598313; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int solenoidPadding_offset = 1198; @@ -1388,7 +1388,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.09.28.all.2279195939"; + public static final String TS_SIGNATURE = "rusEFI 2020.09.28.all.742598313"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; @@ -1417,6 +1417,7 @@ public class Fields { public static final int unused3288_offset = 3288; public static final int unused6312_offset = 6312; public static final int unused744b25_offset = 744; + public static final int unused976b11_offset = 976; public static final int unused_1484_bit_24_offset = 1476; public static final int unused_1484_bit_25_offset = 1476; public static final int unused_1484_bit_26_offset = 1476; @@ -1995,7 +1996,7 @@ public class Fields { public static final Field ENABLEINNOVATELC2 = Field.create("ENABLEINNOVATELC2", 976, FieldType.BIT, 8); public static final Field SHOWHUMANREADABLEWARNING = Field.create("SHOWHUMANREADABLEWARNING", 976, FieldType.BIT, 9); public static final Field STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 976, FieldType.BIT, 10); - public static final Field DCMOTORIDLEVALVE = Field.create("DCMOTORIDLEVALVE", 976, FieldType.BIT, 11); + public static final Field UNUSED976B11 = Field.create("UNUSED976B11", 976, FieldType.BIT, 11); public static final Field ENABLESOFTWAREKNOCK = Field.create("ENABLESOFTWAREKNOCK", 976, FieldType.BIT, 12); public static final Field VERBOSEVVTDECODING = Field.create("VERBOSEVVTDECODING", 976, FieldType.BIT, 13); public static final Field INVERTCAMVVTSIGNAL = Field.create("INVERTCAMVVTSIGNAL", 976, FieldType.BIT, 14); @@ -3033,7 +3034,7 @@ public class Fields { ENABLEINNOVATELC2, SHOWHUMANREADABLEWARNING, STFTIGNOREERRORMAGNITUDE, - DCMOTORIDLEVALVE, + UNUSED976B11, ENABLESOFTWAREKNOCK, VERBOSEVVTDECODING, INVERTCAMVVTSIGNAL, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index efac7f75a5..3813cde5c1 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +