diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index f32f3ffa86..f3792a4aed 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_35767 +#define SIGNATURE_HASH snap_19036 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.31.cypress.snap_35767" +#define TS_SIGNATURE "rusEFI 2022.10.31.cypress.snap_19036" #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/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index f92ad3c7b2..81c5a4e79c 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_10619 +#define SIGNATURE_HASH snap_59536 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.31.kin.snap_10619" +#define TS_SIGNATURE "rusEFI 2022.10.31.kin.snap_59536" #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/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index e4cce7224f..bbb30e7c97 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 @@ -992,7 +992,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_21101 +#define SIGNATURE_HASH snap_37766 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1265,7 +1265,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.31.subaru_eg33_f7.snap_21101" +#define TS_SIGNATURE "rusEFI 2022.10.31.subaru_eg33_f7.snap_37766" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index acef7ddc2c..1a4a5c9572 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_35767 +#define SIGNATURE_HASH snap_19036 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.31.all.snap_35767" +#define TS_SIGNATURE "rusEFI 2022.10.31.all.snap_19036" #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_48way.h b/firmware/controllers/generated/signature_48way.h index 09012dc6c7..3839b4bd0e 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_33784 -#define TS_SIGNATURE "rusEFI 2022.10.31.48way.snap_33784" +#define SIGNATURE_HASH snap_16915 +#define TS_SIGNATURE "rusEFI 2022.10.31.48way.snap_16915" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 003aede7c3..d117ee664f 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_35767 -#define TS_SIGNATURE "rusEFI 2022.10.31.all.snap_35767" +#define SIGNATURE_HASH snap_19036 +#define TS_SIGNATURE "rusEFI 2022.10.31.all.snap_19036" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index c92eff03be..76fcbae4c4 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_5851 -#define TS_SIGNATURE "rusEFI 2022.10.31.alphax-2chan.snap_5851" +#define SIGNATURE_HASH snap_55088 +#define TS_SIGNATURE "rusEFI 2022.10.31.alphax-2chan.snap_55088" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index a4a5a3c6b8..80ceb912be 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_18488 -#define TS_SIGNATURE "rusEFI 2022.10.31.alphax-4chan.snap_18488" +#define SIGNATURE_HASH snap_35283 +#define TS_SIGNATURE "rusEFI 2022.10.31.alphax-4chan.snap_35283" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index c461fd5f6d..1101dc5fac 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_32400 -#define TS_SIGNATURE "rusEFI 2022.10.31.atlas.snap_32400" +#define SIGNATURE_HASH snap_49019 +#define TS_SIGNATURE "rusEFI 2022.10.31.atlas.snap_49019" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index e1007fe595..06189474b8 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_55886 -#define TS_SIGNATURE "rusEFI 2022.10.31.core8.snap_55886" +#define SIGNATURE_HASH snap_7077 +#define TS_SIGNATURE "rusEFI 2022.10.31.core8.snap_7077" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 7bc92e746e..0d6a55971a 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_35767 -#define TS_SIGNATURE "rusEFI 2022.10.31.cypress.snap_35767" +#define SIGNATURE_HASH snap_19036 +#define TS_SIGNATURE "rusEFI 2022.10.31.cypress.snap_19036" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index a30f9c4035..a72aea0cfc 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_35767 -#define TS_SIGNATURE "rusEFI 2022.10.31.f407-discovery.snap_35767" +#define SIGNATURE_HASH snap_19036 +#define TS_SIGNATURE "rusEFI 2022.10.31.f407-discovery.snap_19036" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 0e6e84afb2..635b1a5b90 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_35767 -#define TS_SIGNATURE "rusEFI 2022.10.31.f429-discovery.snap_35767" +#define SIGNATURE_HASH snap_19036 +#define TS_SIGNATURE "rusEFI 2022.10.31.f429-discovery.snap_19036" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 0317c43404..cfcb393a62 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_30579 -#define TS_SIGNATURE "rusEFI 2022.10.31.frankenso_na6.snap_30579" +#define SIGNATURE_HASH snap_46744 +#define TS_SIGNATURE "rusEFI 2022.10.31.frankenso_na6.snap_46744" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 7e4c07b1bb..8378ba1c2c 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_36504 -#define TS_SIGNATURE "rusEFI 2022.10.31.harley81.snap_36504" +#define SIGNATURE_HASH snap_20339 +#define TS_SIGNATURE "rusEFI 2022.10.31.harley81.snap_20339" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 117a13dba7..5c1d7b87a7 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_2998 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen-gm-e67.snap_2998" +#define SIGNATURE_HASH snap_51805 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen-gm-e67.snap_51805" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 3c65469f57..ad3092c0a3 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_47739 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen-nb1.snap_47739" +#define SIGNATURE_HASH snap_31632 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen-nb1.snap_31632" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 65186a1ea2..fe996c4aeb 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_13149 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen121nissan.snap_13149" +#define SIGNATURE_HASH snap_62134 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen121nissan.snap_62134" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index c9356f5040..51d8080174 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_18637 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen121vag.snap_18637" +#define SIGNATURE_HASH snap_35110 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen121vag.snap_35110" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index ae0b6a4ba7..fd82b0ca0d 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_63116 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen128.snap_63116" +#define SIGNATURE_HASH snap_14183 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen128.snap_14183" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index c96ae54c0a..28250e271a 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_15775 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen154hyundai.snap_15775" +#define SIGNATURE_HASH snap_64628 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen154hyundai.snap_64628" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index bdb7ad9230..7a649b73b7 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_34108 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen72.snap_34108" +#define SIGNATURE_HASH snap_17623 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen72.snap_17623" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a9ff96cd27..9576e8d7ce 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_21437 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen81.snap_21437" +#define SIGNATURE_HASH snap_37462 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen81.snap_37462" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 5d358ce5ef..21cfeaff97 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_39035 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellen88bmw.snap_39035" +#define SIGNATURE_HASH snap_22928 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellen88bmw.snap_22928" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index b84ffe0f4e..aa7802094f 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_14976 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellenNA6.snap_14976" +#define SIGNATURE_HASH snap_64363 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellenNA6.snap_64363" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index d06affcf80..bce8609e79 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_14943 -#define TS_SIGNATURE "rusEFI 2022.10.31.hellenNA8_96.snap_14943" +#define SIGNATURE_HASH snap_64436 +#define TS_SIGNATURE "rusEFI 2022.10.31.hellenNA8_96.snap_64436" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 7024491d9f..5a7be73d3a 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_10619 -#define TS_SIGNATURE "rusEFI 2022.10.31.kin.snap_10619" +#define SIGNATURE_HASH snap_59536 +#define TS_SIGNATURE "rusEFI 2022.10.31.kin.snap_59536" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 893038df2c..04daa73013 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_60599 -#define TS_SIGNATURE "rusEFI 2022.10.31.mre_f4.snap_60599" +#define SIGNATURE_HASH snap_11612 +#define TS_SIGNATURE "rusEFI 2022.10.31.mre_f4.snap_11612" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index c2416732ed..ee0c4d2169 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_60599 -#define TS_SIGNATURE "rusEFI 2022.10.31.mre_f7.snap_60599" +#define SIGNATURE_HASH snap_11612 +#define TS_SIGNATURE "rusEFI 2022.10.31.mre_f7.snap_11612" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7fcd39bd74..53e019bc05 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_21073 -#define TS_SIGNATURE "rusEFI 2022.10.31.prometheus_405.snap_21073" +#define SIGNATURE_HASH snap_37818 +#define TS_SIGNATURE "rusEFI 2022.10.31.prometheus_405.snap_37818" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 6796daa8dc..f8fedf05ad 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_21073 -#define TS_SIGNATURE "rusEFI 2022.10.31.prometheus_469.snap_21073" +#define SIGNATURE_HASH snap_37818 +#define TS_SIGNATURE "rusEFI 2022.10.31.prometheus_469.snap_37818" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5f8d6893ca..34b5dddffa 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_19649 -#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_f4.snap_19649" +#define SIGNATURE_HASH snap_36138 +#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_f4.snap_36138" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e929ff9b5b..213e5bb99a 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_19649 -#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_f7.snap_19649" +#define SIGNATURE_HASH snap_36138 +#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_f7.snap_36138" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index ba17a8bd48..bbc8f0afff 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_19649 -#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_h7.snap_19649" +#define SIGNATURE_HASH snap_36138 +#define TS_SIGNATURE "rusEFI 2022.10.31.proteus_h7.snap_36138" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 1607eb3bdb..83981fecd6 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_21101 -#define TS_SIGNATURE "rusEFI 2022.10.31.subaru_eg33_f7.snap_21101" +#define SIGNATURE_HASH snap_37766 +#define TS_SIGNATURE "rusEFI 2022.10.31.subaru_eg33_f7.snap_37766" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 08f2eda687..4e63d0be3b 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_17891 -#define TS_SIGNATURE "rusEFI 2022.10.31.tdg-pdm8.snap_17891" +#define SIGNATURE_HASH snap_33800 +#define TS_SIGNATURE "rusEFI 2022.10.31.tdg-pdm8.snap_33800" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index c0256893c1..4c47db0317 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.all.snap_35767" + signature = "rusEFI 2022.10.31.all.snap_19036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.all.snap_35767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.all.snap_19036" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:36 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 6238134c0a..0c7e3c2f7e 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.48way.snap_33784" + signature = "rusEFI 2022.10.31.48way.snap_16915" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.48way.snap_33784" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.48way.snap_16915" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:20 UTC 2022 pageSize = 22800 page = 1 @@ -6061,8 +6061,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6201,21 +6201,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6471,12 +6471,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6568,11 +6568,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6595,22 +6595,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6620,7 +6620,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6628,35 +6628,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6690,7 +6690,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6704,10 +6703,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6719,7 +6718,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6727,7 +6726,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6735,7 +6734,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6913,7 +6912,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6935,9 +6934,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7078,8 +7077,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7087,8 +7086,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7126,30 +7125,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7213,7 +7212,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7288,12 +7287,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7327,8 +7326,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7342,8 +7341,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7352,7 +7351,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7399,11 +7398,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7656,20 +7655,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7948,10 +7947,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8089,7 +8088,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8111,7 +8110,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8133,7 +8132,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8155,7 +8154,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 2245ff7623..f050543829 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.alphax-2chan.snap_5851" + signature = "rusEFI 2022.10.31.alphax-2chan.snap_55088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.alphax-2chan.snap_5851" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.alphax-2chan.snap_55088" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:32:54 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,23 +6591,23 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "Fuel Pump output", fuelPumpPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6615,35 +6615,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6675,7 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6689,10 +6688,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6704,7 +6703,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6712,7 +6711,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6720,7 +6719,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6898,7 +6897,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6920,9 +6919,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7063,8 +7062,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7072,8 +7071,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7111,30 +7110,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7198,7 +7197,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7273,12 +7272,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7312,8 +7311,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7327,8 +7326,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7337,7 +7336,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7383,11 +7382,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7635,20 +7634,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8059,7 +8058,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c9f55d9f32..d4f9308f24 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.alphax-4chan.snap_18488" + signature = "rusEFI 2022.10.31.alphax-4chan.snap_35283" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.alphax-4chan.snap_18488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.alphax-4chan.snap_35283" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:32:56 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7639,20 +7638,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8063,7 +8062,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8085,7 +8084,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8107,7 +8106,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8129,7 +8128,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 76a34d03a3..f00d149be0 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.atlas.snap_32400" + signature = "rusEFI 2022.10.31.atlas.snap_49019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.atlas.snap_32400" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.atlas.snap_49019" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:33 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,24 +6597,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6622,35 +6622,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6686,7 +6686,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6700,10 +6699,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6715,7 +6714,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6909,7 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6931,9 +6930,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7074,8 +7073,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7083,8 +7082,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7122,30 +7121,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7209,7 +7208,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7284,12 +7283,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7323,8 +7322,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7338,8 +7337,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7348,7 +7347,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7395,11 +7394,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7653,20 +7652,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7947,10 +7946,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8088,7 +8087,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8110,7 +8109,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8132,7 +8131,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8154,7 +8153,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 2e650f33e2..406c4ae480 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.core8.snap_55886" + signature = "rusEFI 2022.10.31.core8.snap_7077" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.core8.snap_55886" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.core8.snap_7077" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:18 UTC 2022 pageSize = 22800 page = 1 @@ -6061,8 +6061,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6201,21 +6201,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6471,12 +6471,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6568,11 +6568,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6595,22 +6595,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6620,7 +6620,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6628,35 +6628,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6690,7 +6690,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6704,10 +6703,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6719,7 +6718,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6727,7 +6726,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6735,7 +6734,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6913,7 +6912,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6935,9 +6934,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7078,8 +7077,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7087,8 +7086,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7126,30 +7125,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7213,7 +7212,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7288,12 +7287,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7327,8 +7326,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7342,8 +7341,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7352,7 +7351,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7399,11 +7398,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7656,20 +7655,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7948,10 +7947,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8089,7 +8088,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8111,7 +8110,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8133,7 +8132,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8155,7 +8154,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index c281e8e7cb..92f7a3eccf 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.cypress.snap_35767" + signature = "rusEFI 2022.10.31.cypress.snap_19036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.cypress.snap_35767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.cypress.snap_19036" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 31 19:32:52 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 633fbb004d..7549a7c02d 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.f407-discovery.snap_35767" + signature = "rusEFI 2022.10.31.f407-discovery.snap_19036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.f407-discovery.snap_35767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.f407-discovery.snap_19036" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:30 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 63a5d16249..f66bc8002e 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.f429-discovery.snap_35767" + signature = "rusEFI 2022.10.31.f429-discovery.snap_19036" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.f429-discovery.snap_35767" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.f429-discovery.snap_19036" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:31 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8eaf166db6..e82512dc40 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.frankenso_na6.snap_30579" + signature = "rusEFI 2022.10.31.frankenso_na6.snap_46744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.frankenso_na6.snap_30579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.frankenso_na6.snap_46744" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:21 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 020fd579d2..757b6b1704 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.harley81.snap_36504" + signature = "rusEFI 2022.10.31.harley81.snap_20339" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.harley81.snap_36504" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.harley81.snap_20339" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:32:57 UTC 2022 pageSize = 22800 page = 1 @@ -6060,7 +6060,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,19 +6199,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,24 +6591,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6616,35 +6616,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6676,7 +6676,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6690,10 +6689,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6705,7 +6704,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6713,7 +6712,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6721,7 +6720,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6899,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6921,9 +6920,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7064,8 +7063,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7073,8 +7072,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7112,30 +7111,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7199,7 +7198,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7274,12 +7273,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7313,8 +7312,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7328,8 +7327,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7636,20 +7635,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8060,7 +8059,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold1 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8082,7 +8081,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8104,7 +8103,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8126,7 +8125,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9f5e963ec5..db9063965c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen-gm-e67.snap_2998" + signature = "rusEFI 2022.10.31.hellen-gm-e67.snap_51805" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen-gm-e67.snap_2998" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen-gm-e67.snap_51805" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:11 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7637,20 +7636,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8061,7 +8060,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8083,7 +8082,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8105,7 +8104,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8127,7 +8126,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 0f8f1688c2..36bd7ddd0e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen-nb1.snap_47739" + signature = "rusEFI 2022.10.31.hellen-nb1.snap_31632" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen-nb1.snap_47739" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen-nb1.snap_31632" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:09 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7637,20 +7636,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8062,7 +8061,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8084,7 +8083,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8106,7 +8105,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8128,7 +8127,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f86d00b4fc..0680f0b64f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen121nissan.snap_13149" + signature = "rusEFI 2022.10.31.hellen121nissan.snap_62134" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen121nissan.snap_13149" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen121nissan.snap_62134" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:02 UTC 2022 pageSize = 22800 page = 1 @@ -6060,7 +6060,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,19 +6199,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,24 +6591,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6616,35 +6616,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6676,7 +6676,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6690,10 +6689,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6705,7 +6704,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6713,7 +6712,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6721,7 +6720,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6899,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6921,9 +6920,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7064,8 +7063,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7073,8 +7072,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7112,30 +7111,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7199,7 +7198,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7274,12 +7273,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7313,8 +7312,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7328,8 +7327,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7633,20 +7632,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8060,7 +8059,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8082,7 +8081,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8104,7 +8103,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8126,7 +8125,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index eca74c0866..d25844c0b9 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen121vag.snap_18637" + signature = "rusEFI 2022.10.31.hellen121vag.snap_35110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen121vag.snap_18637" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen121vag.snap_35110" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:01 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7636,20 +7635,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8065,7 +8064,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8087,7 +8086,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8109,7 +8108,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8131,7 +8130,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index eb4e3ecb06..9bab93a2d0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen128.snap_63116" + signature = "rusEFI 2022.10.31.hellen128.snap_14183" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen128.snap_63116" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen128.snap_14183" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:32:59 UTC 2022 pageSize = 22800 page = 1 @@ -6060,7 +6060,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,19 +6199,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,24 +6591,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6616,35 +6616,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6676,7 +6676,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6690,10 +6689,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6705,7 +6704,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6713,7 +6712,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6721,7 +6720,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6899,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6921,9 +6920,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7064,8 +7063,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7073,8 +7072,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7112,30 +7111,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7199,7 +7198,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7274,12 +7273,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7313,8 +7312,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7328,8 +7327,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7633,20 +7632,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8060,7 +8059,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8082,7 +8081,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8104,7 +8103,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8126,7 +8125,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8e3b1537a9..39b48e3786 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen154hyundai.snap_15775" + signature = "rusEFI 2022.10.31.hellen154hyundai.snap_64628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen154hyundai.snap_15775" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen154hyundai.snap_64628" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:04 UTC 2022 pageSize = 22800 page = 1 @@ -6060,7 +6060,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,19 +6199,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,24 +6591,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6616,35 +6616,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6676,7 +6676,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6690,10 +6689,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6705,7 +6704,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6713,7 +6712,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6721,7 +6720,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6899,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6921,9 +6920,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7064,8 +7063,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7073,8 +7072,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7112,30 +7111,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7199,7 +7198,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7274,12 +7273,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7313,8 +7312,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7328,8 +7327,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7633,20 +7632,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8059,7 +8058,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 6d22565582..0207630630 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen72.snap_34108" + signature = "rusEFI 2022.10.31.hellen72.snap_17623" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen72.snap_34108" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen72.snap_17623" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:06 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7637,20 +7636,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8062,7 +8061,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8084,7 +8083,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8106,7 +8105,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8128,7 +8127,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 26b53e921c..047853388c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen81.snap_21437" + signature = "rusEFI 2022.10.31.hellen81.snap_37462" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen81.snap_21437" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen81.snap_37462" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:08 UTC 2022 pageSize = 22800 page = 1 @@ -6058,8 +6058,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6198,21 +6198,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6468,12 +6468,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6565,11 +6565,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6592,24 +6592,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6617,35 +6617,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6677,7 +6677,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6691,10 +6690,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6706,7 +6705,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6714,7 +6713,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6722,7 +6721,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6900,7 +6899,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6922,9 +6921,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7065,8 +7064,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7074,8 +7073,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7113,30 +7112,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7200,7 +7199,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7275,12 +7274,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7314,8 +7313,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7329,8 +7328,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7339,7 +7338,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7385,11 +7384,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7634,20 +7633,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8058,7 +8057,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8080,7 +8079,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8102,7 +8101,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8124,7 +8123,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 0185b97cae..032652c62d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellen88bmw.snap_39035" + signature = "rusEFI 2022.10.31.hellen88bmw.snap_22928" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellen88bmw.snap_39035" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellen88bmw.snap_22928" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:05 UTC 2022 pageSize = 22800 page = 1 @@ -6060,7 +6060,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,19 +6199,19 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,24 +6591,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6616,35 +6616,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6676,7 +6676,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6690,10 +6689,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6705,7 +6704,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6713,7 +6712,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6721,7 +6720,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6899,7 +6898,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6921,9 +6920,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7064,8 +7063,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7073,8 +7072,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7112,30 +7111,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7199,7 +7198,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7274,12 +7273,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7313,8 +7312,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7328,8 +7327,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7337,7 +7336,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7383,11 +7382,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7632,20 +7631,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8056,7 +8055,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8078,7 +8077,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8100,7 +8099,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8122,7 +8121,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 36fd3450fe..53d11a8ffb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellenNA6.snap_14976" + signature = "rusEFI 2022.10.31.hellenNA6.snap_64363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellenNA6.snap_14976" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellenNA6.snap_64363" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:12 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7637,20 +7636,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8063,7 +8062,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8085,7 +8084,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8107,7 +8106,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8129,7 +8128,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 8de4c3dced..fb3bd5fae7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.hellenNA8_96.snap_14943" + signature = "rusEFI 2022.10.31.hellenNA8_96.snap_64436" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.hellenNA8_96.snap_14943" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.hellenNA8_96.snap_64436" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:14 UTC 2022 pageSize = 22800 page = 1 @@ -6060,8 +6060,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6200,21 +6200,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6470,12 +6470,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6567,11 +6567,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6594,24 +6594,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6619,35 +6619,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6679,7 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6693,10 +6692,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6708,7 +6707,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6716,7 +6715,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6902,7 +6901,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6924,9 +6923,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7115,30 +7114,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7202,7 +7201,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7277,12 +7276,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7316,8 +7315,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7341,7 +7340,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7387,11 +7386,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7637,20 +7636,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8061,7 +8060,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8083,7 +8082,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8105,7 +8104,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8127,7 +8126,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 8a2146879a..b7eed82656 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.kin.snap_10619" + signature = "rusEFI 2022.10.31.kin.snap_59536" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.kin.snap_10619" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.kin.snap_59536" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 31 19:32:50 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6204,21 +6204,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6474,12 +6474,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6571,11 +6571,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6598,22 +6598,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6623,7 +6623,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6631,35 +6631,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6695,7 +6695,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6709,10 +6708,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6724,7 +6723,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6732,7 +6731,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6740,7 +6739,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6918,7 +6917,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6940,9 +6939,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7083,8 +7082,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7092,8 +7091,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7131,30 +7130,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7218,7 +7217,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7293,12 +7292,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7332,8 +7331,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7347,8 +7346,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7357,7 +7356,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7404,11 +7403,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7662,20 +7661,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7957,10 +7956,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8098,7 +8097,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8120,7 +8119,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8142,7 +8141,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8164,7 +8163,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 7cf45c9c76..668052e663 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.mre_f4.snap_60599" + signature = "rusEFI 2022.10.31.mre_f4.snap_11612" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.mre_f4.snap_60599" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.mre_f4.snap_11612" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:17 UTC 2022 pageSize = 22800 page = 1 @@ -6061,8 +6061,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6201,21 +6201,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6471,12 +6471,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6568,11 +6568,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6595,24 +6595,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6620,35 +6620,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6680,7 +6680,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6694,10 +6693,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6709,7 +6708,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6725,7 +6724,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6901,7 +6900,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6923,9 +6922,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7066,8 +7065,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7075,8 +7074,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7114,8 +7113,8 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs @@ -7123,20 +7122,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "microRusEFI main relay control is hard wired on pin #29" dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7200,7 +7199,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7275,12 +7274,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7314,8 +7313,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7329,8 +7328,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7635,20 +7634,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8067,7 +8066,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8089,7 +8088,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8111,7 +8110,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8133,7 +8132,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 445621e5f3..3654acc8a8 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.mre_f7.snap_60599" + signature = "rusEFI 2022.10.31.mre_f7.snap_11612" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.mre_f7.snap_60599" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.mre_f7.snap_11612" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:15 UTC 2022 pageSize = 22800 page = 1 @@ -6061,8 +6061,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6201,21 +6201,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6471,12 +6471,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6568,11 +6568,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6595,24 +6595,24 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6620,35 +6620,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6680,7 +6680,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6694,10 +6693,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6709,7 +6708,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6725,7 +6724,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6901,7 +6900,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6923,9 +6922,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7066,8 +7065,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7075,8 +7074,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7114,8 +7113,8 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs @@ -7123,20 +7122,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "microRusEFI main relay control is hard wired on pin #29" dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7200,7 +7199,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7275,12 +7274,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7314,8 +7313,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7329,8 +7328,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7338,7 +7337,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7384,11 +7383,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7635,20 +7634,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8067,7 +8066,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8089,7 +8088,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8111,7 +8110,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8133,7 +8132,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c174987534..b701cbfc65 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.prometheus_405.snap_21073" + signature = "rusEFI 2022.10.31.prometheus_405.snap_37818" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.prometheus_405.snap_21073" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.prometheus_405.snap_37818" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:24 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,22 +6591,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6616,7 +6616,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6624,35 +6624,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6688,7 +6688,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6702,10 +6701,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6725,7 +6724,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6733,7 +6732,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6911,7 +6910,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6933,9 +6932,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7085,8 +7084,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7124,30 +7123,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7211,7 +7210,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7286,12 +7285,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7325,8 +7324,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7340,8 +7339,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7350,7 +7349,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7397,11 +7396,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7655,20 +7654,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7950,10 +7949,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8091,7 +8090,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8113,7 +8112,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8135,7 +8134,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8157,7 +8156,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 12cf0ad500..dd966b6486 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.prometheus_469.snap_21073" + signature = "rusEFI 2022.10.31.prometheus_469.snap_37818" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.prometheus_469.snap_21073" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.prometheus_469.snap_37818" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:22 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,22 +6591,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6616,7 +6616,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6624,35 +6624,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6688,7 +6688,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6702,10 +6701,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6725,7 +6724,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6733,7 +6732,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6911,7 +6910,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6933,9 +6932,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7085,8 +7084,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7124,30 +7123,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7211,7 +7210,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7286,12 +7285,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7325,8 +7324,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7340,8 +7339,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7350,7 +7349,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7397,11 +7396,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7655,20 +7654,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7950,10 +7949,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8091,7 +8090,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8113,7 +8112,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8135,7 +8134,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8157,7 +8156,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6222e04c3e..6e60908a8f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.proteus_f4.snap_19649" + signature = "rusEFI 2022.10.31.proteus_f4.snap_36138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.proteus_f4.snap_19649" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.proteus_f4.snap_36138" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:27 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,22 +6591,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6616,7 +6616,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6624,35 +6624,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6675,7 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Aux ADC #8", auxAnalogInputs8 field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6689,10 +6688,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "AUX Serial TX", auxSerialTxPin @@ -6701,7 +6700,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6709,7 +6708,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6893,7 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6915,9 +6914,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7058,8 +7057,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7106,30 +7105,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7193,7 +7192,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7268,12 +7267,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7307,8 +7306,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7322,8 +7321,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7331,7 +7330,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7377,11 +7376,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7624,20 +7623,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8059,7 +8058,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0c7aaaba75..b41ad49142 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.proteus_f7.snap_19649" + signature = "rusEFI 2022.10.31.proteus_f7.snap_36138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.proteus_f7.snap_19649" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.proteus_f7.snap_36138" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:25 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,22 +6591,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6616,7 +6616,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6624,35 +6624,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6675,7 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Aux ADC #8", auxAnalogInputs8 field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6689,10 +6688,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "AUX Serial TX", auxSerialTxPin @@ -6701,7 +6700,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6709,7 +6708,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6893,7 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6915,9 +6914,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7058,8 +7057,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7106,30 +7105,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7193,7 +7192,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7268,12 +7267,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7307,8 +7306,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7322,8 +7321,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7331,7 +7330,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7377,11 +7376,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7624,20 +7623,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8059,7 +8058,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 47e0738775..67a74d01ca 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.proteus_h7.snap_19649" + signature = "rusEFI 2022.10.31.proteus_h7.snap_36138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.proteus_h7.snap_19649" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.proteus_h7.snap_36138" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:28 UTC 2022 pageSize = 22800 page = 1 @@ -6057,8 +6057,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6197,21 +6197,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6467,12 +6467,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6564,11 +6564,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6591,22 +6591,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6616,7 +6616,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6624,35 +6624,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6675,7 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Aux ADC #8", auxAnalogInputs8 field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6689,10 +6688,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "AUX Serial TX", auxSerialTxPin @@ -6701,7 +6700,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6709,7 +6708,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6893,7 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6915,9 +6914,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7058,8 +7057,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7067,8 +7066,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7106,30 +7105,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7193,7 +7192,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7268,12 +7267,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7307,8 +7306,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7322,8 +7321,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7331,7 +7330,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7377,11 +7376,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7624,20 +7623,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -8059,7 +8058,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 291a44b157..d360e98f1c 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.subaru_eg33_f7.snap_21101" + signature = "rusEFI 2022.10.31.subaru_eg33_f7.snap_37766" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.subaru_eg33_f7.snap_21101" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.subaru_eg33_f7.snap_37766" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:39:14 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 Mon Oct 31 19:32:53 UTC 2022 pageSize = 22800 page = 1 @@ -6059,8 +6059,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6199,21 +6199,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6469,12 +6469,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6566,11 +6566,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6593,22 +6593,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6618,7 +6618,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6626,35 +6626,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6688,7 +6688,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6702,10 +6701,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6717,7 +6716,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6725,7 +6724,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6733,7 +6732,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6911,7 +6910,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6933,9 +6932,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7076,8 +7075,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7085,8 +7084,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7124,30 +7123,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7211,7 +7210,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7286,12 +7285,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7325,8 +7324,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7340,8 +7339,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7350,7 +7349,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7396,11 +7395,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7650,20 +7649,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7940,10 +7939,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8081,7 +8080,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8103,7 +8102,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8125,7 +8124,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8147,7 +8146,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index e35f3b8d2c..d6ac7b2f3c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.31.tdg-pdm8.snap_17891" + signature = "rusEFI 2022.10.31.tdg-pdm8.snap_33800" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.31.tdg-pdm8.snap_17891" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.31.tdg-pdm8.snap_33800" ; 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 @@ -86,7 +86,7 @@ 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 Mon Oct 31 18:40:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:34 UTC 2022 pageSize = 22800 page = 1 @@ -6063,8 +6063,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1} - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1} + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java field = "Ignition Pin 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} @@ -6203,21 +6203,21 @@ dialog = wideband_stateDialog, "wideband_state" field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} - field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} - field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + field = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = "" - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1} dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -6473,12 +6473,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -6570,11 +6570,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -6597,22 +6597,22 @@ dialog = wideband_stateDialog, "wideband_state" field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 field = "ETB#1 Dir #2", etbIo1_directionPin2 field = "ETB#1 Control", etbIo1_controlPin @@ -6622,7 +6622,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ETB#2 Control", etbIo2_controlPin field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -6630,35 +6630,35 @@ dialog = wideband_stateDialog, "wideband_state" field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -6694,7 +6694,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -6708,10 +6707,10 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@ -6723,7 +6722,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -6731,7 +6730,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -6739,7 +6738,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -6917,7 +6916,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -6939,9 +6938,9 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -7082,8 +7081,8 @@ dialog = wideband_stateDialog, "wideband_state" ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -7091,8 +7090,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -7130,30 +7129,30 @@ dialog = wideband_stateDialog, "wideband_state" panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" - field = "Pin", mainRelayPin - field = "Pin mode", mainRelayPinMode + field = "Output", mainRelayPin + field = "Output mode", mainRelayPinMode dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -7217,7 +7216,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -7292,12 +7291,12 @@ dialog = wideband_stateDialog, "wideband_state" panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -7331,8 +7330,8 @@ dialog = wideband_stateDialog, "wideband_state" dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -7346,8 +7345,8 @@ dialog = wideband_stateDialog, "wideband_state" field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -7356,7 +7355,7 @@ dialog = wideband_stateDialog, "wideband_state" panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != 0 } ; @@ -7403,11 +7402,11 @@ dialog = wideband_stateDialog, "wideband_state" field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -7661,20 +7660,20 @@ dialog = wideband_stateDialog, "wideband_state" field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -7956,10 +7955,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1 + field = "trigger stimulator output #2", triggerSimulatorPins2 + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -8097,7 +8096,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -8119,7 +8118,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -8141,7 +8140,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -8163,7 +8162,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0} 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 d1972b53fc..5ef61ffc23 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 18:40:14 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 31 19:33:38 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1180,7 +1180,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.10.31.all.snap_35767"; + public static final String TS_SIGNATURE = "rusEFI 2022.10.31.all.snap_19036"; 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 = 1280;