diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 4b16b88445..cdb133c980 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:30:00 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 24 16:45:43 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1629,7 +1629,7 @@ struct engine_configuration_s { /** * offset 756 */ - uint8_t unusedTrigMode; + adc_channel_e maf2AdcChannel; /** * need 4 byte alignment units @@ -5084,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:30:00 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 24 16:45:43 UTC 2022 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 89e1207fad..1303ce36ca 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -392,6 +392,7 @@ #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" +#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1" #define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2" @@ -1025,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2192303047 +#define SIGNATURE_HASH 3165638592 #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 @@ -1297,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.24.cypress.2192303047" +#define TS_SIGNATURE "rusEFI 2022.10.24.cypress.3165638592" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 2bdb77d9f8..841cd225ef 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:29:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 24 16:45:41 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1629,7 +1629,7 @@ struct engine_configuration_s { /** * offset 756 */ - uint8_t unusedTrigMode; + adc_channel_e maf2AdcChannel; /** * need 4 byte alignment units @@ -5084,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Oct 21 02:29:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 24 16:45:41 UTC 2022 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 85c44d22eb..f211845763 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -392,6 +392,7 @@ #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" +#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1" #define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2" @@ -1025,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3934011659 +#define SIGNATURE_HASH 3564662028 #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 @@ -1297,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.24.kin.3934011659" +#define TS_SIGNATURE "rusEFI 2022.10.24.kin.3564662028" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 43271f61bd..4f66b4ea74 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:02 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 24 16:45:45 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1629,7 +1629,7 @@ struct engine_configuration_s { /** * offset 756 */ - uint8_t unusedTrigMode; + adc_channel_e maf2AdcChannel; /** * need 4 byte alignment units @@ -5084,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Fri Oct 21 02:30:02 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 24 16:45:45 UTC 2022 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 46e7ab03fe..75b33c3bdb 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 @@ -402,6 +402,7 @@ #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" +#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1" #define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2" @@ -991,7 +992,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4222958109 +#define SIGNATURE_HASH 3316717082 #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 @@ -1264,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.24.subaru_eg33_f7.4222958109" +#define TS_SIGNATURE "rusEFI 2022.10.24.subaru_eg33_f7.3316717082" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index eac9b62193..e1cc86b306 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -298,6 +298,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 69aa3884df..16cffa6e09 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -385,6 +385,8 @@ outputRequestPeriodGauge = outputRequestPeriod,"outputRequestPeriod", "", -1.0,- mapFastGauge = mapFast,"mapFast", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, 0,0 luaGauges1Gauge = luaGauges1,"luaGauges 1", "value", 0.0,50000.0, 0.0,50000.0, 0.0,50000.0, 3,3 luaGauges2Gauge = luaGauges2,"luaGauges 2", "value", 0.0,50000.0, 0.0,50000.0, 0.0,50000.0, 3,3 +rawMaf2Gauge = rawMaf2,"rawMaf2", "V", 0.0,5.0, 0.0,5.0, 0.0,5.0, 3,3 +mafMeasured2Gauge = mafMeasured2,"MAF sensor 2", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -523,8 +525,4 @@ unusedAtTheEnd135Gauge = unusedAtTheEnd135,"unusedAtTheEnd 135", "", 0.0,0.0, 0. unusedAtTheEnd136Gauge = unusedAtTheEnd136,"unusedAtTheEnd 136", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd137Gauge = unusedAtTheEnd137,"unusedAtTheEnd 137", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd138Gauge = unusedAtTheEnd138,"unusedAtTheEnd 138", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd139Gauge = unusedAtTheEnd139,"unusedAtTheEnd 139", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd140Gauge = unusedAtTheEnd140,"unusedAtTheEnd 140", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd141Gauge = unusedAtTheEnd141,"unusedAtTheEnd 141", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd142Gauge = unusedAtTheEnd142,"unusedAtTheEnd 142", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 alignmentFill_at_766Gauge = alignmentFill_at_766,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 7bb8919595..0be93ba79c 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -401,148 +401,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index c42be07e79..fe820c3f9b 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -241,148 +241,146 @@ outputRequestPeriod("outputRequestPeriod", SensorCategory.SENSOR_INPUTS, FieldTy mapFast("mapFast", SensorCategory.SENSOR_INPUTS, FieldType.INT, 612, 1.0, -1.0, -1.0, ""), luaGauges1("luaGauges 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 616, 1.0, 0.0, 50000.0, "value"), luaGauges2("luaGauges 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 620, 1.0, 0.0, 50000.0, "value"), -unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 624, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 625, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 626, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 627, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 628, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 629, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 630, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 631, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 632, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 633, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 634, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 635, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 638, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 639, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 640, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 641, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 642, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 643, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 644, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 645, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 646, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 647, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 648, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 649, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 650, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 651, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 652, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 653, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 654, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 655, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 656, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 657, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 658, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 659, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 660, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 661, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 662, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 663, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 664, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 665, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 666, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 667, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 668, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 669, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 670, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 671, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 672, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 673, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 674, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 675, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 676, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 677, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 678, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 679, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 680, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 681, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 682, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 683, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 684, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 685, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd63("unusedAtTheEnd 63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 686, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd64("unusedAtTheEnd 64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 687, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd65("unusedAtTheEnd 65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 688, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd66("unusedAtTheEnd 66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 689, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd67("unusedAtTheEnd 67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 690, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd68("unusedAtTheEnd 68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 691, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd69("unusedAtTheEnd 69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 692, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd70("unusedAtTheEnd 70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 693, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd71("unusedAtTheEnd 71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 694, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd72("unusedAtTheEnd 72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 695, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd73("unusedAtTheEnd 73", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 696, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd74("unusedAtTheEnd 74", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 697, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd75("unusedAtTheEnd 75", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 698, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd76("unusedAtTheEnd 76", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 699, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd77("unusedAtTheEnd 77", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 700, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd78("unusedAtTheEnd 78", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 701, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd79("unusedAtTheEnd 79", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 702, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd80("unusedAtTheEnd 80", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 703, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd81("unusedAtTheEnd 81", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 704, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd82("unusedAtTheEnd 82", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 705, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd83("unusedAtTheEnd 83", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 706, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd84("unusedAtTheEnd 84", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 707, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd85("unusedAtTheEnd 85", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 708, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd86("unusedAtTheEnd 86", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 709, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd87("unusedAtTheEnd 87", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 710, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd88("unusedAtTheEnd 88", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 711, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd89("unusedAtTheEnd 89", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 712, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd90("unusedAtTheEnd 90", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 713, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd91("unusedAtTheEnd 91", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 714, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd92("unusedAtTheEnd 92", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 715, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd93("unusedAtTheEnd 93", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 716, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd94("unusedAtTheEnd 94", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 717, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd95("unusedAtTheEnd 95", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 718, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd96("unusedAtTheEnd 96", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 719, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd97("unusedAtTheEnd 97", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 720, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd98("unusedAtTheEnd 98", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 721, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd99("unusedAtTheEnd 99", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 722, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd100("unusedAtTheEnd 100", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 723, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd101("unusedAtTheEnd 101", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 724, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd102("unusedAtTheEnd 102", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 725, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd103("unusedAtTheEnd 103", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 726, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd104("unusedAtTheEnd 104", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 727, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd105("unusedAtTheEnd 105", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 728, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd106("unusedAtTheEnd 106", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 729, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd107("unusedAtTheEnd 107", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 730, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd108("unusedAtTheEnd 108", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 731, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd109("unusedAtTheEnd 109", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 732, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd110("unusedAtTheEnd 110", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 733, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd111("unusedAtTheEnd 111", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 734, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd112("unusedAtTheEnd 112", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 735, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd113("unusedAtTheEnd 113", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 736, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd114("unusedAtTheEnd 114", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 737, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd115("unusedAtTheEnd 115", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 738, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd116("unusedAtTheEnd 116", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 739, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd117("unusedAtTheEnd 117", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 740, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd118("unusedAtTheEnd 118", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 741, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd119("unusedAtTheEnd 119", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 742, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd120("unusedAtTheEnd 120", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 743, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd121("unusedAtTheEnd 121", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 744, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd122("unusedAtTheEnd 122", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 745, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd123("unusedAtTheEnd 123", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 746, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd124("unusedAtTheEnd 124", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 747, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd125("unusedAtTheEnd 125", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 748, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd126("unusedAtTheEnd 126", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 749, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd127("unusedAtTheEnd 127", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 750, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd128("unusedAtTheEnd 128", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 751, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd129("unusedAtTheEnd 129", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 752, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd130("unusedAtTheEnd 130", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 753, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd131("unusedAtTheEnd 131", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 754, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd132("unusedAtTheEnd 132", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 755, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd133("unusedAtTheEnd 133", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 756, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd134("unusedAtTheEnd 134", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 757, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd135("unusedAtTheEnd 135", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 758, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd136("unusedAtTheEnd 136", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 759, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd137("unusedAtTheEnd 137", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 760, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd138("unusedAtTheEnd 138", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 761, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd139("unusedAtTheEnd 139", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 762, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd140("unusedAtTheEnd 140", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 763, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd141("unusedAtTheEnd 141", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 764, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd142("unusedAtTheEnd 142", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 765, 1.0, 0.0, 0.0, ""), +rawMaf2("rawMaf2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 624, 0.001, 0.0, 5.0, "V"), +mafMeasured2("MAF sensor 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 626, 0.1, 0.0, 0.0, "kg/h"), +unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 628, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 629, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 630, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 631, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 632, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 633, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 634, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 635, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 638, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 639, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 640, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 641, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 642, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 643, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 644, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 645, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 646, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 647, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 648, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 649, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 650, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 651, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 652, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 653, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 654, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 655, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 656, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 657, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 658, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 659, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 660, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 661, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 662, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 663, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 664, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 665, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 666, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 667, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 668, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 669, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 670, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 671, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 672, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 673, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 674, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 675, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 676, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 677, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 678, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 679, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 680, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 681, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 682, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 683, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 684, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 685, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 686, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 687, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 688, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 689, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd63("unusedAtTheEnd 63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 690, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd64("unusedAtTheEnd 64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 691, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd65("unusedAtTheEnd 65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 692, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd66("unusedAtTheEnd 66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 693, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd67("unusedAtTheEnd 67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 694, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd68("unusedAtTheEnd 68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 695, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd69("unusedAtTheEnd 69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 696, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd70("unusedAtTheEnd 70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 697, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd71("unusedAtTheEnd 71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 698, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd72("unusedAtTheEnd 72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 699, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd73("unusedAtTheEnd 73", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 700, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd74("unusedAtTheEnd 74", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 701, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd75("unusedAtTheEnd 75", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 702, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd76("unusedAtTheEnd 76", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 703, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd77("unusedAtTheEnd 77", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 704, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd78("unusedAtTheEnd 78", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 705, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd79("unusedAtTheEnd 79", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 706, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd80("unusedAtTheEnd 80", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 707, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd81("unusedAtTheEnd 81", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 708, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd82("unusedAtTheEnd 82", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 709, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd83("unusedAtTheEnd 83", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 710, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd84("unusedAtTheEnd 84", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 711, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd85("unusedAtTheEnd 85", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 712, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd86("unusedAtTheEnd 86", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 713, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd87("unusedAtTheEnd 87", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 714, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd88("unusedAtTheEnd 88", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 715, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd89("unusedAtTheEnd 89", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 716, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd90("unusedAtTheEnd 90", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 717, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd91("unusedAtTheEnd 91", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 718, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd92("unusedAtTheEnd 92", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 719, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd93("unusedAtTheEnd 93", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 720, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd94("unusedAtTheEnd 94", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 721, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd95("unusedAtTheEnd 95", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 722, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd96("unusedAtTheEnd 96", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 723, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd97("unusedAtTheEnd 97", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 724, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd98("unusedAtTheEnd 98", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 725, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd99("unusedAtTheEnd 99", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 726, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd100("unusedAtTheEnd 100", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 727, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd101("unusedAtTheEnd 101", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 728, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd102("unusedAtTheEnd 102", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 729, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd103("unusedAtTheEnd 103", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 730, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd104("unusedAtTheEnd 104", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 731, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd105("unusedAtTheEnd 105", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 732, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd106("unusedAtTheEnd 106", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 733, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd107("unusedAtTheEnd 107", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 734, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd108("unusedAtTheEnd 108", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 735, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd109("unusedAtTheEnd 109", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 736, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd110("unusedAtTheEnd 110", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 737, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd111("unusedAtTheEnd 111", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 738, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd112("unusedAtTheEnd 112", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 739, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd113("unusedAtTheEnd 113", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 740, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd114("unusedAtTheEnd 114", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 741, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd115("unusedAtTheEnd 115", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 742, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd116("unusedAtTheEnd 116", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 743, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd117("unusedAtTheEnd 117", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 744, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd118("unusedAtTheEnd 118", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 745, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd119("unusedAtTheEnd 119", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 746, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd120("unusedAtTheEnd 120", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 747, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd121("unusedAtTheEnd 121", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 748, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd122("unusedAtTheEnd 122", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 749, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd123("unusedAtTheEnd 123", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 750, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd124("unusedAtTheEnd 124", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 751, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd125("unusedAtTheEnd 125", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 752, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd126("unusedAtTheEnd 126", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 753, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd127("unusedAtTheEnd 127", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 754, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd128("unusedAtTheEnd 128", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 755, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd129("unusedAtTheEnd 129", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 756, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd130("unusedAtTheEnd 130", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 757, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd131("unusedAtTheEnd 131", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 758, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd132("unusedAtTheEnd 132", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 759, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd133("unusedAtTheEnd 133", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 760, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd134("unusedAtTheEnd 134", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 761, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd135("unusedAtTheEnd 135", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 762, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd136("unusedAtTheEnd 136", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 763, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd137("unusedAtTheEnd 137", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 764, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd138("unusedAtTheEnd 138", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 765, 1.0, 0.0, 0.0, ""), alignmentFill_at_766("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 766, 1.0, -20.0, 100.0, "units"), m_knockRetard("Degrees retarded: larger number = more retard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 768, 1.0, -1.0, -1.0, ""), m_knockThreshold("m_knockThreshold", SensorCategory.SENSOR_INPUTS, FieldType.INT, 772, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index e9489dbdab..bf29f32f09 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Oct 19 10:46:16 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1419,9 +1419,20 @@ struct output_channels_s { */ float luaGauges[LUA_GAUGE_COUNT]; /** + V * offset 624 */ - uint8_t unusedAtTheEnd[142]; + scaled_channel rawMaf2 = (uint16_t)0; + /** + * @@GAUGE_NAME_AIR_FLOW_MEASURED_2@@ + kg/h + * offset 626 + */ + scaled_channel mafMeasured2 = (uint16_t)0; + /** + * offset 628 + */ + uint8_t unusedAtTheEnd[138]; /** * need 4 byte alignment units @@ -1432,4 +1443,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 768); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Oct 19 10:46:16 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Oct 24 16:45:39 UTC 2022 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index b545ea1a15..dd361e3007 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -251,4 +251,6 @@ static constexpr LogField fields[] = { {engine->outputChannels.mapFast, "mapFast", "", 0}, {engine->outputChannels.luaGauges[0], "luaGauges 1", "value", 3}, {engine->outputChannels.luaGauges[1], "luaGauges 2", "value", 3}, + {engine->outputChannels.rawMaf2, "rawMaf2", "V", 3}, + {engine->outputChannels.mafMeasured2, "MAF sensor 2", "kg/h", 1}, }; diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 11b9c53d4b..d1a6d19bf3 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:31:02 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:43 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1629,7 +1629,7 @@ struct engine_configuration_s { /** * offset 756 */ - uint8_t unusedTrigMode; + adc_channel_e maf2AdcChannel; /** * need 4 byte alignment units @@ -5084,4 +5084,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22800); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Oct 21 02:31:02 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:43 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d1d53d62ac..3d583e0cbb 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -392,6 +392,7 @@ #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" #define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate" #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF sensor" +#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF sensor 2" #define GAUGE_NAME_AIR_MASS "air mass" #define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear 1" #define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear 2" @@ -1025,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2192303047 +#define SIGNATURE_HASH 3165638592 #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 @@ -1297,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.24.all.2192303047" +#define TS_SIGNATURE "rusEFI 2022.10.24.all.3165638592" #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 cfbfb1d9d8..e403fc0da0 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 null // -#define SIGNATURE_HASH 2509040520 -#define TS_SIGNATURE "rusEFI 2022.10.24.48way.2509040520" +#define SIGNATURE_HASH 2877867919 +#define TS_SIGNATURE "rusEFI 2022.10.24.48way.2877867919" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index d12d756d0d..4f220d7906 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2192303047 -#define TS_SIGNATURE "rusEFI 2022.10.24.all.2192303047" +#define SIGNATURE_HASH 3165638592 +#define TS_SIGNATURE "rusEFI 2022.10.24.all.3165638592" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 30d63d561a..d3b18edbc2 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2964946603 -#define TS_SIGNATURE "rusEFI 2022.10.24.alphax-2chan.2964946603" +#define SIGNATURE_HASH 2394772140 +#define TS_SIGNATURE "rusEFI 2022.10.24.alphax-2chan.2394772140" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 0c82442038..92b9352558 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 162996296 -#define TS_SIGNATURE "rusEFI 2022.10.24.alphax-4chan.162996296" +#define SIGNATURE_HASH 934480975 +#define TS_SIGNATURE "rusEFI 2022.10.24.alphax-4chan.934480975" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ddb4f63442..42865130cc 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2657162976 -#define TS_SIGNATURE "rusEFI 2022.10.24.atlas.2657162976" +#define SIGNATURE_HASH 2690988775 +#define TS_SIGNATURE "rusEFI 2022.10.24.atlas.2690988775" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 6c3992a9fd..3a2559c371 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1950855742 -#define TS_SIGNATURE "rusEFI 2022.10.24.core8.1950855742" +#define SIGNATURE_HASH 1245945401 +#define TS_SIGNATURE "rusEFI 2022.10.24.core8.1245945401" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 1469eaac0d..7284f1c9fc 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 null // -#define SIGNATURE_HASH 2192303047 -#define TS_SIGNATURE "rusEFI 2022.10.24.cypress.2192303047" +#define SIGNATURE_HASH 3165638592 +#define TS_SIGNATURE "rusEFI 2022.10.24.cypress.3165638592" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 143dc15058..4d70fa79f3 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 null // -#define SIGNATURE_HASH 2192303047 -#define TS_SIGNATURE "rusEFI 2022.10.24.f407-discovery.2192303047" +#define SIGNATURE_HASH 3165638592 +#define TS_SIGNATURE "rusEFI 2022.10.24.f407-discovery.3165638592" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index ce2ccd6c37..69836984f5 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2192303047 -#define TS_SIGNATURE "rusEFI 2022.10.24.f429-discovery.2192303047" +#define SIGNATURE_HASH 3165638592 +#define TS_SIGNATURE "rusEFI 2022.10.24.f429-discovery.3165638592" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index f0ce5950c0..5c69db8d64 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3234275075 -#define TS_SIGNATURE "rusEFI 2022.10.24.frankenso_na6.3234275075" +#define SIGNATURE_HASH 4274205444 +#define TS_SIGNATURE "rusEFI 2022.10.24.frankenso_na6.4274205444" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 933cbcfac9..99b53e0756 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1918297832 -#define TS_SIGNATURE "rusEFI 2022.10.24.harley81.1918297832" +#define SIGNATURE_HASH 1280494319 +#define TS_SIGNATURE "rusEFI 2022.10.24.harley81.1280494319" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index ae004e26c3..00f166e6ce 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 null // -#define SIGNATURE_HASH 919365233 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen-gm-e67.919365233" +#define SIGNATURE_HASH 147343990 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen-gm-e67.147343990" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 38ecca0cab..55520bc748 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1528877579 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen-nb1.1528877579" +#define SIGNATURE_HASH 1696923148 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen-nb1.1696923148" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index fecd3ea9c6..57f8129c06 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 175463213 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen121nissan.175463213" +#define SIGNATURE_HASH 879851306 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen121nissan.879851306" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 6e412ee8da..65326f67c4 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4069138621 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen121vag.4069138621" +#define SIGNATURE_HASH 3431861434 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen121vag.3431861434" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index dc0656208d..3a83f15360 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2086002425 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen128.2086002425" +#define SIGNATURE_HASH 1112666878 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen128.1112666878" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ad1fb9c6fe..ed03e4e5eb 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2303809007 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen154hyundai.2303809007" +#define SIGNATURE_HASH 3075832296 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen154hyundai.3075832296" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index f79b03ba9d..cf2b6b8faf 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2070801740 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen72.2070801740" +#define SIGNATURE_HASH 1164558667 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen72.1164558667" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index b9f90b1896..cd72837820 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2686335949 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen81.2686335949" +#define SIGNATURE_HASH 2652510154 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen81.2652510154" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 628ac4da9e..31d673eb74 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2539581451 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellen88bmw.2539581451" +#define SIGNATURE_HASH 2841304076 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellen88bmw.2841304076" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 9c48554f36..55505686c0 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3706147568 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellenNA6.3706147568" +#define SIGNATURE_HASH 3806559991 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellenNA6.3806559991" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index c10ee465c6..55b141bf31 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 581063215 -#define TS_SIGNATURE "rusEFI 2022.10.24.hellenNA8_96.581063215" +#define SIGNATURE_HASH 480673320 +#define TS_SIGNATURE "rusEFI 2022.10.24.hellenNA8_96.480673320" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 7edd5ae580..3b3b17010a 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 3934011659 -#define TS_SIGNATURE "rusEFI 2022.10.24.kin.3934011659" +#define SIGNATURE_HASH 3564662028 +#define TS_SIGNATURE "rusEFI 2022.10.24.kin.3564662028" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index dfca8ce129..549a610d71 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 386041031 -#define TS_SIGNATURE "rusEFI 2022.10.24.mre_f4.386041031" +#define SIGNATURE_HASH 688302272 +#define TS_SIGNATURE "rusEFI 2022.10.24.mre_f4.688302272" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 92e7f0b538..d6867ce2eb 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 386041031 -#define TS_SIGNATURE "rusEFI 2022.10.24.mre_f7.386041031" +#define SIGNATURE_HASH 688302272 +#define TS_SIGNATURE "rusEFI 2022.10.24.mre_f7.688302272" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ebfececcd9..cb166dcd4f 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3527490081 -#define TS_SIGNATURE "rusEFI 2022.10.24.prometheus_405.3527490081" +#define SIGNATURE_HASH 3963950630 +#define TS_SIGNATURE "rusEFI 2022.10.24.prometheus_405.3963950630" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d4554dc2e2..c4d02363c5 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3527490081 -#define TS_SIGNATURE "rusEFI 2022.10.24.prometheus_469.3527490081" +#define SIGNATURE_HASH 3963950630 +#define TS_SIGNATURE "rusEFI 2022.10.24.prometheus_469.3963950630" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 22999441bf..4ec717e24d 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 661005489 -#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_f4.661005489" +#define SIGNATURE_HASH 425855158 +#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_f4.425855158" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 5e502d98c2..4d29edc633 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 661005489 -#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_f7.661005489" +#define SIGNATURE_HASH 425855158 +#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_f7.425855158" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index c83d78a158..7256c3567c 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 661005489 -#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_h7.661005489" +#define SIGNATURE_HASH 425855158 +#define TS_SIGNATURE "rusEFI 2022.10.24.proteus_h7.425855158" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index e8f2bc3e37..1f3acb259e 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 4222958109 -#define TS_SIGNATURE "rusEFI 2022.10.24.subaru_eg33_f7.4222958109" +#define SIGNATURE_HASH 3316717082 +#define TS_SIGNATURE "rusEFI 2022.10.24.subaru_eg33_f7.3316717082" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 80fd6553a6..fc23eac07f 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 681782675 -#define TS_SIGNATURE "rusEFI 2022.10.24.tdg-pdm8.681782675" +#define SIGNATURE_HASH 380043668 +#define TS_SIGNATURE "rusEFI 2022.10.24.tdg-pdm8.380043668" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 344c235a7f..b2be82fb26 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -473,5 +473,9 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.outputRequestPeriod; if (strEqualCaseInsensitive(name, "mapFast")) return engine->outputChannels.mapFast; + if (strEqualCaseInsensitive(name, "rawMaf2")) + return engine->outputChannels.rawMaf2; + if (strEqualCaseInsensitive(name, "mafMeasured2")) + return engine->outputChannels.mafMeasured2; return EFI_ERROR_CODE; } diff --git a/firmware/controllers/sensors/auto_generated_sensor.cpp b/firmware/controllers/sensors/auto_generated_sensor.cpp index 7acf01b8e5..4dbc9dacf3 100644 --- a/firmware/controllers/sensors/auto_generated_sensor.cpp +++ b/firmware/controllers/sensors/auto_generated_sensor.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "sensor_type.h" -// was generated automatically by rusEFI tool from sensor_type.h // by enum2string.jar tool on Mon Oct 17 03:42:45 UTC 2022 +// was generated automatically by rusEFI tool from sensor_type.h // by enum2string.jar tool on Mon Oct 24 16:45:38 UTC 2022 // see also gen_config_and_enums.bat @@ -81,6 +81,8 @@ case SensorType::LuaGauge2: return "LuaGauge2"; case SensorType::Maf: return "Maf"; +case SensorType::Maf2: + return "Maf2"; case SensorType::Map: return "Map"; case SensorType::MapFast: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 63cef973fa..e03f2ea0e2 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.24.all.2192303047" + signature = "rusEFI 2022.10.24.all.3165638592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.all.2192303047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.all.3165638592" ; 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 24 12:55:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:40 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index ca3d3284db..2f9a503597 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.24.48way.2509040520" + signature = "rusEFI 2022.10.24.48way.2877867919" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.48way.2509040520" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.48way.2877867919" ; 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 24 12:55:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:20 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",10="BARO Pressure Reference Input (B1)",1="Battery Reference Input (A0)",3="CLT Reference Input (A2)",15="Fuel Pressure Reference Input (C4)",4="IAT Reference Input (A3)",9="MAP Pressure Reference Input (B0)",5="O2 Reference Input (A4)",16="Oil Pressure Reference Input (C5)",2="TPS Reference Input (A1)" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",41="Boost Controller Output (C7)",68="Fan Relay (E2)",69="Fuel Relay (E3)",65="HC1 Output (D15)",64="HC2 Output (D14)",40="Idle1 Output (C6)",62="Ignition 1 Output (D12)",63="Ignition 2 Output (D13)",33="Ignition 3 Output (B15)",32="Ignition 4 Output (B14)",58="Ignition 5 Output (D8)",59="Ignition 6 Output (D9)",61="Ignition 7 Output (D11)",60="Ignition 8 Output (D10)",81="Injector 1 Output (E15)",80="Injector 2 Output (E14)",79="Injector 3 Output (E13)",78="Injector 4 Output (E12)",77="Injector 5 Output (E11)",76="Injector 6 Output (E10)",75="Injector 7 Output (E9)",74="Injector 8 Output (E8)",71="Tachometer (E5)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6569,6 +6569,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6903,6 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 7df98774d7..b9aeaef860 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.24.alphax-2chan.2964946603" + signature = "rusEFI 2022.10.24.alphax-2chan.2394772140" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.alphax-2chan.2964946603" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.alphax-2chan.2394772140" ; 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 24 12:54:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:46 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="A2 Battery Sense",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",3="On-board MAP" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",40="A3 - Fuel Pump",41="A4 - Tachometer",47="A6 - Ignition A",71="A7 - Ignition B",105="A8 - Injector A",106="B8 - Injector B",42="C1 - Fan Relay",63="C8 - Idle" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6888,6 +6889,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 4d727e5adb..88f67a8c72 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.24.alphax-4chan.162996296" + signature = "rusEFI 2022.10.24.alphax-4chan.934480975" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.alphax-4chan.162996296" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.alphax-4chan.934480975" ; 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 24 12:54:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:48 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",12="B2 - MAP",14="B3 - IAT",2="B4 - O2",5="B5 - TPS",13="B7 - CLT",7="C7 - CAM Hall/Digital",9="D4 - TPS2",4="D5 - PPS",15="F6 - PPS2",6="F7 - Ignition Key Voltage",3="On-board MAP" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",10="A3 - Fuel Pump",104="A4 - Tachometer",47="A6 - Ignition 1",71="A7 - Ignition 2",105="A8 - Injector 1",106="B8 - Injector 2",100="C1 - Fan Relay",63="C8 - Idle",61="D1 - Injector 3",41="D2 - Out Boost",70="D6 - Ignition 3",69="D7 - Ignition 4",60="E1 - Injector 4",109="E2 - Out NOS",43="F1 - Idle2",65="F2 - VVT#1",62="F4 - VVT#2",110="F5 - MAIN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 68db4c1b31..5aecd187fe 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.24.atlas.2657162976" + signature = "rusEFI 2022.10.24.atlas.2690988775" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.atlas.2657162976" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.atlas.2690988775" ; 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 24 12:55:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:37 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6899,6 +6900,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index adffca85f3..4750a51888 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.24.core8.1950855742" + signature = "rusEFI 2022.10.24.core8.1245945401" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.core8.1950855742" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.core8.1245945401" ; 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 24 12:55:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:18 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",2="Analog Inputs 1 (A1)",11="Analog Inputs 10 (C0)",14="Analog Inputs 13 (C3)",15="Analog Inputs 14 (C4)",16="Analog Inputs 15 (C5)",3="Analog Inputs 2 (A2)",4="Analog Inputs 3 (A3)",5="Analog Inputs 4 (A4)",7="Analog Inputs 6 (A6)",8="Analog Inputs 7 (A7)",10="Analog Inputs 9 (B1)",9="On-board BARO (B0)",1="On-board Battery Sense (A0)",6="On-board MAP (A5)",12="Primary On-board O2 (C1)",13="Secondary On-board O2 (C2)" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",26="DBW Control (B8)",27="DBW Direction (B9)",25="DBW Disable (B7)",81="High Side 1 (E15)",76="High Side 10 (E10)",75="High Side 11 (E9)",74="High Side 12 (E8)",80="High Side 2 (E14)",79="High Side 3 (E13)",78="High Side 4 (E12)",77="High Side 5 (E11)",97="High Side 6 (F15)",98="High Side 7 (G0)",99="High Side 8 (G1)",73="High Side 9 (E7)",32="Low Side 1 (B14 v2.1 ONLY)",95="Low Side 1 (F13)",65="Low Side 10 (D15)",100="Low Side 11 (G2)",101="Low Side 12 (G3)",102="Low Side 13 (G4)",103="Low Side 14 (G5)",104="Low Side 15 (G6)",105="Low Side 16 (G7)",106="Low Side 17 (G8)",40="Low Side 18 (C6)",41="Low Side 19 (C7)",33="Low Side 2 (B15 v2.1 ONLY)",96="Low Side 2 (F14)",10="Low Side 20 (A8)",55="Low Side 21 (D5)",54="Low Side 22 (D4)",53="Low Side 23 (D3)",17="Low Side 24 (A15)",58="Low Side 3 (D8)",59="Low Side 4 (D9)",60="Low Side 5 (D10)",61="Low Side 6 (D11)",62="Low Side 7 (D12)",63="Low Side 8 (D13)",64="Low Side 9 (D14)",90="StepEr Control (F8)",89="StepEr Direction (F7)",91="StepEr Disable (F9)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6569,6 +6569,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6903,6 +6904,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 4277407990..810b435275 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.24.cypress.2192303047" + signature = "rusEFI 2022.10.24.cypress.3165638592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.cypress.2192303047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.cypress.3165638592" ; 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 24 12:54:55 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 24 16:45:43 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index c57cf5a335..687d8ca311 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.24.f407-discovery.2192303047" + signature = "rusEFI 2022.10.24.f407-discovery.3165638592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.f407-discovery.2192303047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.f407-discovery.3165638592" ; 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 24 12:55:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:33 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b3eaa05e75..aa942c8934 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.24.f429-discovery.2192303047" + signature = "rusEFI 2022.10.24.f429-discovery.3165638592" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.f429-discovery.2192303047" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.f429-discovery.3165638592" ; 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 24 12:55:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:35 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 4fdd735b8e..8fc0ce3327 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.24.frankenso_na6.3234275075" + signature = "rusEFI 2022.10.24.frankenso_na6.4274205444" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.frankenso_na6.3234275075" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.frankenso_na6.4274205444" ; 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 24 12:55:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:22 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",16="Analog 3E",8="Analog 3G",7="Analog 3H",5="Analog 3I",4="Analog 3J",2="Analog 3L",3="Analog 3M",14="Analog 3N",1="Analog 3O",12="Analog 3P",13="Analog 3Q",15="Analog VBatt" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",43="Coil 1F",80="Coil 1G",41="Coil 1H",76="Coil 1I",74="Coil 1L",78="Coil 1M",58="Coil 1O",59="Coil 1P",47="Injector 2M",57="Injector 2N",71="Injector 2O",72="Injector 2P",69="Injector 3S",70="Injector 3T",53="Injector 3U",68="Injector 3V",27="Injector 3W",55="Injector 3X",26="Injector 3Y",25="Injector 3Z" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index f512a3d064..dbb77b97e5 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.24.harley81.1918297832" + signature = "rusEFI 2022.10.24.harley81.1280494319" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.harley81.1918297832" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.harley81.1280494319" ; 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 24 12:55:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:50 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",2="27 - TPS 2",15="32 Oil Pressure",16="34 Kickstand Position Sensor",4="41 - PPS 1",9="42 - PPS 2",13="49 CLT",6="5 Battery Sense",5="52 - TPS 1",11="53 - MAP",12="55 Engine Temperature",14="72 IAT" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",65="1 Right Oil Cooling",47="24 Front Coil",52="25 Front ACR",64="4 Left Oil Fan",71="43 Rear Coil",105="6 Front Injector",112="61 Reverse Gear",103="63 Cooling Pump",106="7 Rear Injector",109="8 Rear ACR",101="auxMain",41="auxWastegate" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6889,6 +6890,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9810f4cdde..fe5c3beabd 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.24.hellen-gm-e67.919365233" + signature = "rusEFI 2022.10.24.hellen-gm-e67.147343990" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen-gm-e67.919365233" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen-gm-e67.147343990" ; 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 24 12:55:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:08 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="C1-19 Battery Sense",10="C1-44 Primary Fuel Level",7="C1-45 Secondary Fuel Level",16="C1-46 Vac Sense",4="C1-47 - PPS1",15="C1-49 - PPS2",2="C2-60 - Oil Pressure",5="C2-64 - TPS1",11="C2-65 - Trans Fluids",9="C2-66 - TPS2",13="C3-55 - CLT",14="C3-56 - IAT",8="C3-57 - A/C Pressure",3="C3-58 - Baro",12="C3-59 - MAP" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",100="C1-12 Check Engine",52="C1-13 - Fuel Pump",65="C1-25 Tach",109="C1-26 - Starter Relay",64="C1-39 - VSS Output",112="C1-40 - MAIN",102="C1-56 - Starter Enable",47="C2-1 - IGN 1",61="C2-16 INJ 3",72="C2-17 - IGN 8",69="C2-18 - IGN 4",106="C2-32 INJ 2",27="C2-33 - IGN 7",68="C2-34 - IGN 5",96="C2-48 INJ 8",59="C2-49 INJ 5",94="C2-52 INJ 6",71="C2-53 - IGN 2",26="C2-54 - IGN 6",70="C2-55 - IGN 3",60="C2-70 INJ 4",95="C2-71 INJ 7",105="C2-72 INJ 1",111="C3-16 - Coolant Pump",10="C3-49 - Fan Relay",63="C3-7 - Alternator Enable",43="J4_4 Wastegate Solenoid",53="J4_5 Error Light",46="J7_1 AUX",45="J7_2 AUX",44="J7_3 AUX",17="J7_4 AUX",55="J7_5 AUX",56="J7_6 AUX",66="J7_7 AUX",67="J7_8 AUX" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index f897c01c1f..eb72be80b1 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.24.hellen-nb1.1528877579" + signature = "rusEFI 2022.10.24.hellen-nb1.1696923148" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen-nb1.1528877579" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen-nb1.1696923148" ; 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 24 12:55:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:06 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="1B - Battery Sense",4="1G - Steering/RES2",16="1P - AC Switch",9="2A - Pressure Input",14="2B - IAT",1="2C - O2S",13="2E - Coolant",7="2H - CAM",10="2J - CRANK",11="2L - MAF",12="3D - MAP",5="3E - TPS",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",2="TPS1",3="intMAP" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",102="1E - Check Engine Light",11="1I AC Fan Relay",65="1O - ALTERN",110="1Q - Aternator Warning Lamp",62="1R - ECF",109="1S - AC Relay",53="1U - O2H",63="2K - TACH",100="2M US / 2P EUROPE - FPUMP",64="2Q - IDLE",35="3D - MAP",47="3G - IGN_1 (1&4)",71="3H - IGN_2 (2&3)",96="3Q - VICS",94="3T/4D - BOOST OUT",111="3V - O2H2",105="3W - INJ_1",106="3X - INJ_2",61="3Y - INJ_3",60="3Z - INJ_4",59="4E - VVT",41="ETB +",42="ETB -",40="ETB EN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 19c64dfd66..5c7880d501 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.24.hellen121nissan.175463213" + signature = "rusEFI 2022.10.24.hellen121nissan.879851306" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen121nissan.175463213" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen121nissan.879851306" ; 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 24 12:55:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:56 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",4="106 - PPS 1",6="109 Ignition Key Voltage",14="34 - IAT",5="50 - TPS 1",9="69 - TPS 2",13="73 - CLT",15="98 - PPS 2",11="Aux P66",12="Aux P67",3="Aux P68" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",95="10 - VTC Left",103="104 ETB Relay",96="11 - VTC Right",112="111 Main Relay",62="113 Fuel Pump Relay",59="21 - INJ_5",61="22 - INJ_3",105="23 - INJ_1",53="29 - VIAS",94="40 - INJ_6",60="41 - INJ_4",106="42 - INJ_2",68="60 - Coil 5",70="61 - Coil 3",47="62 - Coil 1",26="79 - Coil 6",69="80 - Coil 4",71="81 - Coil 2" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6889,6 +6890,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index e59f563095..7d4143eaee 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.24.hellen121vag.4069138621" + signature = "rusEFI 2022.10.24.hellen121vag.3431861434" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen121vag.4069138621" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen121vag.3431861434" ; 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 24 12:55:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:54 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",12="101 - MAP2",6="106 - KNOCK",1="14 - O2",11="29 In Maf",4="34 In PPS1",15="35 In PPS2",9="84 - TPS2",14="85 - IAT",7="86 - CAM1",8="87 - CAM2",5="92 - TPS 1",13="93 - CLT" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",35="101 - MAP2",138="102 - IGN_1",68="103 - IGN_5",11="104 Wastegate",64="105 - IDLE rev A,B",103="105 - IDLE rev C+",135="110 - IGN_6",70="111 - IGN_3",94="112 INJ 6",59="113 INJ 5",101="115 - VVT1_2",40="117 ETB_OUT+",41="118 ETB_OUT-",42="120 - VVT2 B2",43="18 - VVT2 B1",95="19 - INJ 7",130="22 - VVT1 1",96="24 - INJ 8",63="37 - TACH",102="47 - CEL",128="65 - Fuel Pump",71="7 - IGN_2",136="8 - IGN_7",60="88 - INJ_4",106="89 - INJ_2",69="94 - IGN_4",137="95 - IGN_8",105="96 - INJ_1",61="97 - INJ_3",132="Main Relay" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index dbf5530245..f6c93f3140 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.24.hellen128.2086002425" + signature = "rusEFI 2022.10.24.hellen128.1112666878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen128.2086002425" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen128.1112666878" ; 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 24 12:55:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:52 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="Battery Sense",4="C24 - PPS1",15="C25 - PPS2",12="E23 - MAP",13="E29 - Coolant Temp",5="E31 - TPS1",9="E34 - TPS2",10="E37 - Crank Input",7="E40 - IN_CAM",14="E45 - IAT",11="E47 - MAF",8="P30_IN_AUX4",2="P32_IN_O2S2",1="P36_IN_O2S",3="P40_IN_MAP3",16="P41_IN_AUX3" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",62="A6 - Fan Control",128="C21 - Evap Purge Control",65="C29 - Fuel Pump",105="E1 - LS1",59="E13 - INJ 4",94="E14 - INJ 2",106="E2- LS2",95="E25 - INJ 1",96="E26 - INJ 3",61="E3 - LS3",60="E4 - LS4/VVT",137="F11 - IGN 8",69="F13 - IGN 4",71="F16 - IGN 2",135="F17 - IGN 6",138="F20 - IGN 1",68="F4 - IGN 5",70="F6 - IGN 3",136="F9 - IGN 7",10="P18_OUT_PP2",131="P19_OUT_LOW11",43="P33_PWM5",129="P34_OUT_LOW8",130="P35_OUT_LOW9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6889,6 +6890,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 0d11741613..5a3e146e0e 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.24.hellen154hyundai.2303809007" + signature = "rusEFI 2022.10.24.hellen154hyundai.3075832296" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen154hyundai.2303809007" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen154hyundai.3075832296" ; 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 24 12:55:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:45:58 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",13="CLT",14="IAT",12="K10 Sensor",6="K2 Ignition Key Voltage",1="K21 Ambient Temperature",2="K58 Oil Temp",11="Map Sensor K31",4="PPS 1",15="PPS 2",5="TPS 1",9="TPS 2" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="Aux P66",11="Aux P67",103="Aux P68",47="Coil 1",71="Coil 2",70="Coil 3",69="Coil 4",102="Fan Relay HI",101="Fan Relay Low",111="Fuel Pump K70",105="INJ_1 k25",106="INJ_2 k26",61="INJ_3 k27",60="INJ_4 k28",95="K47 BK1 Wastegate Solenoid",96="K48 LS1",110="K87 AC Relay",62="MIL",112="Main Relay K64",65="Tacho",59="VVT1",94="VVT2" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6889,6 +6890,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 2aa0097de4..4f2d1c3987 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.24.hellen72.2070801740" + signature = "rusEFI 2022.10.24.hellen72.1164558667" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen72.2070801740" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen72.1164558667" ; 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 24 12:55:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:02 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",2="3L - IGN_7 / AFR",7="3V - CAM (A19)",10="3Y - CRANK (A24)",16="4AE - EGR/MAP4 (A22)",9="4F - AC_PRES/AUX1 (A23)",8="4J - VTCS/AUX4 (A20)",14="4N - IAT (A14)",13="4P - CLT (A11)",6="4S/4T - Alternator voltage",12="4U - MAP2/Ign8 (A10)",5="4V - TPS (A17)",11="4X - MAF (A9)",15="5M - PPS2 OR TEMPERATURE SENSOR",1="5N - TPS2",4="5P - PPS1",3="intMAP (A15)" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",105="2A - INJ_1",62="2B - ECF (PWM8)",59="2C - AC Fan / INJ_5",106="2D - INJ_2",61="2G - INJ_3",60="2J - INJ_4",129="2K - AC (O4)",100="2M - FPUMP (O9)",94="2N - VTSC / INJ_6",70="2O - IGN_3",64="2Q - IDLE (PWM5)",102="2R - CE (O11)",95="3C - Purge Solenoid / INJ_7",96="3D - EGR Solenoid / INJ_8",101="3E - CANIST (O10)",138="3F - IGN_1 (1&4)",132="3H - MAIN (O1)",71="3I - IGN_2 (2&3)",128="3J - O2H (O3)",136="3L - IGN_7 / AFR",65="3M - ALTERN (PWM6)",69="3N - IGN_4",63="3O - TACH (PWM7)",11="3P - O2H2 (O7)",127="3U - AWARN (O2)",68="3Z - IGN_5 / GNDA",135="4K - IGN_6 / +5V_MAP",130="4R - VVT (O5)",137="4U - MAP2/Ign8 (A10)",43="5E - SOLENOID OUTPUT",41="ETB +",42="ETB -",40="ETB EN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index d7b32767c4..d13c088e7e 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.24.hellen81.2686335949" + signature = "rusEFI 2022.10.24.hellen81.2652510154" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen81.2686335949" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen81.2652510154" ; 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 24 12:55:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:04 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="13 - IN_VIGN",10="15 - IN_CRANK (A24)",5="16 - IN_TPS",1="18 - IN_O2S",11="37 - IN_MAP1",12="38 - IN_MAP2",13="39 - IN_CLT",14="40 - IN_IAT",3="41 - IN_MAP3",2="55 - IN_O2S2",9="74 - IN_AUX1",15="75 - IN_AUX2",16="76 - IN_AUX3",8="77 - IN_AUX4",4="78 - IN_PPS",7="79 - IN_CAM" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",71="1 - IGN_2",65="10 - OUT_FUEL",127="11 - OUT_HIGH",132="14 - OUT_MAIN",70="2 - IGN_3",72="21 - IGN_8",27="22 - IGN_7",26="23 - IGN_6",68="24 - IGN_5",94="25 - INJ_6",105="27 - INJ_1",11="28 - OUT_O2H2",59="30 - INJ_5",102="31 - OUT_CE",69="4 - IGN_4",101="46 - OUT_CANIST",60="47 - INJ_4",128="48 - OUT_O2H",131="49 - OUT_HEATER",138="5 - IGN_1",130="50 - OUT_STARTER",106="6 - INJ_2",63="60 - OUT_IO",43="64 - OUT_COIL_B2",42="65 - OUT_COIL_B1",41="66 - OUT_COIL_A2",40="67 - OUT_COIL_A1",62="68 - OUT_ECF",129="69 - OUT_AC",61="7 - INJ_3",100="70 - OUT_PUMP",95="72 - INJ_7",96="73 - INJ_8",64="8 - OUT_TACH" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6566,6 +6566,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6890,6 +6891,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 7f739d91a3..65b07e9cc5 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.24.hellen88bmw.2539581451" + signature = "rusEFI 2022.10.24.hellen88bmw.2841304076" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellen88bmw.2539581451" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellen88bmw.2841304076" ; 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 24 12:55:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:00 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",10="16 - CRANK",7="17 - CAM",11="41 - MAF",6="56 - Battery Sense",5="73 - TPS",14="77 - IAT",13="78 - CLT",8="Aux BARO",12="Aux MAP",15="Aux PPS2",9="Aux TPS2",16="Aux TPS3",4="PPS1",1="VIN5",2="VIN6" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",112="1 - OUT_PUMP",62="2 - IdleC",69="23 - Coil 4",26="24 - Coil 6",68="25 - Coil 5",53="27 - MAIN",43="29 - Idle",59="3 - INJ_5",61="31 - INJ_3",106="32 - INJ_2",105="33 - INJ_1",96="35 - INJ_8",94="4 - INJ_6",65="47 - Tach",60="5 - INJ_4",47="50 - Coil 1",71="51 - Coil 2",70="52 - Coil 3",95="7 - INJ_7/VVT" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6889,6 +6890,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 0ea68adafb..8e64d9918e 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.24.hellenNA6.3706147568" + signature = "rusEFI 2022.10.24.hellenNA6.3806559991" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellenNA6.3706147568" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellenNA6.3806559991" ; 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 24 12:55:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:10 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",6="1B - Battery Sense",16="1Q AC Switch",15="1V - Clutch Switch",12="2M - Pressure Sensor",2="2N - Temperature Sensor",1="3N - O2S",11="3O - MAF",14="3P - IAT",13="3Q - CLT",8="4G - PPS2 OR TEMPERATURE SENSOR",9="4H - TPS2",4="4I - PPS1",5="TPS Input",3="intMAP (A15)" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",107="1E - Check Engine Light",138="1G - Ignition 1 & 4 (rev C)",47="1G - Ignition 1 & 4 (rev D)",71="1H - Ignition 2 & 3",129="1J - AC Relay",96="2I - VVT",94="2J - Boost Control",59="3S - A/C Fan 94-95",105="3U - Injector 1",106="3V - Injector 2",64="3W - IDLE",61="3Y - Injector 3",60="3Z - Injector 4",41="ETB +",42="ETB -",40="ETB EN",100="Fuel Pump Relay",62="Radiator Fan",130="Tachometer (rev C)",110="Tachometer (rev D)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index e97bf06e08..4a0f27a837 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.24.hellenNA8_96.581063215" + signature = "rusEFI 2022.10.24.hellenNA8_96.480673320" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.hellenNA8_96.581063215" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.hellenNA8_96.480673320" ; 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 24 12:55:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:12 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",16="1K - AC Switch",9="2A - Pressure Input",14="2B - IAT",11="2B - MAF",1="2C - O2S",5="2F - TPS",13="2G - Coolant",6="3B - Battery Sense",10="3F - CRANK",7="3G - CAM",8="3S - EGR BOOST IN",15="4C - IN TEMP/PPS2",4="PPS1",2="TPS1",3="intMAP" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",62="1A - ECF",11="1B - AC Fan Relay",102="1E - Check Engine Light",109="1G - AC Relay",100="1U - Fuel Pump",63="3L - TACH",47="3N - IGN_1 (1&4)",64="3Q - IDLE",71="3R - IGN_2 (2&3)",105="3U - INJ_1",106="3V - INJ_2",61="3W - INJ_3",60="3X - INJ_4",111="3Z - O2H2",94="4D - BOOST OUT",59="4E - VVT",41="ETB +",42="ETB -",40="ETB EN",52="P18/P22" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6568,6 +6568,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6892,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index ccac710c6c..202a26d3df 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.24.kin.3934011659" + signature = "rusEFI 2022.10.24.kin.3564662028" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.kin.3934011659" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.kin.3564662028" ; 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 24 12:54:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 24 16:45:41 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6572,6 +6572,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6908,6 +6909,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2d9a35aad7..9711fceca1 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.24.mre_f4.386041031" + signature = "rusEFI 2022.10.24.mre_f4.688302272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.mre_f4.386041031" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.mre_f4.688302272" ; 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 24 12:55:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:16 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignition 3",51="12 - Ignition 4",56="13 - GP Out 6",57="14 - GP Out 5",6="28 - AN volt 10, Aux Reuse",172="3 - Lowside 2",38="32 - AN volt 6, Aux Reuse",190="33 - GP Out 3",189="34 - GP Out 2",188="35 - GP Out 1",18="36 - AN volt 8, Aux Reuse",168="37 - Injector 1",169="38 - Injector 2",19="40 - AN volt 9, Aux Reuse",170="41 - Injector 3",171="42 - Injector 4",191="43 - GP Out 4",173="7 - Lowside 1",54="9 - Ignition 1",72="AUX J10 PE6",71="AUX J11 PE5",29="AUX J12",28="AUX J13",25="AUX J18 PB7",17="AUX J2 PA15",26="AUX J2 PB8",27="AUX J2 PB9",46="AUX J2 PC12",66="AUX J6" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6569,6 +6569,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6891,6 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index e86960f0a2..5e906a986f 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.24.mre_f7.386041031" + signature = "rusEFI 2022.10.24.mre_f7.688302272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.mre_f7.386041031" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.mre_f7.688302272" ; 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 24 12:55:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:14 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",1="18 - AN temp 1",13="19 - AN volt 4",14="20 - AN volt 5",4="22 - AN temp 4",2="23 - AN temp 2",3="24 - AN temp 3",7="26 - AN volt 2",11="27 - AN volt 1",5="28 - AN volt 10, Aux Reuse",16="30 - AN volt 7",8="31 - AN volt 3",15="32 - AN volt 6, Aux Reuse",9="36 - AN volt 8, Aux Reuse",10="40 - AN volt 9, Aux Reuse",12="Battery Sense" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignition 3",51="12 - Ignition 4",56="13 - GP Out 6",57="14 - GP Out 5",6="28 - AN volt 10, Aux Reuse",172="3 - Lowside 2",38="32 - AN volt 6, Aux Reuse",190="33 - GP Out 3",189="34 - GP Out 2",188="35 - GP Out 1",18="36 - AN volt 8, Aux Reuse",168="37 - Injector 1",169="38 - Injector 2",19="40 - AN volt 9, Aux Reuse",170="41 - Injector 3",171="42 - Injector 4",191="43 - GP Out 4",173="7 - Lowside 1",54="9 - Ignition 1",72="AUX J10 PE6",71="AUX J11 PE5",29="AUX J12",28="AUX J13",25="AUX J18 PB7",17="AUX J2 PA15",26="AUX J2 PB8",27="AUX J2 PB9",46="AUX J2 PC12",66="AUX J6" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6569,6 +6569,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6891,6 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c8c38c10eb..79153ae00d 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.24.prometheus_405.3527490081" + signature = "rusEFI 2022.10.24.prometheus_405.3963950630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.prometheus_405.3527490081" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.prometheus_405.3963950630" ; 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 24 12:55:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:25 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6901,6 +6902,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index faf2f852e8..b4477fed3e 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.24.prometheus_469.3527490081" + signature = "rusEFI 2022.10.24.prometheus_469.3963950630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.prometheus_469.3527490081" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.prometheus_469.3963950630" ; 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 24 12:55:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:23 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6901,6 +6902,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e51a551ae1..a04009e3f7 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.24.proteus_f4.661005489" + signature = "rusEFI 2022.10.24.proteus_f4.425855158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.proteus_f4.661005489" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.proteus_f4.425855158" ; 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 24 12:55:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:29 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6883,6 +6884,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 8361752d12..589a7e95fb 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.24.proteus_f7.661005489" + signature = "rusEFI 2022.10.24.proteus_f7.425855158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.proteus_f7.661005489" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.proteus_f7.425855158" ; 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 24 12:55:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:27 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6883,6 +6884,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 8d4413c7c5..78f2e815b1 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.24.proteus_h7.661005489" + signature = "rusEFI 2022.10.24.proteus_h7.425855158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.proteus_h7.661005489" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.proteus_h7.425855158" ; 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 24 12:55:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:31 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",15="Analog Temp 1",16="Analog Temp 2",9="Analog Temp 3",10="Analog Temp 4",11="Analog Volt 1",6="Analog Volt 10",7="Analog Volt 11",12="Analog Volt 2",13="Analog Volt 3",14="Analog Volt 4",1="Analog Volt 5",2="Analog Volt 6",3="Analog Volt 7",4="Analog Volt 8",5="Analog Volt 9",8="Battery Sense" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6565,6 +6565,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6883,6 +6884,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 81f75e5649..2cbef3bcb2 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.24.subaru_eg33_f7.4222958109" + signature = "rusEFI 2022.10.24.subaru_eg33_f7.3316717082" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.subaru_eg33_f7.4222958109" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.subaru_eg33_f7.3316717082" ; 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 24 12:54:56 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 24 16:45:45 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",7="A02 - VBat",15="A03 - Coolant t Ain",10="A04 - EGR t Ain",16="A06 - Oxyg 1 Ain",9="A06 - Oxyg 2 Ain",12="A18 - AUX0 Ain",1="AUX0_18 - MAP Ain",6="AUX0_19 - IAT Ain",13="B02 - TPS Ain",4="B05 - MAF Ain" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",186="A01 - Injector 5",194="A12 - Injector 6",159="AUX0_14 - AUX0 OD output 1",158="AUX0_17 - AUX0 OD output 0",160="B08 - AC clutch",149="C14 - FPump modulator",153="C15 - AUX1 OD out",148="C16 - Tacho out",157="D01 - IDLE close",156="D02 - IDLE open",147="D03 - FAN 2 relay",121="D05 - Self Shutdown",155="D06 - Absorber purge valve",188="D07 - Ignition Cyl 4",198="D08 - Ignition Cyl 2",189="D09 - Ignition Cyl 3",199="D10 - Ignition Cyl 1",185="D11 - Injector 3",192="D12 - Injector 2",184="D13 - Injector 1",197="D16 - Ignition Cyl 6",146="D17 - FAN 1 relay",154="D18 - Auxillary air valve",152="D19 - Check Engine indicator",161="D20 - Inertia-Resonance Super-Charger control",191="D21 - Ignition Cyl 5",151="D22 - EGR control",150="D23 - Fuel Pump relay",193="D26 - Injector 4" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6567,6 +6567,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6901,6 +6902,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index e7b9e0f7bf..9011e8c5de 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.24.tdg-pdm8.681782675" + signature = "rusEFI 2022.10.24.tdg-pdm8.380043668" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.24.tdg-pdm8.681782675" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.24.tdg-pdm8.380043668" ; 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 24 12:55:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:39 UTC 2022 pageSize = 22800 page = 1 @@ -339,7 +339,7 @@ triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", fordInjectorSmallPulseSlope = scalar, U16, 752, "g/s", 0.001, 0, 0, 65, 3 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 +maf2AdcChannel = bits, U08, 756, [0:5], 0="NONE",5="Battery Sense",11="Sense 1",12="Sense 2",13="Sense 3",14="Sense 4",15="Sense 5",16="Sense 6",9="Sense 7",10="Sense 8" o2heaterPin = bits, U16, 758, [0:7], 0="NONE",257="Out 1",258="Out 2",259="Out 3",260="Out 4",261="Out 5",262="Out 6",263="Out 7",264="Out 8" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -2572,148 +2572,146 @@ outputRequestPeriod = scalar, U32, 608, "", 1, 0 mapFast = scalar, F32, 612, "", 1, 0 luaGauges1 = scalar, F32, 616, "value", 1, 0 luaGauges2 = scalar, F32, 620, "value", 1, 0 -unusedAtTheEnd1 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 639, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 640, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 641, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 642, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 643, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 644, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 645, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 646, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 647, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 648, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 649, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 650, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 651, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 652, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 653, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 654, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 655, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 656, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 657, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 658, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 659, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 660, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 661, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 662, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 663, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 664, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 665, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 666, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 667, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 668, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 669, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 670, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 671, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 672, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 673, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 674, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 675, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 676, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 677, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 678, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 679, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 680, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 681, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 682, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd133 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd134 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd135 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd136 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd137 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd138 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd139 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd140 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd141 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd142 = scalar, U08, 765, "", 1, 0 +rawMaf2 = scalar, U16, 624, "V", 0.001, 0 +mafMeasured2 = scalar, U16, 626, "kg/h", 0.1, 0 +unusedAtTheEnd1 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 639, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 640, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 641, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 642, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 643, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 644, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 645, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 646, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 647, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 648, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 649, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 650, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 651, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 652, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 653, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 654, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 655, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 656, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 657, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 658, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 659, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 660, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 661, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 662, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 663, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 664, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 665, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 666, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 667, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 668, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 669, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 670, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 671, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 672, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 673, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 674, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 675, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 676, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 677, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 678, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 679, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 680, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 681, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 682, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 683, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 684, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 685, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 686, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 687, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 688, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 689, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 690, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 691, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 692, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 693, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 694, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 695, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 696, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 697, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 698, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 699, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 700, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 701, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 702, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 703, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 704, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 705, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 706, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 707, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 708, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 709, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 710, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 711, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 712, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 713, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 714, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 715, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 716, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 717, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 718, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 719, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 720, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 721, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 722, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 723, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 724, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 725, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 726, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 727, "", 1, 0 +unusedAtTheEnd101 = scalar, U08, 728, "", 1, 0 +unusedAtTheEnd102 = scalar, U08, 729, "", 1, 0 +unusedAtTheEnd103 = scalar, U08, 730, "", 1, 0 +unusedAtTheEnd104 = scalar, U08, 731, "", 1, 0 +unusedAtTheEnd105 = scalar, U08, 732, "", 1, 0 +unusedAtTheEnd106 = scalar, U08, 733, "", 1, 0 +unusedAtTheEnd107 = scalar, U08, 734, "", 1, 0 +unusedAtTheEnd108 = scalar, U08, 735, "", 1, 0 +unusedAtTheEnd109 = scalar, U08, 736, "", 1, 0 +unusedAtTheEnd110 = scalar, U08, 737, "", 1, 0 +unusedAtTheEnd111 = scalar, U08, 738, "", 1, 0 +unusedAtTheEnd112 = scalar, U08, 739, "", 1, 0 +unusedAtTheEnd113 = scalar, U08, 740, "", 1, 0 +unusedAtTheEnd114 = scalar, U08, 741, "", 1, 0 +unusedAtTheEnd115 = scalar, U08, 742, "", 1, 0 +unusedAtTheEnd116 = scalar, U08, 743, "", 1, 0 +unusedAtTheEnd117 = scalar, U08, 744, "", 1, 0 +unusedAtTheEnd118 = scalar, U08, 745, "", 1, 0 +unusedAtTheEnd119 = scalar, U08, 746, "", 1, 0 +unusedAtTheEnd120 = scalar, U08, 747, "", 1, 0 +unusedAtTheEnd121 = scalar, U08, 748, "", 1, 0 +unusedAtTheEnd122 = scalar, U08, 749, "", 1, 0 +unusedAtTheEnd123 = scalar, U08, 750, "", 1, 0 +unusedAtTheEnd124 = scalar, U08, 751, "", 1, 0 +unusedAtTheEnd125 = scalar, U08, 752, "", 1, 0 +unusedAtTheEnd126 = scalar, U08, 753, "", 1, 0 +unusedAtTheEnd127 = scalar, U08, 754, "", 1, 0 +unusedAtTheEnd128 = scalar, U08, 755, "", 1, 0 +unusedAtTheEnd129 = scalar, U08, 756, "", 1, 0 +unusedAtTheEnd130 = scalar, U08, 757, "", 1, 0 +unusedAtTheEnd131 = scalar, U08, 758, "", 1, 0 +unusedAtTheEnd132 = scalar, U08, 759, "", 1, 0 +unusedAtTheEnd133 = scalar, U08, 760, "", 1, 0 +unusedAtTheEnd134 = scalar, U08, 761, "", 1, 0 +unusedAtTheEnd135 = scalar, U08, 762, "", 1, 0 +unusedAtTheEnd136 = scalar, U08, 763, "", 1, 0 +unusedAtTheEnd137 = scalar, U08, 764, "", 1, 0 +unusedAtTheEnd138 = scalar, U08, 765, "", 1, 0 ; total TS size = 768 m_knockRetard = scalar, F32, 768, "", 1, 0 m_knockThreshold = scalar, F32, 772, "", 1, 0 @@ -4946,6 +4944,8 @@ entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" entry = mapFast, "mapFast", float, "%.3f" entry = luaGauges1, "luaGauges 1", float, "%.3f" entry = luaGauges2, "luaGauges 2", float, "%.3f" +entry = rawMaf2, "rawMaf2", float, "%.3f" +entry = mafMeasured2, "MAF sensor 2", float, "%.3f" entry = m_knockRetard, "Degrees retarded: larger number = more retard", float, "%.3f" entry = m_knockThreshold, "m_knockThreshold", float, "%.3f" entry = m_knockCount, "m_knockCount", int, "%d" @@ -6571,6 +6571,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "TPS1 ADC input", tps1_1AdcChannel field = "TPS2 ADC input", tps2_1AdcChannel field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel @@ -6907,6 +6908,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mafSettings, "MAF sensor", yAxis field = "MAF ADC input", mafAdcChannel + field = "MAF 2 ADC input", maf2AdcChannel ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" diff --git a/java_console/io/src/main/java/com/rusefi/enums/SensorType.java b/java_console/io/src/main/java/com/rusefi/enums/SensorType.java index 92a094c112..1ff50a1ef9 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/SensorType.java +++ b/java_console/io/src/main/java/com/rusefi/enums/SensorType.java @@ -42,6 +42,7 @@ public enum SensorType { InputShaftSpeed, EGT1, EGT2, + Maf2, AuxAnalog1, AuxAnalog2, AuxAnalog3, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 37df048567..88b39f7359 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class AcControl { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index f7ea1f0a03..7ee9e37016 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class BoostControl { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index d00ab75628..5cdc46aa00 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class EngineState { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; 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 8eea6f91cb..23483ac408 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 24 12:55:45 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 24 16:46:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -375,6 +375,7 @@ public class Fields { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; @@ -1179,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.24.all.2192303047"; + public static final String TS_SIGNATURE = "rusEFI 2022.10.24.all.3165638592"; 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; @@ -1516,7 +1517,7 @@ public class Fields { public static final Field FORDINJECTORSMALLPULSESLOPE = Field.create("FORDINJECTORSMALLPULSESLOPE", 752, FieldType.INT16).setScale(0.001); public static final Field TRIGGERSIMULATORPINMODES1 = Field.create("TRIGGERSIMULATORPINMODES1", 754, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field TRIGGERSIMULATORPINMODES2 = Field.create("TRIGGERSIMULATORPINMODES2", 755, FieldType.INT8, pin_output_mode_e).setScale(1.0); - public static final Field UNUSEDTRIGMODE = Field.create("UNUSEDTRIGMODE", 756, FieldType.INT8).setScale(1.0); + public static final Field MAF2ADCCHANNEL = Field.create("MAF2ADCCHANNEL", 756, FieldType.INT8, adc_channel_e).setScale(1.0); public static final Field ALIGNMENTFILL_AT_757 = Field.create("ALIGNMENTFILL_AT_757", 757, FieldType.INT8).setScale(1.0); public static final Field O2HEATERPIN = Field.create("O2HEATERPIN", 758, FieldType.INT16, output_pin_e).setScale(1.0); public static final Field O2HEATERPINMODETODO = Field.create("O2HEATERPINMODETODO", 760, FieldType.INT8, pin_output_mode_e).setScale(1.0); @@ -2960,7 +2961,7 @@ public class Fields { FORDINJECTORSMALLPULSESLOPE, TRIGGERSIMULATORPINMODES1, TRIGGERSIMULATORPINMODES2, - UNUSEDTRIGMODE, + MAF2ADCCHANNEL, ALIGNMENTFILL_AT_757, O2HEATERPIN, O2HEATERPINMODETODO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 9d0e977e01..0a982ff109 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class FuelComputer { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 90b34e4717..a5c20edabd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Oct 24 16:45:40 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class TriggerState { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index e13135dc9a..9647ebf8b6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Oct 19 20:15:06 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Oct 24 16:45:40 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class TriggerStatePrimary { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 0350b9231d..c672b0a8cb 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Wed Oct 19 20:15:05 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Oct 24 16:45:39 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -115,6 +115,7 @@ public class TsOutputs { public static final String GAUGE_NAME_AFR2 = "Air/Fuel Ratio 2"; public static final String GAUGE_NAME_AIR_FLOW_ESTIMATE = "MAF estimate"; public static final String GAUGE_NAME_AIR_FLOW_MEASURED = "MAF sensor"; + public static final String GAUGE_NAME_AIR_FLOW_MEASURED_2 = "MAF sensor 2"; public static final String GAUGE_NAME_AIR_MASS = "air mass"; public static final String GAUGE_NAME_AUX_LINEAR_1 = "Aux Linear 1"; public static final String GAUGE_NAME_AUX_LINEAR_2 = "Aux Linear 2"; @@ -803,148 +804,146 @@ public class TsOutputs { public static final Field MAPFAST = Field.create("MAPFAST", 612, FieldType.FLOAT); public static final Field LUAGAUGES1 = Field.create("LUAGAUGES1", 616, FieldType.FLOAT); public static final Field LUAGAUGES2 = Field.create("LUAGAUGES2", 620, FieldType.FLOAT); - public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 624, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 625, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 626, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 627, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 628, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 629, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 630, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 631, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 632, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 633, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 634, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 635, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 636, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 637, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 638, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 639, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 640, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 641, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 642, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 643, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 644, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 645, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 646, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 647, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 648, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 649, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 650, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 651, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 652, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 653, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 654, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 655, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 656, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 657, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 658, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 659, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 660, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 661, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 662, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 663, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 664, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 665, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 666, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 667, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 668, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 669, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 670, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 671, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 672, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 673, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 674, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 675, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 676, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 677, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 678, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 679, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 680, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 681, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 682, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 683, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 684, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 685, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 686, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 687, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 688, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 689, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 690, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 691, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 692, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 693, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 694, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 695, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 696, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 697, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 698, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 699, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 700, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 701, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND79 = Field.create("UNUSEDATTHEEND79", 702, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND80 = Field.create("UNUSEDATTHEEND80", 703, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND81 = Field.create("UNUSEDATTHEEND81", 704, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND82 = Field.create("UNUSEDATTHEEND82", 705, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND83 = Field.create("UNUSEDATTHEEND83", 706, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND84 = Field.create("UNUSEDATTHEEND84", 707, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND85 = Field.create("UNUSEDATTHEEND85", 708, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND86 = Field.create("UNUSEDATTHEEND86", 709, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND87 = Field.create("UNUSEDATTHEEND87", 710, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND88 = Field.create("UNUSEDATTHEEND88", 711, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND89 = Field.create("UNUSEDATTHEEND89", 712, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND90 = Field.create("UNUSEDATTHEEND90", 713, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND91 = Field.create("UNUSEDATTHEEND91", 714, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND92 = Field.create("UNUSEDATTHEEND92", 715, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND93 = Field.create("UNUSEDATTHEEND93", 716, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND94 = Field.create("UNUSEDATTHEEND94", 717, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND95 = Field.create("UNUSEDATTHEEND95", 718, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND96 = Field.create("UNUSEDATTHEEND96", 719, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND97 = Field.create("UNUSEDATTHEEND97", 720, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND98 = Field.create("UNUSEDATTHEEND98", 721, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND99 = Field.create("UNUSEDATTHEEND99", 722, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND100 = Field.create("UNUSEDATTHEEND100", 723, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND101 = Field.create("UNUSEDATTHEEND101", 724, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND102 = Field.create("UNUSEDATTHEEND102", 725, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND103 = Field.create("UNUSEDATTHEEND103", 726, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND104 = Field.create("UNUSEDATTHEEND104", 727, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND105 = Field.create("UNUSEDATTHEEND105", 728, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND106 = Field.create("UNUSEDATTHEEND106", 729, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND107 = Field.create("UNUSEDATTHEEND107", 730, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND108 = Field.create("UNUSEDATTHEEND108", 731, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND109 = Field.create("UNUSEDATTHEEND109", 732, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND110 = Field.create("UNUSEDATTHEEND110", 733, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND111 = Field.create("UNUSEDATTHEEND111", 734, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND112 = Field.create("UNUSEDATTHEEND112", 735, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND113 = Field.create("UNUSEDATTHEEND113", 736, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND114 = Field.create("UNUSEDATTHEEND114", 737, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND115 = Field.create("UNUSEDATTHEEND115", 738, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND116 = Field.create("UNUSEDATTHEEND116", 739, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND117 = Field.create("UNUSEDATTHEEND117", 740, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND118 = Field.create("UNUSEDATTHEEND118", 741, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND119 = Field.create("UNUSEDATTHEEND119", 742, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND120 = Field.create("UNUSEDATTHEEND120", 743, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND121 = Field.create("UNUSEDATTHEEND121", 744, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND122 = Field.create("UNUSEDATTHEEND122", 745, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND123 = Field.create("UNUSEDATTHEEND123", 746, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND124 = Field.create("UNUSEDATTHEEND124", 747, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND125 = Field.create("UNUSEDATTHEEND125", 748, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND126 = Field.create("UNUSEDATTHEEND126", 749, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND127 = Field.create("UNUSEDATTHEEND127", 750, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND128 = Field.create("UNUSEDATTHEEND128", 751, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND129 = Field.create("UNUSEDATTHEEND129", 752, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND130 = Field.create("UNUSEDATTHEEND130", 753, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND131 = Field.create("UNUSEDATTHEEND131", 754, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND132 = Field.create("UNUSEDATTHEEND132", 755, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND133 = Field.create("UNUSEDATTHEEND133", 756, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND134 = Field.create("UNUSEDATTHEEND134", 757, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND135 = Field.create("UNUSEDATTHEEND135", 758, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND136 = Field.create("UNUSEDATTHEEND136", 759, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND137 = Field.create("UNUSEDATTHEEND137", 760, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND138 = Field.create("UNUSEDATTHEEND138", 761, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND139 = Field.create("UNUSEDATTHEEND139", 762, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND140 = Field.create("UNUSEDATTHEEND140", 763, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND141 = Field.create("UNUSEDATTHEEND141", 764, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND142 = Field.create("UNUSEDATTHEEND142", 765, FieldType.INT8).setScale(1.0); + public static final Field RAWMAF2 = Field.create("RAWMAF2", 624, FieldType.INT16).setScale(0.001); + public static final Field MAFMEASURED2 = Field.create("MAFMEASURED2", 626, FieldType.INT16).setScale(0.1); + public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 628, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 629, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 630, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 631, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 632, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 633, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 634, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 635, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 636, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 637, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 638, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 639, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 640, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 641, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 642, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 643, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 644, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 645, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 646, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 647, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 648, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 649, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 650, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 651, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 652, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 653, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 654, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 655, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 656, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 657, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 658, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 659, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 660, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 661, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 662, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 663, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 664, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 665, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 666, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 667, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 668, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 669, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 670, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 671, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 672, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 673, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 674, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 675, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 676, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 677, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 678, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 679, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 680, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 681, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 682, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 683, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 684, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 685, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 686, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 687, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 688, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 689, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 690, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 691, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 692, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 693, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 694, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 695, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 696, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 697, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 698, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 699, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 700, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 701, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 702, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 703, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 704, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 705, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND79 = Field.create("UNUSEDATTHEEND79", 706, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND80 = Field.create("UNUSEDATTHEEND80", 707, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND81 = Field.create("UNUSEDATTHEEND81", 708, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND82 = Field.create("UNUSEDATTHEEND82", 709, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND83 = Field.create("UNUSEDATTHEEND83", 710, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND84 = Field.create("UNUSEDATTHEEND84", 711, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND85 = Field.create("UNUSEDATTHEEND85", 712, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND86 = Field.create("UNUSEDATTHEEND86", 713, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND87 = Field.create("UNUSEDATTHEEND87", 714, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND88 = Field.create("UNUSEDATTHEEND88", 715, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND89 = Field.create("UNUSEDATTHEEND89", 716, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND90 = Field.create("UNUSEDATTHEEND90", 717, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND91 = Field.create("UNUSEDATTHEEND91", 718, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND92 = Field.create("UNUSEDATTHEEND92", 719, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND93 = Field.create("UNUSEDATTHEEND93", 720, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND94 = Field.create("UNUSEDATTHEEND94", 721, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND95 = Field.create("UNUSEDATTHEEND95", 722, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND96 = Field.create("UNUSEDATTHEEND96", 723, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND97 = Field.create("UNUSEDATTHEEND97", 724, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND98 = Field.create("UNUSEDATTHEEND98", 725, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND99 = Field.create("UNUSEDATTHEEND99", 726, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND100 = Field.create("UNUSEDATTHEEND100", 727, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND101 = Field.create("UNUSEDATTHEEND101", 728, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND102 = Field.create("UNUSEDATTHEEND102", 729, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND103 = Field.create("UNUSEDATTHEEND103", 730, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND104 = Field.create("UNUSEDATTHEEND104", 731, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND105 = Field.create("UNUSEDATTHEEND105", 732, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND106 = Field.create("UNUSEDATTHEEND106", 733, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND107 = Field.create("UNUSEDATTHEEND107", 734, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND108 = Field.create("UNUSEDATTHEEND108", 735, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND109 = Field.create("UNUSEDATTHEEND109", 736, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND110 = Field.create("UNUSEDATTHEEND110", 737, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND111 = Field.create("UNUSEDATTHEEND111", 738, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND112 = Field.create("UNUSEDATTHEEND112", 739, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND113 = Field.create("UNUSEDATTHEEND113", 740, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND114 = Field.create("UNUSEDATTHEEND114", 741, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND115 = Field.create("UNUSEDATTHEEND115", 742, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND116 = Field.create("UNUSEDATTHEEND116", 743, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND117 = Field.create("UNUSEDATTHEEND117", 744, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND118 = Field.create("UNUSEDATTHEEND118", 745, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND119 = Field.create("UNUSEDATTHEEND119", 746, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND120 = Field.create("UNUSEDATTHEEND120", 747, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND121 = Field.create("UNUSEDATTHEEND121", 748, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND122 = Field.create("UNUSEDATTHEEND122", 749, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND123 = Field.create("UNUSEDATTHEEND123", 750, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND124 = Field.create("UNUSEDATTHEEND124", 751, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND125 = Field.create("UNUSEDATTHEEND125", 752, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND126 = Field.create("UNUSEDATTHEEND126", 753, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND127 = Field.create("UNUSEDATTHEEND127", 754, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND128 = Field.create("UNUSEDATTHEEND128", 755, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND129 = Field.create("UNUSEDATTHEEND129", 756, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND130 = Field.create("UNUSEDATTHEEND130", 757, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND131 = Field.create("UNUSEDATTHEEND131", 758, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND132 = Field.create("UNUSEDATTHEEND132", 759, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND133 = Field.create("UNUSEDATTHEEND133", 760, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND134 = Field.create("UNUSEDATTHEEND134", 761, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND135 = Field.create("UNUSEDATTHEEND135", 762, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND136 = Field.create("UNUSEDATTHEEND136", 763, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND137 = Field.create("UNUSEDATTHEEND137", 764, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND138 = Field.create("UNUSEDATTHEEND138", 765, FieldType.INT8).setScale(1.0); public static final Field ALIGNMENTFILL_AT_766 = Field.create("ALIGNMENTFILL_AT_766", 766, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, @@ -1358,6 +1357,8 @@ public class TsOutputs { MAPFAST, LUAGAUGES1, LUAGAUGES2, + RAWMAF2, + MAFMEASURED2, UNUSEDATTHEEND1, UNUSEDATTHEEND2, UNUSEDATTHEEND3, @@ -1496,10 +1497,6 @@ public class TsOutputs { UNUSEDATTHEEND136, UNUSEDATTHEEND137, UNUSEDATTHEEND138, - UNUSEDATTHEEND139, - UNUSEDATTHEEND140, - UNUSEDATTHEEND141, - UNUSEDATTHEEND142, ALIGNMENTFILL_AT_766, }; }