From 8001c881512ba921daf034516ac889a43e974fc2 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sat, 23 Apr 2022 11:41:19 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 16 ++- .../controllers/algo/rusefi_generated.h | 11 +- ...ngine_configuration_generated_structures.h | 16 ++- .../controllers/algo/rusefi_generated.h | 11 +- ...ngine_configuration_generated_structures.h | 16 ++- .../controllers/algo/rusefi_generated.h | 11 +- .../console/binary/generated/data_logs.ini | 2 + firmware/console/binary/generated/gauges.ini | 58 ++++---- .../binary/generated/output_channels.ini | 74 +++++----- .../console/binary/generated/sensors.java | 26 ++-- .../binary/output_channels_generated.h | 69 +++++---- ...ngine_configuration_generated_structures.h | 16 ++- .../controllers/generated/rusefi_generated.h | 11 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../generated/signature_hellen_cypress.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 4 + firmware/tunerstudio/generated/rusefi.ini | 103 +++++++------ .../generated/rusefi_alphax-2chan.ini | 103 +++++++------ .../generated/rusefi_alphax-4chan.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_atlas.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_core8.ini | 103 +++++++------ .../generated/rusefi_f429-discovery.ini | 103 +++++++------ .../generated/rusefi_frankenso_na6.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_harley81.ini | 103 +++++++------ .../generated/rusefi_hellen-nb1.ini | 103 +++++++------ .../generated/rusefi_hellen121nissan.ini | 103 +++++++------ .../generated/rusefi_hellen121vag.ini | 103 +++++++------ .../generated/rusefi_hellen128mercedes.ini | 103 +++++++------ .../generated/rusefi_hellen154hyundai.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_hellen72.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_hellen81.ini | 103 +++++++------ .../generated/rusefi_hellen88bmw.ini | 103 +++++++------ .../generated/rusefi_hellenNA6.ini | 103 +++++++------ .../generated/rusefi_hellenNA8_96.ini | 103 +++++++------ .../generated/rusefi_hellen_cypress.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_kinetis.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_mre_f7.ini | 103 +++++++------ .../generated/rusefi_prometheus_405.ini | 103 +++++++------ .../generated/rusefi_prometheus_469.ini | 103 +++++++------ .../generated/rusefi_proteus_f4.ini | 103 +++++++------ .../generated/rusefi_proteus_f7.ini | 103 +++++++------ .../generated/rusefi_proteus_h7.ini | 103 +++++++------ .../generated/rusefi_subaru_eg33_f7.ini | 103 +++++++------ .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 103 +++++++------ .../com/rusefi/config/generated/Fields.java | 16 ++- .../rusefi/config/generated/TsOutputs.java | 135 +++++++++--------- java_console/rusefi.xml | 4 +- 75 files changed, 2018 insertions(+), 1581 deletions(-) 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 1e50cdf0a5..b12592cd66 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 Thu Apr 21 13:12:24 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:13 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4678,8 +4678,18 @@ struct persistent_config_s { * offset 21140 */ uint8_t tcu_tccUnlockSpeed[8]; + /** + KPH + * offset 21148 + */ + uint8_t tcu_32SpeedBins[8]; + /** + % + * offset 21156 + */ + uint8_t tcu_32Vals[8]; }; -static_assert(sizeof(persistent_config_s) == 21148); +static_assert(sizeof(persistent_config_s) == 21164); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:24 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:13 UTC 2022 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 440fe51d9a..499b12c239 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 @@ -1157,6 +1157,7 @@ #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" +#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1804,7 +1805,7 @@ #define pedalToTpsRpmBins_offset 5492 #define pedalToTpsTable_offset 5420 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 21148 +#define persistent_config_s_size 21164 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1953,7 +1954,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1964759764 +#define SIGNATURE_HASH 2326187551 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2087,6 +2088,8 @@ #define tcu_32_solenoid_freq_offset 4804 #define tcu_32_solenoid_pin_mode_offset 4803 #define tcu_32_solenoid_pin_offset 4802 +#define tcu_32SpeedBins_offset 21148 +#define tcu_32Vals_offset 21156 #define TCU_GEAR_COUNT 10 #define tcu_pc_solenoid_freq_offset 4800 #define tcu_pc_solenoid_pin_mode_offset 4799 @@ -2182,7 +2185,7 @@ #define torqueLoadBins_offset 4738 #define torqueRpmBins_offset 4726 #define torqueTable_offset 4690 -#define TOTAL_CONFIG_SIZE 21148 +#define TOTAL_CONFIG_SIZE 21164 #define totalGearsCount_offset 1698 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2533,7 +2536,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.1964759764" +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.2326187551" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 e8553337b0..f781b78fa0 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 Thu Apr 21 13:12:23 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:12 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4672,8 +4672,18 @@ struct persistent_config_s { * offset 21112 */ uint8_t tcu_tccUnlockSpeed[8]; + /** + KPH + * offset 21120 + */ + uint8_t tcu_32SpeedBins[8]; + /** + % + * offset 21128 + */ + uint8_t tcu_32Vals[8]; }; -static_assert(sizeof(persistent_config_s) == 21120); +static_assert(sizeof(persistent_config_s) == 21136); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:23 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:12 UTC 2022 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 0ab8c7c893..8b7f194456 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1142,6 +1142,7 @@ #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" +#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1789,7 +1790,7 @@ #define pedalToTpsRpmBins_offset 5464 #define pedalToTpsTable_offset 5392 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 21120 +#define persistent_config_s_size 21136 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1938,7 +1939,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2327713320 +#define SIGNATURE_HASH 1963131619 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2072,6 +2073,8 @@ #define tcu_32_solenoid_freq_offset 4776 #define tcu_32_solenoid_pin_mode_offset 4775 #define tcu_32_solenoid_pin_offset 4774 +#define tcu_32SpeedBins_offset 21120 +#define tcu_32Vals_offset 21128 #define TCU_GEAR_COUNT 10 #define tcu_pc_solenoid_freq_offset 4772 #define tcu_pc_solenoid_pin_mode_offset 4771 @@ -2167,7 +2170,7 @@ #define torqueLoadBins_offset 4710 #define torqueRpmBins_offset 4698 #define torqueTable_offset 4662 -#define TOTAL_CONFIG_SIZE 21120 +#define TOTAL_CONFIG_SIZE 21136 #define totalGearsCount_offset 1698 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2518,7 +2521,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.kin.2327713320" +#define TS_SIGNATURE "rusEFI 2022.04.23.kin.1963131619" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 904dab8bd9..b309820611 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:14 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4678,8 +4678,18 @@ struct persistent_config_s { * offset 21140 */ uint8_t tcu_tccUnlockSpeed[8]; + /** + KPH + * offset 21148 + */ + uint8_t tcu_32SpeedBins[8]; + /** + % + * offset 21156 + */ + uint8_t tcu_32Vals[8]; }; -static_assert(sizeof(persistent_config_s) == 21148); +static_assert(sizeof(persistent_config_s) == 21164); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:14 UTC 2022 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index c254df4078..062568bf07 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1135,6 +1135,7 @@ #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" +#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1782,7 +1783,7 @@ #define pedalToTpsRpmBins_offset 5492 #define pedalToTpsTable_offset 5420 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 21148 +#define persistent_config_s_size 21164 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1932,7 +1933,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 777608425 +#define SIGNATURE_HASH 3521398818 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2066,6 +2067,8 @@ #define tcu_32_solenoid_freq_offset 4804 #define tcu_32_solenoid_pin_mode_offset 4803 #define tcu_32_solenoid_pin_offset 4802 +#define tcu_32SpeedBins_offset 21148 +#define tcu_32Vals_offset 21156 #define TCU_GEAR_COUNT 10 #define tcu_pc_solenoid_freq_offset 4800 #define tcu_pc_solenoid_pin_mode_offset 4799 @@ -2161,7 +2164,7 @@ #define torqueLoadBins_offset 4738 #define torqueRpmBins_offset 4726 #define torqueTable_offset 4690 -#define TOTAL_CONFIG_SIZE 21148 +#define TOTAL_CONFIG_SIZE 21164 #define totalGearsCount_offset 1698 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2512,7 +2515,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.777608425" +#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.3521398818" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d0ed3f29bd..0c069c05f9 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -213,6 +213,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 5038f7d127..b25bf405eb 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -244,6 +244,9 @@ unusedBit_182_31Gauge = unusedBit_182_31,"unusedBit_182_31", "", -1.0,-1.0, -1.0 luaInvocationCounterGauge = luaInvocationCounter,"luaInvocationCounter", "count", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 luaLastCycleDurationGauge = luaLastCycleDuration,"luaLastCycleDuration", "nt", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 testBenchIterGauge = testBenchIter,"testBenchIter", "count", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedWatGauge = unusedWat,"unusedWat", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +tcRatioGauge = tcRatio,"Torque Converter Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +lastShiftTimeGauge = lastShiftTime,"S", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 unusedInTheMiddle1Gauge = unusedInTheMiddle1,"unusedInTheMiddle 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedInTheMiddle2Gauge = unusedInTheMiddle2,"unusedInTheMiddle 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedInTheMiddle3Gauge = unusedInTheMiddle3,"unusedInTheMiddle 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -252,13 +255,6 @@ unusedInTheMiddle5Gauge = unusedInTheMiddle5,"unusedInTheMiddle 5", "", 0.0,0.0, unusedInTheMiddle6Gauge = unusedInTheMiddle6,"unusedInTheMiddle 6", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedInTheMiddle7Gauge = unusedInTheMiddle7,"unusedInTheMiddle 7", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedInTheMiddle8Gauge = unusedInTheMiddle8,"unusedInTheMiddle 8", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle9Gauge = unusedInTheMiddle9,"unusedInTheMiddle 9", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle10Gauge = unusedInTheMiddle10,"unusedInTheMiddle 10", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle11Gauge = unusedInTheMiddle11,"unusedInTheMiddle 11", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle12Gauge = unusedInTheMiddle12,"unusedInTheMiddle 12", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle13Gauge = unusedInTheMiddle13,"unusedInTheMiddle 13", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle14Gauge = unusedInTheMiddle14,"unusedInTheMiddle 14", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedInTheMiddle15Gauge = unusedInTheMiddle15,"unusedInTheMiddle 15", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 auxLinear1Gauge = auxLinear1,"Aux Linear 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 auxLinear2Gauge = auxLinear2,"Aux Linear 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 launchSpeedConditionGauge = launchSpeedCondition,"launchSpeedCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 @@ -269,30 +265,30 @@ launchIsLaunchConditionGauge = launchIsLaunchCondition,"launchIsLaunchCondition" launchCombinedConditionsGauge = launchCombinedConditions,"launchCombinedConditions", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 dfcoActiveGauge = dfcoActive,"dfcoActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 tpsAccelActiveGauge = tpsAccelActive,"tpsAccelActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_8Gauge = unusedBit_226_8,"unusedBit_226_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_9Gauge = unusedBit_226_9,"unusedBit_226_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_10Gauge = unusedBit_226_10,"unusedBit_226_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_11Gauge = unusedBit_226_11,"unusedBit_226_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_12Gauge = unusedBit_226_12,"unusedBit_226_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_13Gauge = unusedBit_226_13,"unusedBit_226_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_14Gauge = unusedBit_226_14,"unusedBit_226_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_15Gauge = unusedBit_226_15,"unusedBit_226_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_16Gauge = unusedBit_226_16,"unusedBit_226_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_17Gauge = unusedBit_226_17,"unusedBit_226_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_18Gauge = unusedBit_226_18,"unusedBit_226_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_19Gauge = unusedBit_226_19,"unusedBit_226_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_20Gauge = unusedBit_226_20,"unusedBit_226_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_21Gauge = unusedBit_226_21,"unusedBit_226_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_22Gauge = unusedBit_226_22,"unusedBit_226_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_23Gauge = unusedBit_226_23,"unusedBit_226_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_24Gauge = unusedBit_226_24,"unusedBit_226_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_25Gauge = unusedBit_226_25,"unusedBit_226_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_26Gauge = unusedBit_226_26,"unusedBit_226_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_27Gauge = unusedBit_226_27,"unusedBit_226_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_28Gauge = unusedBit_226_28,"unusedBit_226_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_29Gauge = unusedBit_226_29,"unusedBit_226_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_30Gauge = unusedBit_226_30,"unusedBit_226_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_226_31Gauge = unusedBit_226_31,"unusedBit_226_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_8Gauge = unusedBit_229_8,"unusedBit_229_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_9Gauge = unusedBit_229_9,"unusedBit_229_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_10Gauge = unusedBit_229_10,"unusedBit_229_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_11Gauge = unusedBit_229_11,"unusedBit_229_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_12Gauge = unusedBit_229_12,"unusedBit_229_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_13Gauge = unusedBit_229_13,"unusedBit_229_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_14Gauge = unusedBit_229_14,"unusedBit_229_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_15Gauge = unusedBit_229_15,"unusedBit_229_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_16Gauge = unusedBit_229_16,"unusedBit_229_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_17Gauge = unusedBit_229_17,"unusedBit_229_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_18Gauge = unusedBit_229_18,"unusedBit_229_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_19Gauge = unusedBit_229_19,"unusedBit_229_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_20Gauge = unusedBit_229_20,"unusedBit_229_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_21Gauge = unusedBit_229_21,"unusedBit_229_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_22Gauge = unusedBit_229_22,"unusedBit_229_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_23Gauge = unusedBit_229_23,"unusedBit_229_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_24Gauge = unusedBit_229_24,"unusedBit_229_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_25Gauge = unusedBit_229_25,"unusedBit_229_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_26Gauge = unusedBit_229_26,"unusedBit_229_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_27Gauge = unusedBit_229_27,"unusedBit_229_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_28Gauge = unusedBit_229_28,"unusedBit_229_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_29Gauge = unusedBit_229_29,"unusedBit_229_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_30Gauge = unusedBit_229_30,"unusedBit_229_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_229_31Gauge = unusedBit_229_31,"unusedBit_229_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 boostControllerOutputGauge = boostControllerOutput,"Boost Output", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index bdb11bb3be..881672fa67 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -244,21 +244,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -269,30 +265,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 98520f43fe..8216f3b932 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -180,21 +180,17 @@ calibrationValue2("calibrationValue2", SensorCategory.SENSOR_INPUTS, FieldType.I luaInvocationCounter("luaInvocationCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 380, 1.0, 0.0, 0.0, "count"), luaLastCycleDuration("luaLastCycleDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT, 384, 1.0, 0.0, 0.0, "nt"), testBenchIter("testBenchIter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 388, 1.0, 0.0, 0.0, "count"), -unusedInTheMiddle1("unusedInTheMiddle 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 389, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle2("unusedInTheMiddle 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 390, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle3("unusedInTheMiddle 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 391, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle4("unusedInTheMiddle 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 392, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle5("unusedInTheMiddle 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 393, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle6("unusedInTheMiddle 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 394, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle7("unusedInTheMiddle 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 395, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle8("unusedInTheMiddle 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 396, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle9("unusedInTheMiddle 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 397, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle10("unusedInTheMiddle 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 398, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle11("unusedInTheMiddle 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 399, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle12("unusedInTheMiddle 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 400, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle13("unusedInTheMiddle 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 401, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle14("unusedInTheMiddle 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 402, 1.0, 0.0, 0.0, ""), -unusedInTheMiddle15("unusedInTheMiddle 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 403, 1.0, 0.0, 0.0, ""), +unusedWat("unusedWat", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 389, 1.0, -1.0, -1.0, ""), +tcRatio("Torque Converter Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 390, 0.01, 0.0, 0.0, "value"), +lastShiftTime("S", SensorCategory.SENSOR_INPUTS, FieldType.INT, 392, 1.0, -1.0, -1.0, ""), +unusedInTheMiddle1("unusedInTheMiddle 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 396, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle2("unusedInTheMiddle 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 397, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle3("unusedInTheMiddle 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 398, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle4("unusedInTheMiddle 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 399, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle5("unusedInTheMiddle 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 400, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle6("unusedInTheMiddle 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 401, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle7("unusedInTheMiddle 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 402, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle8("unusedInTheMiddle 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 403, 1.0, 0.0, 0.0, ""), auxLinear1("Aux Linear 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 404, 0.01, 0.0, 0.0, ""), auxLinear2("Aux Linear 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 406, 0.01, 0.0, 0.0, ""), TEMPLOG_MAP_AT_CYCLE_COUNT("TEMPLOG_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 412, 1.0, -10000.0, 10000.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index e784151ffe..9e5cb39ac9 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 23 11:38:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1063,7 +1063,22 @@ struct output_channels_s { /** * offset 389 */ - uint8_t unusedInTheMiddle[15]; + uint8_t unusedWat = (uint8_t)0; + /** + * @@GAUGE_NAME_TC_RATIO@@ + value + * offset 390 + */ + scaled_channel tcRatio = (uint16_t)0; + /** + * "S" + * offset 392 + */ + float lastShiftTime = (float)0; + /** + * offset 396 + */ + uint8_t unusedInTheMiddle[8]; /** * @@GAUGE_NAME_AUX_LINEAR_1@@ * offset 404 @@ -1100,76 +1115,76 @@ struct output_channels_s { bool tpsAccelActive : 1 {}; /** offset 408 bit 8 */ - bool unusedBit_226_8 : 1 {}; + bool unusedBit_229_8 : 1 {}; /** offset 408 bit 9 */ - bool unusedBit_226_9 : 1 {}; + bool unusedBit_229_9 : 1 {}; /** offset 408 bit 10 */ - bool unusedBit_226_10 : 1 {}; + bool unusedBit_229_10 : 1 {}; /** offset 408 bit 11 */ - bool unusedBit_226_11 : 1 {}; + bool unusedBit_229_11 : 1 {}; /** offset 408 bit 12 */ - bool unusedBit_226_12 : 1 {}; + bool unusedBit_229_12 : 1 {}; /** offset 408 bit 13 */ - bool unusedBit_226_13 : 1 {}; + bool unusedBit_229_13 : 1 {}; /** offset 408 bit 14 */ - bool unusedBit_226_14 : 1 {}; + bool unusedBit_229_14 : 1 {}; /** offset 408 bit 15 */ - bool unusedBit_226_15 : 1 {}; + bool unusedBit_229_15 : 1 {}; /** offset 408 bit 16 */ - bool unusedBit_226_16 : 1 {}; + bool unusedBit_229_16 : 1 {}; /** offset 408 bit 17 */ - bool unusedBit_226_17 : 1 {}; + bool unusedBit_229_17 : 1 {}; /** offset 408 bit 18 */ - bool unusedBit_226_18 : 1 {}; + bool unusedBit_229_18 : 1 {}; /** offset 408 bit 19 */ - bool unusedBit_226_19 : 1 {}; + bool unusedBit_229_19 : 1 {}; /** offset 408 bit 20 */ - bool unusedBit_226_20 : 1 {}; + bool unusedBit_229_20 : 1 {}; /** offset 408 bit 21 */ - bool unusedBit_226_21 : 1 {}; + bool unusedBit_229_21 : 1 {}; /** offset 408 bit 22 */ - bool unusedBit_226_22 : 1 {}; + bool unusedBit_229_22 : 1 {}; /** offset 408 bit 23 */ - bool unusedBit_226_23 : 1 {}; + bool unusedBit_229_23 : 1 {}; /** offset 408 bit 24 */ - bool unusedBit_226_24 : 1 {}; + bool unusedBit_229_24 : 1 {}; /** offset 408 bit 25 */ - bool unusedBit_226_25 : 1 {}; + bool unusedBit_229_25 : 1 {}; /** offset 408 bit 26 */ - bool unusedBit_226_26 : 1 {}; + bool unusedBit_229_26 : 1 {}; /** offset 408 bit 27 */ - bool unusedBit_226_27 : 1 {}; + bool unusedBit_229_27 : 1 {}; /** offset 408 bit 28 */ - bool unusedBit_226_28 : 1 {}; + bool unusedBit_229_28 : 1 {}; /** offset 408 bit 29 */ - bool unusedBit_226_29 : 1 {}; + bool unusedBit_229_29 : 1 {}; /** offset 408 bit 30 */ - bool unusedBit_226_30 : 1 {}; + bool unusedBit_229_30 : 1 {}; /** offset 408 bit 31 */ - bool unusedBit_226_31 : 1 {}; + bool unusedBit_229_31 : 1 {}; /** * offset 412 */ @@ -1388,4 +1403,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 640); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 23 11:38:35 UTC 2022 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 6db82e3924..34f416bd23 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 Thu Apr 21 13:12:27 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:16 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -4678,8 +4678,18 @@ struct persistent_config_s { * offset 21140 */ uint8_t tcu_tccUnlockSpeed[8]; + /** + KPH + * offset 21148 + */ + uint8_t tcu_32SpeedBins[8]; + /** + % + * offset 21156 + */ + uint8_t tcu_32Vals[8]; }; -static_assert(sizeof(persistent_config_s) == 21148); +static_assert(sizeof(persistent_config_s) == 21164); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:27 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:16 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d3426d8266..5dd7f09976 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1157,6 +1157,7 @@ #define GAUGE_NAME_RPM "RPM" #define GAUGE_NAME_TARGET_AFR "fuel: target AFR" #define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" +#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio" #define GAUGE_NAME_TCHARGE "fuel: SD tCharge" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" #define GAUGE_NAME_TIME "Time" @@ -1804,7 +1805,7 @@ #define pedalToTpsRpmBins_offset 5492 #define pedalToTpsTable_offset 5420 #define PERCENT_TRIM_BYTE_PACKING_DIV 0.02 -#define persistent_config_s_size 21148 +#define persistent_config_s_size 21164 #define pid_s_size 20 #define PidAutoTune_AutoTunerState_AUTOTUNER_OFF 0 #define PidAutoTune_AutoTunerState_CONVERGED 16 @@ -1953,7 +1954,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 808948958 +#define SIGNATURE_HASH 3481960469 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2087,6 +2088,8 @@ #define tcu_32_solenoid_freq_offset 4804 #define tcu_32_solenoid_pin_mode_offset 4803 #define tcu_32_solenoid_pin_offset 4802 +#define tcu_32SpeedBins_offset 21148 +#define tcu_32Vals_offset 21156 #define TCU_GEAR_COUNT 10 #define tcu_pc_solenoid_freq_offset 4800 #define tcu_pc_solenoid_pin_mode_offset 4799 @@ -2182,7 +2185,7 @@ #define torqueLoadBins_offset 4738 #define torqueRpmBins_offset 4726 #define torqueTable_offset 4690 -#define TOTAL_CONFIG_SIZE 21148 +#define TOTAL_CONFIG_SIZE 21164 #define totalGearsCount_offset 1698 #define tps1_1AdcChannel_offset 520 #define tps1_2AdcChannel_offset 689 @@ -2533,7 +2536,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.23.all.808948958" +#define TS_SIGNATURE "rusEFI 2022.04.23.all.3481960469" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 53cc5777b7..ae622750e0 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 808948958 -#define TS_SIGNATURE "rusEFI 2022.04.23.all.808948958" +#define SIGNATURE_HASH 3481960469 +#define TS_SIGNATURE "rusEFI 2022.04.23.all.3481960469" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 42c8a9df3e..e45df8af18 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 756304257 -#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-2chan.756304257" +#define SIGNATURE_HASH 3534314826 +#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-2chan.3534314826" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 7df01b9e97..31b269223d 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3112454954 -#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-4chan.3112454954" +#define SIGNATURE_HASH 1178165217 +#define TS_SIGNATURE "rusEFI 2022.04.23.alphax-4chan.1178165217" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 26693651d1..29d83a7414 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 754803193 -#define TS_SIGNATURE "rusEFI 2022.04.23.atlas.754803193" +#define SIGNATURE_HASH 3544216882 +#define TS_SIGNATURE "rusEFI 2022.04.23.atlas.3544216882" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 3b9ed7e72e..47ce922893 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 487071156 -#define TS_SIGNATURE "rusEFI 2022.04.23.core8.487071156" +#define SIGNATURE_HASH 3803515263 +#define TS_SIGNATURE "rusEFI 2022.04.23.core8.3803515263" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 93d68503a9..5898dd1966 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 808948958 -#define TS_SIGNATURE "rusEFI 2022.04.23.f429-discovery.808948958" +#define SIGNATURE_HASH 3481960469 +#define TS_SIGNATURE "rusEFI 2022.04.23.f429-discovery.3481960469" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a56f6133b6..4f856db092 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1508773103 -#define TS_SIGNATURE "rusEFI 2022.04.23.frankenso_na6.1508773103" +#define SIGNATURE_HASH 2790463524 +#define TS_SIGNATURE "rusEFI 2022.04.23.frankenso_na6.2790463524" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index c73e812909..15dca90df6 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1734935499 -#define TS_SIGNATURE "rusEFI 2022.04.23.harley81.1734935499" +#define SIGNATURE_HASH 2564036352 +#define TS_SIGNATURE "rusEFI 2022.04.23.harley81.2564036352" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 8930984e45..1a6c81bb8a 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2062360131 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen-nb1.2062360131" +#define SIGNATURE_HASH 2236615304 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen-nb1.2236615304" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 89a1e0dcd2..453430fd37 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1837150880 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121nissan.1837150880" +#define SIGNATURE_HASH 2453513835 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121nissan.2453513835" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f2f872f2c7..30fa36f744 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1853816649 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121vag.1853816649" +#define SIGNATURE_HASH 2445536130 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen121vag.2445536130" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 26515a8142..46df7bf951 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 782602675 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen128.782602675" +#define SIGNATURE_HASH 3508045176 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen128.3508045176" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a54958c01f..dfca345a4b 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3922888190 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen154hyundai.3922888190" +#define SIGNATURE_HASH 376410421 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen154hyundai.376410421" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index db98b3eae3..6b1033e9bb 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3579947966 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen72.3579947966" +#define SIGNATURE_HASH 719110005 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen72.719110005" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index d56299196a..71e8e5679f 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2978080856 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen81.2978080856" +#define SIGNATURE_HASH 1312619667 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen81.1312619667" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 846093057c..39804a3988 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 946503043 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen88bmw.946503043" +#define SIGNATURE_HASH 3352783176 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen88bmw.3352783176" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 46e2eea00d..6271caf036 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2492587187 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA6.2492587187" +#define SIGNATURE_HASH 1798097016 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA6.1798097016" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index cc4efa0aff..797c504315 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1015035722 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA8_96.1015035722" +#define SIGNATURE_HASH 3275563905 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellenNA8_96.3275563905" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index b0b8898b2f..4b5e558dfe 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1964759764 -#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.1964759764" +#define SIGNATURE_HASH 2326187551 +#define TS_SIGNATURE "rusEFI 2022.04.23.hellen_cypress.2326187551" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 2e969c6e47..4ff10306ea 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 2327713320 -#define TS_SIGNATURE "rusEFI 2022.04.23.kin.2327713320" +#define SIGNATURE_HASH 1963131619 +#define TS_SIGNATURE "rusEFI 2022.04.23.kin.1963131619" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 1b5be38390..5974d54eb1 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1595366069 -#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f4.1595366069" +#define SIGNATURE_HASH 2695515774 +#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f4.2695515774" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 395d2e6ebc..69cb77b012 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1595366069 -#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f7.1595366069" +#define SIGNATURE_HASH 2695515774 +#define TS_SIGNATURE "rusEFI 2022.04.23.mre_f7.2695515774" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3bc1b4c927..95ed5533af 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1625115960 -#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_405.1625115960" +#define SIGNATURE_HASH 2673891827 +#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_405.2673891827" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 687a691c63..d265a60735 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1625115960 -#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_469.1625115960" +#define SIGNATURE_HASH 2673891827 +#define TS_SIGNATURE "rusEFI 2022.04.23.prometheus_469.2673891827" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 7e09990627..60bf862bae 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 384699743 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f4.384699743" +#define SIGNATURE_HASH 3914537364 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f4.3914537364" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0019c83232..8778ecb98f 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 384699743 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f7.384699743" +#define SIGNATURE_HASH 3914537364 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_f7.3914537364" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 8890397f96..b091fdc4b2 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 384699743 -#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_h7.384699743" +#define SIGNATURE_HASH 3914537364 +#define TS_SIGNATURE "rusEFI 2022.04.23.proteus_h7.3914537364" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 49f666f14c..59c24891c5 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 777608425 -#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.777608425" +#define SIGNATURE_HASH 3521398818 +#define TS_SIGNATURE "rusEFI 2022.04.23.subaru_eg33_f7.3521398818" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 85ea99f240..bd366c56ed 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3693534351 -#define TS_SIGNATURE "rusEFI 2022.04.23.tdg-pdm8.3693534351" +#define SIGNATURE_HASH 597411908 +#define TS_SIGNATURE "rusEFI 2022.04.23.tdg-pdm8.597411908" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index db81d9fcf5..af060b6d82 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -354,6 +354,10 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.luaLastCycleDuration; if (strEqualCaseInsensitive(name, "testBenchIter")) return engine->outputChannels.testBenchIter; + if (strEqualCaseInsensitive(name, "tcRatio")) + return engine->outputChannels.tcRatio; + if (strEqualCaseInsensitive(name, "lastShiftTime")) + return engine->outputChannels.lastShiftTime; if (strEqualCaseInsensitive(name, "auxLinear1")) return engine->outputChannels.auxLinear1; if (strEqualCaseInsensitive(name, "auxLinear2")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index cf444274e8..016a6550d3 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.all.808948958" + signature = "rusEFI 2022.04.23.all.3481960469" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.all.808948958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.all.3481960469" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:10 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7066,6 +7076,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 3f5afe5069..3aedf025f9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.alphax-2chan.756304257" + signature = "rusEFI 2022.04.23.alphax-2chan.3534314826" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.alphax-2chan.756304257" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.alphax-2chan.3534314826" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:36 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 7e1a201f75..bf9b8688ee 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.alphax-4chan.3112454954" + signature = "rusEFI 2022.04.23.alphax-4chan.1178165217" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.alphax-4chan.3112454954" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.alphax-4chan.1178165217" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:37 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7041,6 +7051,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index acd7f3198a..42b15b53aa 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.atlas.754803193" + signature = "rusEFI 2022.04.23.atlas.3544216882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.atlas.754803193" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.atlas.3544216882" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:08 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7058,6 +7068,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 5c8e782d7a..3e6f7a0863 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.core8.487071156" + signature = "rusEFI 2022.04.23.core8.3803515263" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.core8.487071156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.core8.3803515263" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:57 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7060,6 +7070,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 85086152b2..7e6f0add6a 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.f429-discovery.808948958" + signature = "rusEFI 2022.04.23.f429-discovery.3481960469" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.f429-discovery.808948958" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.f429-discovery.3481960469" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:06 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7066,6 +7076,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 9cb4e1b19e..be0e188f5f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.frankenso_na6.1508773103" + signature = "rusEFI 2022.04.23.frankenso_na6.2790463524" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.frankenso_na6.1508773103" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.frankenso_na6.2790463524" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:58 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7066,6 +7076,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 9c280f6d97..162bae1495 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.harley81.1734935499" + signature = "rusEFI 2022.04.23.harley81.2564036352" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.harley81.1734935499" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.harley81.2564036352" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:39 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7043,6 +7053,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index dc93f15a5b..ba0d88245f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen-nb1.2062360131" + signature = "rusEFI 2022.04.23.hellen-nb1.2236615304" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen-nb1.2062360131" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen-nb1.2236615304" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:49 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7041,6 +7051,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2031e0192e..5b74f759f3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen121nissan.1837150880" + signature = "rusEFI 2022.04.23.hellen121nissan.2453513835" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen121nissan.1837150880" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen121nissan.2453513835" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:43 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 55f9669b54..81ca4141b9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen121vag.1853816649" + signature = "rusEFI 2022.04.23.hellen121vag.2445536130" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen121vag.1853816649" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen121vag.2445536130" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:41 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index c82deeb006..b765cfcdb5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen128.782602675" + signature = "rusEFI 2022.04.23.hellen128.3508045176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen128.782602675" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen128.3508045176" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:40 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 05707d8af8..7d5c05c4c8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen154hyundai.3922888190" + signature = "rusEFI 2022.04.23.hellen154hyundai.376410421" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen154hyundai.3922888190" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen154hyundai.376410421" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:01:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:44 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 8a23fcd90c..f5cd04d16d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen72.3579947966" + signature = "rusEFI 2022.04.23.hellen72.719110005" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen72.3579947966" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen72.719110005" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:47 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7041,6 +7051,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 6a32746eb5..a03aec0ce7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen81.2978080856" + signature = "rusEFI 2022.04.23.hellen81.1312619667" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen81.2978080856" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen81.1312619667" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:48 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7039,6 +7049,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 93b48842d1..40d68f994d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen88bmw.946503043" + signature = "rusEFI 2022.04.23.hellen88bmw.3352783176" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen88bmw.946503043" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen88bmw.3352783176" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:45 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index c1141fde28..ae1e7936a3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellenNA6.2492587187" + signature = "rusEFI 2022.04.23.hellenNA6.1798097016" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellenNA6.2492587187" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellenNA6.1798097016" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:51 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7041,6 +7051,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 419f3b5f84..1a082fc38c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellenNA8_96.1015035722" + signature = "rusEFI 2022.04.23.hellenNA8_96.3275563905" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellenNA8_96.1015035722" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellenNA8_96.3275563905" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:52 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7041,6 +7051,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index cda47eed17..db9b3c6014 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.hellen_cypress.1964759764" + signature = "rusEFI 2022.04.23.hellen_cypress.2326187551" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.hellen_cypress.1964759764" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.hellen_cypress.2326187551" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 03:02:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:13 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7066,6 +7076,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index c766a6c066..302978e1fe 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.kin.2327713320" + signature = "rusEFI 2022.04.23.kin.1963131619" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.kin.2327713320" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.kin.1963131619" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 03:02:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Apr 23 11:39:12 UTC 2022 -pageSize = 21120 +pageSize = 21136 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1405,7 +1405,9 @@ tcu_pcVals43 = array, U08, 21088, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21096, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21104, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21112, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21120 +tcu_32SpeedBins = array, U08, 21120, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21128, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21136 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2397,21 +2399,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2422,30 +2420,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3505,6 +3503,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4035,7 +4040,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4385,6 +4392,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4818,6 +4827,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7026,6 +7036,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3758dfd2ec..dbe4ff5866 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.mre_f4.1595366069" + signature = "rusEFI 2022.04.23.mre_f4.2695515774" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.mre_f4.1595366069" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.mre_f4.2695515774" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:55 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 787ec3ee74..ea0c317ed6 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.mre_f7.1595366069" + signature = "rusEFI 2022.04.23.mre_f7.2695515774" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.mre_f7.1595366069" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.mre_f7.2695515774" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:54 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7040,6 +7050,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f701f3e2d0..429d0135de 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.prometheus_405.1625115960" + signature = "rusEFI 2022.04.23.prometheus_405.2673891827" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.prometheus_405.1625115960" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.prometheus_405.2673891827" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:01 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4855,6 +4864,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7061,6 +7071,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 13a5da5ed9..66e72a7a66 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.prometheus_469.1625115960" + signature = "rusEFI 2022.04.23.prometheus_469.2673891827" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.prometheus_469.1625115960" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.prometheus_469.2673891827" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:38:59 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4855,6 +4864,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7061,6 +7071,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a42392c25c..ea3ebbde01 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_f4.384699743" + signature = "rusEFI 2022.04.23.proteus_f4.3914537364" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_f4.384699743" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_f4.3914537364" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:04 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7031,6 +7041,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 01e3e61cad..8e98a67bd2 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_f7.384699743" + signature = "rusEFI 2022.04.23.proteus_f7.3914537364" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_f7.384699743" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_f7.3914537364" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:02 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7031,6 +7041,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 5ceb9acd69..d76a32173e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.proteus_h7.384699743" + signature = "rusEFI 2022.04.23.proteus_h7.3914537364" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.proteus_h7.384699743" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.proteus_h7.3914537364" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:05 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7031,6 +7041,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index d97070f437..b6903fc132 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.subaru_eg33_f7.777608425" + signature = "rusEFI 2022.04.23.subaru_eg33_f7.3521398818" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.subaru_eg33_f7.777608425" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.subaru_eg33_f7.3521398818" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:14 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7055,6 +7065,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index a1113b59ad..39d3892f11 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.23.tdg-pdm8.3693534351" + signature = "rusEFI 2022.04.23.tdg-pdm8.597411908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.23.tdg-pdm8.3693534351" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.23.tdg-pdm8.597411908" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,9 +84,9 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 03:02:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:09 UTC 2022 -pageSize = 21148 +pageSize = 21164 page = 1 engineType = bits, S32, 0, [0:6], "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" sensorSnifferRpmThreshold = scalar, U08, 4, "RPM", 50.0, 0, 0, 30000, 0 @@ -1427,7 +1427,9 @@ tcu_pcVals43 = array, U08, 21116, [8], "%", 1, 0, 0, 255, 0 tcu_tccTpsBins = array, U08, 21124, [8], "TPS", 1, 0, 0, 255, 0 tcu_tccLockSpeed = array, U08, 21132, [8], "MPH", 1, 0, 0, 255, 0 tcu_tccUnlockSpeed = array, U08, 21140, [8], "MPH", 1, 0, 0, 255, 0 -; total TS size = 21148 +tcu_32SpeedBins = array, U08, 21148, [8], "KPH", 1, 0, 0, 255, 0 +tcu_32Vals = array, U08, 21156, [8], "%", 1, 0, 0, 255, 0 +; total TS size = 21164 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type" sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" @@ -2438,21 +2440,17 @@ unusedBit_182_31 = bits, U32, 376, [31:31] luaInvocationCounter = scalar, S32, 380, "count", 1, 0 luaLastCycleDuration = scalar, S32, 384, "nt", 1, 0 testBenchIter = scalar, U08, 388, "count", 1, 0 -unusedInTheMiddle1 = scalar, U08, 389, "", 1, 0 -unusedInTheMiddle2 = scalar, U08, 390, "", 1, 0 -unusedInTheMiddle3 = scalar, U08, 391, "", 1, 0 -unusedInTheMiddle4 = scalar, U08, 392, "", 1, 0 -unusedInTheMiddle5 = scalar, U08, 393, "", 1, 0 -unusedInTheMiddle6 = scalar, U08, 394, "", 1, 0 -unusedInTheMiddle7 = scalar, U08, 395, "", 1, 0 -unusedInTheMiddle8 = scalar, U08, 396, "", 1, 0 -unusedInTheMiddle9 = scalar, U08, 397, "", 1, 0 -unusedInTheMiddle10 = scalar, U08, 398, "", 1, 0 -unusedInTheMiddle11 = scalar, U08, 399, "", 1, 0 -unusedInTheMiddle12 = scalar, U08, 400, "", 1, 0 -unusedInTheMiddle13 = scalar, U08, 401, "", 1, 0 -unusedInTheMiddle14 = scalar, U08, 402, "", 1, 0 -unusedInTheMiddle15 = scalar, U08, 403, "", 1, 0 +unusedWat = scalar, U08, 389, "", 1, 0 +tcRatio = scalar, U16, 390, "value", 0.01, 0 +lastShiftTime = scalar, F32, 392, "", 1, 0 +unusedInTheMiddle1 = scalar, U08, 396, "", 1, 0 +unusedInTheMiddle2 = scalar, U08, 397, "", 1, 0 +unusedInTheMiddle3 = scalar, U08, 398, "", 1, 0 +unusedInTheMiddle4 = scalar, U08, 399, "", 1, 0 +unusedInTheMiddle5 = scalar, U08, 400, "", 1, 0 +unusedInTheMiddle6 = scalar, U08, 401, "", 1, 0 +unusedInTheMiddle7 = scalar, U08, 402, "", 1, 0 +unusedInTheMiddle8 = scalar, U08, 403, "", 1, 0 auxLinear1 = scalar, S16, 404, "", 0.01, 0 auxLinear2 = scalar, S16, 406, "", 0.01, 0 launchSpeedCondition = bits, U32, 408, [0:0] @@ -2463,30 +2461,30 @@ launchIsLaunchCondition = bits, U32, 408, [4:4] launchCombinedConditions = bits, U32, 408, [5:5] dfcoActive = bits, U32, 408, [6:6] tpsAccelActive = bits, U32, 408, [7:7] -unusedBit_226_8 = bits, U32, 408, [8:8] -unusedBit_226_9 = bits, U32, 408, [9:9] -unusedBit_226_10 = bits, U32, 408, [10:10] -unusedBit_226_11 = bits, U32, 408, [11:11] -unusedBit_226_12 = bits, U32, 408, [12:12] -unusedBit_226_13 = bits, U32, 408, [13:13] -unusedBit_226_14 = bits, U32, 408, [14:14] -unusedBit_226_15 = bits, U32, 408, [15:15] -unusedBit_226_16 = bits, U32, 408, [16:16] -unusedBit_226_17 = bits, U32, 408, [17:17] -unusedBit_226_18 = bits, U32, 408, [18:18] -unusedBit_226_19 = bits, U32, 408, [19:19] -unusedBit_226_20 = bits, U32, 408, [20:20] -unusedBit_226_21 = bits, U32, 408, [21:21] -unusedBit_226_22 = bits, U32, 408, [22:22] -unusedBit_226_23 = bits, U32, 408, [23:23] -unusedBit_226_24 = bits, U32, 408, [24:24] -unusedBit_226_25 = bits, U32, 408, [25:25] -unusedBit_226_26 = bits, U32, 408, [26:26] -unusedBit_226_27 = bits, U32, 408, [27:27] -unusedBit_226_28 = bits, U32, 408, [28:28] -unusedBit_226_29 = bits, U32, 408, [29:29] -unusedBit_226_30 = bits, U32, 408, [30:30] -unusedBit_226_31 = bits, U32, 408, [31:31] +unusedBit_229_8 = bits, U32, 408, [8:8] +unusedBit_229_9 = bits, U32, 408, [9:9] +unusedBit_229_10 = bits, U32, 408, [10:10] +unusedBit_229_11 = bits, U32, 408, [11:11] +unusedBit_229_12 = bits, U32, 408, [12:12] +unusedBit_229_13 = bits, U32, 408, [13:13] +unusedBit_229_14 = bits, U32, 408, [14:14] +unusedBit_229_15 = bits, U32, 408, [15:15] +unusedBit_229_16 = bits, U32, 408, [16:16] +unusedBit_229_17 = bits, U32, 408, [17:17] +unusedBit_229_18 = bits, U32, 408, [18:18] +unusedBit_229_19 = bits, U32, 408, [19:19] +unusedBit_229_20 = bits, U32, 408, [20:20] +unusedBit_229_21 = bits, U32, 408, [21:21] +unusedBit_229_22 = bits, U32, 408, [22:22] +unusedBit_229_23 = bits, U32, 408, [23:23] +unusedBit_229_24 = bits, U32, 408, [24:24] +unusedBit_229_25 = bits, U32, 408, [25:25] +unusedBit_229_26 = bits, U32, 408, [26:26] +unusedBit_229_27 = bits, U32, 408, [27:27] +unusedBit_229_28 = bits, U32, 408, [28:28] +unusedBit_229_29 = bits, U32, 408, [29:29] +unusedBit_229_30 = bits, U32, 408, [30:30] +unusedBit_229_31 = bits, U32, 408, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 412, "", 1, 0 TEMPLOG_map_peak = scalar, U08, 413, "", 1, 0 boostControllerOutput = scalar, U08, 414, "%", 0.5, 0 @@ -3546,6 +3544,13 @@ curve = pcPerShiftCurve, "Transmission Line Pressure Control - Shift" lineLabel = "3->2%" lineLabel = "4->3%" +curve = 32Curve, "3-2 Shift Solenoid Percent by Speed" + columnLabel = "Speed", "%" + xAxis = 0, 200, 20 + yAxis = 0, 100, 10 + xBins = tcu_32SpeedBins, vehicleSpeedKph + yBins = tcu_32Vals + [TableEditor] ; table_id, map3d_id, "title", page @@ -4076,7 +4081,9 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 - ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 + tcRatioGauge = tcRatio, "Torque Converter Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + shiftTimeGauge = lastShiftTime, "Last Shift Time", "S", 0, 2, 0, 0, 2, 2, 4, 4 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4426,6 +4433,8 @@ entry = isUsbConnected, "Original reason for this is to check if USB is connecte entry = luaInvocationCounter, "luaInvocationCounter", int, "%d" entry = luaLastCycleDuration, "luaLastCycleDuration", int, "%d" entry = testBenchIter, "testBenchIter", int, "%d" +entry = tcRatio, "Torque Converter Ratio", float, "%.3f" +entry = lastShiftTime, "S", float, "%.3f" entry = auxLinear1, "Aux Linear 1", float, "%.3f" entry = auxLinear2, "Aux Linear 2", float, "%.3f" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" @@ -4859,6 +4868,7 @@ menuDialog = main subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" + subMenu = 32Dialog, "3-2 Shift Solenoid Percent by Speed" menu = "&Sensors" # Base analog input settings @@ -7066,6 +7076,9 @@ dialog = tcuControls, "Transmission Settings" dialog = pcPerShiftDialog, "Line Pressure Per Shift" panel = pcPerShiftCurve + dialog = 32Dialog, "3-2 Shift Solenoid Percent by Speed" + panel = 32Curve + ;Boost Open Loop dialog = boostDialog, "" 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 683c044732..2ba389b3c6 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 Apr 23 03:02:26 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Apr 23 11:39:16 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1125,6 +1125,7 @@ public class Fields { public static final String GAUGE_NAME_RPM = "RPM"; public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; public static final String GAUGE_NAME_TARGET_LAMBDA = "fuel: target lambda"; + public static final String GAUGE_NAME_TC_RATIO = "Torque Converter Ratio"; public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; @@ -1741,7 +1742,7 @@ public class Fields { public static final int pedalToTpsPedalBins_offset = 5484; public static final int pedalToTpsRpmBins_offset = 5492; public static final int pedalToTpsTable_offset = 5420; - public static final int persistent_config_s_size = 21148; + public static final int persistent_config_s_size = 21164; public static final int pid_s_size = 20; public static final int PidAutoTune_AutoTunerState_AUTOTUNER_OFF = 0; public static final int PidAutoTune_AutoTunerState_CONVERGED = 16; @@ -1879,7 +1880,6 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; - public static final int SIGNATURE_HASH = 808948958; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2006,6 +2006,8 @@ public class Fields { public static final int tcu_32_solenoid_freq_offset = 4804; public static final int tcu_32_solenoid_pin_mode_offset = 4803; public static final int tcu_32_solenoid_pin_offset = 4802; + public static final int tcu_32SpeedBins_offset = 21148; + public static final int tcu_32Vals_offset = 21156; public static final int TCU_GEAR_COUNT = 10; public static final int tcu_pc_solenoid_freq_offset = 4800; public static final int tcu_pc_solenoid_pin_mode_offset = 4799; @@ -2098,7 +2100,7 @@ public class Fields { public static final int torqueLoadBins_offset = 4738; public static final int torqueRpmBins_offset = 4726; public static final int torqueTable_offset = 4690; - public static final int TOTAL_CONFIG_SIZE = 21148; + public static final int TOTAL_CONFIG_SIZE = 21164; public static final int totalGearsCount_offset = 1698; public static final int tps1_1AdcChannel_offset = 520; public static final int tps1_2AdcChannel_offset = 689; @@ -2397,7 +2399,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.04.23.all.808948958"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.23.all.3481960469"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1000; @@ -3957,6 +3959,8 @@ public class Fields { public static final Field TCU_TCCTPSBINS = Field.create("TCU_TCCTPSBINS", 21124, FieldType.INT8).setScale(1.0); public static final Field TCU_TCCLOCKSPEED = Field.create("TCU_TCCLOCKSPEED", 21132, FieldType.INT8).setScale(1.0); public static final Field TCU_TCCUNLOCKSPEED = Field.create("TCU_TCCUNLOCKSPEED", 21140, FieldType.INT8).setScale(1.0); + public static final Field TCU_32SPEEDBINS = Field.create("TCU_32SPEEDBINS", 21148, FieldType.INT8).setScale(1.0); + public static final Field TCU_32VALS = Field.create("TCU_32VALS", 21156, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { ENGINETYPE, SENSORSNIFFERRPMTHRESHOLD, @@ -5293,5 +5297,7 @@ public class Fields { TCU_TCCTPSBINS, TCU_TCCLOCKSPEED, TCU_TCCUNLOCKSPEED, + TCU_32SPEEDBINS, + TCU_32VALS, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index a9797e1644..1e3e5fb4d5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Apr 23 11:38:35 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -214,6 +214,7 @@ public class TsOutputs { public static final String GAUGE_NAME_RPM = "RPM"; public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR"; public static final String GAUGE_NAME_TARGET_LAMBDA = "fuel: target lambda"; + public static final String GAUGE_NAME_TC_RATIO = "Torque Converter Ratio"; public static final String GAUGE_NAME_TCHARGE = "fuel: SD tCharge"; public static final String GAUGE_NAME_THROTTLE_PEDAL = "Throttle pedal position"; public static final String GAUGE_NAME_TIME = "Time"; @@ -634,21 +635,17 @@ public class TsOutputs { public static final Field LUAINVOCATIONCOUNTER = Field.create("LUAINVOCATIONCOUNTER", 380, FieldType.INT).setScale(1.0); public static final Field LUALASTCYCLEDURATION = Field.create("LUALASTCYCLEDURATION", 384, FieldType.INT).setScale(1.0); public static final Field TESTBENCHITER = Field.create("TESTBENCHITER", 388, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE1 = Field.create("UNUSEDINTHEMIDDLE1", 389, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE2 = Field.create("UNUSEDINTHEMIDDLE2", 390, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE3 = Field.create("UNUSEDINTHEMIDDLE3", 391, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE4 = Field.create("UNUSEDINTHEMIDDLE4", 392, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE5 = Field.create("UNUSEDINTHEMIDDLE5", 393, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE6 = Field.create("UNUSEDINTHEMIDDLE6", 394, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE7 = Field.create("UNUSEDINTHEMIDDLE7", 395, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE8 = Field.create("UNUSEDINTHEMIDDLE8", 396, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE9 = Field.create("UNUSEDINTHEMIDDLE9", 397, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE10 = Field.create("UNUSEDINTHEMIDDLE10", 398, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE11 = Field.create("UNUSEDINTHEMIDDLE11", 399, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE12 = Field.create("UNUSEDINTHEMIDDLE12", 400, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE13 = Field.create("UNUSEDINTHEMIDDLE13", 401, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE14 = Field.create("UNUSEDINTHEMIDDLE14", 402, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDINTHEMIDDLE15 = Field.create("UNUSEDINTHEMIDDLE15", 403, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDWAT = Field.create("UNUSEDWAT", 389, FieldType.INT8).setScale(1.0); + public static final Field TCRATIO = Field.create("TCRATIO", 390, FieldType.INT16).setScale(0.01); + public static final Field LASTSHIFTTIME = Field.create("LASTSHIFTTIME", 392, FieldType.FLOAT); + public static final Field UNUSEDINTHEMIDDLE1 = Field.create("UNUSEDINTHEMIDDLE1", 396, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE2 = Field.create("UNUSEDINTHEMIDDLE2", 397, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE3 = Field.create("UNUSEDINTHEMIDDLE3", 398, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE4 = Field.create("UNUSEDINTHEMIDDLE4", 399, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE5 = Field.create("UNUSEDINTHEMIDDLE5", 400, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE6 = Field.create("UNUSEDINTHEMIDDLE6", 401, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE7 = Field.create("UNUSEDINTHEMIDDLE7", 402, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDINTHEMIDDLE8 = Field.create("UNUSEDINTHEMIDDLE8", 403, FieldType.INT8).setScale(1.0); public static final Field AUXLINEAR1 = Field.create("AUXLINEAR1", 404, FieldType.INT16).setScale(0.01); public static final Field AUXLINEAR2 = Field.create("AUXLINEAR2", 406, FieldType.INT16).setScale(0.01); public static final Field LAUNCHSPEEDCONDITION = Field.create("LAUNCHSPEEDCONDITION", 408, FieldType.BIT, 0); @@ -659,30 +656,30 @@ public class TsOutputs { public static final Field LAUNCHCOMBINEDCONDITIONS = Field.create("LAUNCHCOMBINEDCONDITIONS", 408, FieldType.BIT, 5); public static final Field DFCOACTIVE = Field.create("DFCOACTIVE", 408, FieldType.BIT, 6); public static final Field TPSACCELACTIVE = Field.create("TPSACCELACTIVE", 408, FieldType.BIT, 7); - public static final Field UNUSEDBIT_226_8 = Field.create("UNUSEDBIT_226_8", 408, FieldType.BIT, 8); - public static final Field UNUSEDBIT_226_9 = Field.create("UNUSEDBIT_226_9", 408, FieldType.BIT, 9); - public static final Field UNUSEDBIT_226_10 = Field.create("UNUSEDBIT_226_10", 408, FieldType.BIT, 10); - public static final Field UNUSEDBIT_226_11 = Field.create("UNUSEDBIT_226_11", 408, FieldType.BIT, 11); - public static final Field UNUSEDBIT_226_12 = Field.create("UNUSEDBIT_226_12", 408, FieldType.BIT, 12); - public static final Field UNUSEDBIT_226_13 = Field.create("UNUSEDBIT_226_13", 408, FieldType.BIT, 13); - public static final Field UNUSEDBIT_226_14 = Field.create("UNUSEDBIT_226_14", 408, FieldType.BIT, 14); - public static final Field UNUSEDBIT_226_15 = Field.create("UNUSEDBIT_226_15", 408, FieldType.BIT, 15); - public static final Field UNUSEDBIT_226_16 = Field.create("UNUSEDBIT_226_16", 408, FieldType.BIT, 16); - public static final Field UNUSEDBIT_226_17 = Field.create("UNUSEDBIT_226_17", 408, FieldType.BIT, 17); - public static final Field UNUSEDBIT_226_18 = Field.create("UNUSEDBIT_226_18", 408, FieldType.BIT, 18); - public static final Field UNUSEDBIT_226_19 = Field.create("UNUSEDBIT_226_19", 408, FieldType.BIT, 19); - public static final Field UNUSEDBIT_226_20 = Field.create("UNUSEDBIT_226_20", 408, FieldType.BIT, 20); - public static final Field UNUSEDBIT_226_21 = Field.create("UNUSEDBIT_226_21", 408, FieldType.BIT, 21); - public static final Field UNUSEDBIT_226_22 = Field.create("UNUSEDBIT_226_22", 408, FieldType.BIT, 22); - public static final Field UNUSEDBIT_226_23 = Field.create("UNUSEDBIT_226_23", 408, FieldType.BIT, 23); - public static final Field UNUSEDBIT_226_24 = Field.create("UNUSEDBIT_226_24", 408, FieldType.BIT, 24); - public static final Field UNUSEDBIT_226_25 = Field.create("UNUSEDBIT_226_25", 408, FieldType.BIT, 25); - public static final Field UNUSEDBIT_226_26 = Field.create("UNUSEDBIT_226_26", 408, FieldType.BIT, 26); - public static final Field UNUSEDBIT_226_27 = Field.create("UNUSEDBIT_226_27", 408, FieldType.BIT, 27); - public static final Field UNUSEDBIT_226_28 = Field.create("UNUSEDBIT_226_28", 408, FieldType.BIT, 28); - public static final Field UNUSEDBIT_226_29 = Field.create("UNUSEDBIT_226_29", 408, FieldType.BIT, 29); - public static final Field UNUSEDBIT_226_30 = Field.create("UNUSEDBIT_226_30", 408, FieldType.BIT, 30); - public static final Field UNUSEDBIT_226_31 = Field.create("UNUSEDBIT_226_31", 408, FieldType.BIT, 31); + public static final Field UNUSEDBIT_229_8 = Field.create("UNUSEDBIT_229_8", 408, FieldType.BIT, 8); + public static final Field UNUSEDBIT_229_9 = Field.create("UNUSEDBIT_229_9", 408, FieldType.BIT, 9); + public static final Field UNUSEDBIT_229_10 = Field.create("UNUSEDBIT_229_10", 408, FieldType.BIT, 10); + public static final Field UNUSEDBIT_229_11 = Field.create("UNUSEDBIT_229_11", 408, FieldType.BIT, 11); + public static final Field UNUSEDBIT_229_12 = Field.create("UNUSEDBIT_229_12", 408, FieldType.BIT, 12); + public static final Field UNUSEDBIT_229_13 = Field.create("UNUSEDBIT_229_13", 408, FieldType.BIT, 13); + public static final Field UNUSEDBIT_229_14 = Field.create("UNUSEDBIT_229_14", 408, FieldType.BIT, 14); + public static final Field UNUSEDBIT_229_15 = Field.create("UNUSEDBIT_229_15", 408, FieldType.BIT, 15); + public static final Field UNUSEDBIT_229_16 = Field.create("UNUSEDBIT_229_16", 408, FieldType.BIT, 16); + public static final Field UNUSEDBIT_229_17 = Field.create("UNUSEDBIT_229_17", 408, FieldType.BIT, 17); + public static final Field UNUSEDBIT_229_18 = Field.create("UNUSEDBIT_229_18", 408, FieldType.BIT, 18); + public static final Field UNUSEDBIT_229_19 = Field.create("UNUSEDBIT_229_19", 408, FieldType.BIT, 19); + public static final Field UNUSEDBIT_229_20 = Field.create("UNUSEDBIT_229_20", 408, FieldType.BIT, 20); + public static final Field UNUSEDBIT_229_21 = Field.create("UNUSEDBIT_229_21", 408, FieldType.BIT, 21); + public static final Field UNUSEDBIT_229_22 = Field.create("UNUSEDBIT_229_22", 408, FieldType.BIT, 22); + public static final Field UNUSEDBIT_229_23 = Field.create("UNUSEDBIT_229_23", 408, FieldType.BIT, 23); + public static final Field UNUSEDBIT_229_24 = Field.create("UNUSEDBIT_229_24", 408, FieldType.BIT, 24); + public static final Field UNUSEDBIT_229_25 = Field.create("UNUSEDBIT_229_25", 408, FieldType.BIT, 25); + public static final Field UNUSEDBIT_229_26 = Field.create("UNUSEDBIT_229_26", 408, FieldType.BIT, 26); + public static final Field UNUSEDBIT_229_27 = Field.create("UNUSEDBIT_229_27", 408, FieldType.BIT, 27); + public static final Field UNUSEDBIT_229_28 = Field.create("UNUSEDBIT_229_28", 408, FieldType.BIT, 28); + public static final Field UNUSEDBIT_229_29 = Field.create("UNUSEDBIT_229_29", 408, FieldType.BIT, 29); + public static final Field UNUSEDBIT_229_30 = Field.create("UNUSEDBIT_229_30", 408, FieldType.BIT, 30); + public static final Field UNUSEDBIT_229_31 = Field.create("UNUSEDBIT_229_31", 408, FieldType.BIT, 31); public static final Field TEMPLOG_MAP_AT_CYCLE_COUNT = Field.create("TEMPLOG_MAP_AT_CYCLE_COUNT", 412, FieldType.INT8).setScale(1.0); public static final Field TEMPLOG_MAP_PEAK = Field.create("TEMPLOG_MAP_PEAK", 413, FieldType.INT8).setScale(1.0); public static final Field BOOSTCONTROLLEROUTPUT = Field.create("BOOSTCONTROLLEROUTPUT", 414, FieldType.INT8).setScale(0.5); @@ -1071,6 +1068,9 @@ public class TsOutputs { LUAINVOCATIONCOUNTER, LUALASTCYCLEDURATION, TESTBENCHITER, + UNUSEDWAT, + TCRATIO, + LASTSHIFTTIME, UNUSEDINTHEMIDDLE1, UNUSEDINTHEMIDDLE2, UNUSEDINTHEMIDDLE3, @@ -1079,13 +1079,6 @@ public class TsOutputs { UNUSEDINTHEMIDDLE6, UNUSEDINTHEMIDDLE7, UNUSEDINTHEMIDDLE8, - UNUSEDINTHEMIDDLE9, - UNUSEDINTHEMIDDLE10, - UNUSEDINTHEMIDDLE11, - UNUSEDINTHEMIDDLE12, - UNUSEDINTHEMIDDLE13, - UNUSEDINTHEMIDDLE14, - UNUSEDINTHEMIDDLE15, AUXLINEAR1, AUXLINEAR2, LAUNCHSPEEDCONDITION, @@ -1096,30 +1089,30 @@ public class TsOutputs { LAUNCHCOMBINEDCONDITIONS, DFCOACTIVE, TPSACCELACTIVE, - UNUSEDBIT_226_8, - UNUSEDBIT_226_9, - UNUSEDBIT_226_10, - UNUSEDBIT_226_11, - UNUSEDBIT_226_12, - UNUSEDBIT_226_13, - UNUSEDBIT_226_14, - UNUSEDBIT_226_15, - UNUSEDBIT_226_16, - UNUSEDBIT_226_17, - UNUSEDBIT_226_18, - UNUSEDBIT_226_19, - UNUSEDBIT_226_20, - UNUSEDBIT_226_21, - UNUSEDBIT_226_22, - UNUSEDBIT_226_23, - UNUSEDBIT_226_24, - UNUSEDBIT_226_25, - UNUSEDBIT_226_26, - UNUSEDBIT_226_27, - UNUSEDBIT_226_28, - UNUSEDBIT_226_29, - UNUSEDBIT_226_30, - UNUSEDBIT_226_31, + UNUSEDBIT_229_8, + UNUSEDBIT_229_9, + UNUSEDBIT_229_10, + UNUSEDBIT_229_11, + UNUSEDBIT_229_12, + UNUSEDBIT_229_13, + UNUSEDBIT_229_14, + UNUSEDBIT_229_15, + UNUSEDBIT_229_16, + UNUSEDBIT_229_17, + UNUSEDBIT_229_18, + UNUSEDBIT_229_19, + UNUSEDBIT_229_20, + UNUSEDBIT_229_21, + UNUSEDBIT_229_22, + UNUSEDBIT_229_23, + UNUSEDBIT_229_24, + UNUSEDBIT_229_25, + UNUSEDBIT_229_26, + UNUSEDBIT_229_27, + UNUSEDBIT_229_28, + UNUSEDBIT_229_29, + UNUSEDBIT_229_30, + UNUSEDBIT_229_31, TEMPLOG_MAP_AT_CYCLE_COUNT, TEMPLOG_MAP_PEAK, BOOSTCONTROLLEROUTPUT, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index d7b92a498b..1408dead0b 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ RUSEFI rusEfi rusEfi - 21148 + 21164