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/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/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/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, }; }