From 249c664d33929efebf1a8eed79eabc3d76785383 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 6 Feb 2023 13:15:53 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../binary/output_channels_generated.h | 122 +++--- .../console/binary_log/log_fields_generated.h | 8 + .../algo/auto_generated_commonenum.cpp | 4 +- .../controllers/generated/signature_48way.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../rusefi/config/generated/AcControl.java | 26 +- .../config/generated/AntilagSystem.java | 28 +- .../rusefi/config/generated/BoostControl.java | 38 +- .../config/generated/ElectronicThrottle.java | 34 +- .../rusefi/config/generated/EngineState.java | 84 ++-- .../rusefi/config/generated/FanControl.java | 16 +- .../rusefi/config/generated/FuelComputer.java | 32 +- .../com/rusefi/config/generated/FuelPump.java | 10 +- .../generated/HighPressureFuelPump.java | 18 +- .../rusefi/config/generated/IdleState.java | 54 +-- .../config/generated/IgnitionState.java | 24 +- .../config/generated/InjectorModel.java | 8 +- .../config/generated/KnockController.java | 10 +- .../config/generated/LaunchControl.java | 24 +- .../rusefi/config/generated/MainRelay.java | 10 +- .../config/generated/TpsAccelState.java | 36 +- .../config/generated/TriggerCentral.java | 34 +- .../rusefi/config/generated/TriggerState.java | 20 +- .../config/generated/TriggerStatePrimary.java | 6 +- .../rusefi/config/generated/TsOutputs.java | 392 +++++++++--------- .../config/generated/WallFuelState.java | 6 +- .../config/generated/WidebandController.java | 18 +- 60 files changed, 618 insertions(+), 584 deletions(-) diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index c0f991af9e..e1caef459f 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 Tue Jan 17 01:56:08 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Feb 06 13:14:56 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1209,166 +1209,174 @@ struct output_channels_s { */ scaled_channel gppwmOutput[4]; /** - V * offset 558 */ + scaled_channel gppwmXAxis[4]; + /** + * offset 566 + */ + scaled_channel gppwmYAxis[4]; + /** + V + * offset 574 + */ scaled_channel rawBattery = (int16_t)0; /** % - * offset 560 + * offset 576 */ scaled_channel ignBlendBias[IGN_BLEND_COUNT]; /** deg - * offset 564 + * offset 580 */ scaled_channel ignBlendOutput[IGN_BLEND_COUNT]; /** % - * offset 572 + * offset 588 */ scaled_channel veBlendBias[VE_BLEND_COUNT]; /** % - * offset 576 + * offset 592 */ scaled_channel veBlendOutput[VE_BLEND_COUNT]; /** - offset 584 bit 0 */ + offset 600 bit 0 */ bool coilState1 : 1 {}; /** - offset 584 bit 1 */ + offset 600 bit 1 */ bool coilState2 : 1 {}; /** - offset 584 bit 2 */ + offset 600 bit 2 */ bool coilState3 : 1 {}; /** - offset 584 bit 3 */ + offset 600 bit 3 */ bool coilState4 : 1 {}; /** - offset 584 bit 4 */ + offset 600 bit 4 */ bool coilState5 : 1 {}; /** - offset 584 bit 5 */ + offset 600 bit 5 */ bool coilState6 : 1 {}; /** - offset 584 bit 6 */ + offset 600 bit 6 */ bool coilState7 : 1 {}; /** - offset 584 bit 7 */ + offset 600 bit 7 */ bool coilState8 : 1 {}; /** - offset 584 bit 8 */ + offset 600 bit 8 */ bool coilState9 : 1 {}; /** - offset 584 bit 9 */ + offset 600 bit 9 */ bool coilState10 : 1 {}; /** - offset 584 bit 10 */ + offset 600 bit 10 */ bool coilState11 : 1 {}; /** - offset 584 bit 11 */ + offset 600 bit 11 */ bool coilState12 : 1 {}; /** - offset 584 bit 12 */ + offset 600 bit 12 */ bool injectorState1 : 1 {}; /** - offset 584 bit 13 */ + offset 600 bit 13 */ bool injectorState2 : 1 {}; /** - offset 584 bit 14 */ + offset 600 bit 14 */ bool injectorState3 : 1 {}; /** - offset 584 bit 15 */ + offset 600 bit 15 */ bool injectorState4 : 1 {}; /** - offset 584 bit 16 */ + offset 600 bit 16 */ bool injectorState5 : 1 {}; /** - offset 584 bit 17 */ + offset 600 bit 17 */ bool injectorState6 : 1 {}; /** - offset 584 bit 18 */ + offset 600 bit 18 */ bool injectorState7 : 1 {}; /** - offset 584 bit 19 */ + offset 600 bit 19 */ bool injectorState8 : 1 {}; /** - offset 584 bit 20 */ + offset 600 bit 20 */ bool injectorState9 : 1 {}; /** - offset 584 bit 21 */ + offset 600 bit 21 */ bool injectorState10 : 1 {}; /** - offset 584 bit 22 */ + offset 600 bit 22 */ bool injectorState11 : 1 {}; /** - offset 584 bit 23 */ + offset 600 bit 23 */ bool injectorState12 : 1 {}; /** - offset 584 bit 24 */ - bool unusedBit_292_24 : 1 {}; + offset 600 bit 24 */ + bool unusedBit_294_24 : 1 {}; /** - offset 584 bit 25 */ - bool unusedBit_292_25 : 1 {}; + offset 600 bit 25 */ + bool unusedBit_294_25 : 1 {}; /** - offset 584 bit 26 */ - bool unusedBit_292_26 : 1 {}; + offset 600 bit 26 */ + bool unusedBit_294_26 : 1 {}; /** - offset 584 bit 27 */ - bool unusedBit_292_27 : 1 {}; + offset 600 bit 27 */ + bool unusedBit_294_27 : 1 {}; /** - offset 584 bit 28 */ - bool unusedBit_292_28 : 1 {}; + offset 600 bit 28 */ + bool unusedBit_294_28 : 1 {}; /** - offset 584 bit 29 */ - bool unusedBit_292_29 : 1 {}; + offset 600 bit 29 */ + bool unusedBit_294_29 : 1 {}; /** - offset 584 bit 30 */ - bool unusedBit_292_30 : 1 {}; + offset 600 bit 30 */ + bool unusedBit_294_30 : 1 {}; /** - offset 584 bit 31 */ - bool unusedBit_292_31 : 1 {}; + offset 600 bit 31 */ + bool unusedBit_294_31 : 1 {}; /** - * offset 588 + * offset 604 */ uint32_t outputRequestPeriod = (uint32_t)0; /** - * offset 592 + * offset 608 */ float mapFast = (float)0; /** value - * offset 596 + * offset 612 */ float luaGauges[LUA_GAUGE_COUNT]; /** V - * offset 604 + * offset 620 */ scaled_channel rawMaf2 = (uint16_t)0; /** * @@GAUGE_NAME_AIR_FLOW_MEASURED_2@@ kg/h - * offset 606 + * offset 622 */ scaled_channel mafMeasured2 = (uint16_t)0; /** - * offset 608 + * offset 624 */ uint16_t schedulingUsedCount = (uint16_t)0; /** - * offset 610 + * offset 626 */ uint8_t unusedAtTheEnd[136]; /** * need 4 byte alignment units - * offset 746 + * offset 762 */ - uint8_t alignmentFill_at_746[2]; + uint8_t alignmentFill_at_762[2]; }; -static_assert(sizeof(output_channels_s) == 748); +static_assert(sizeof(output_channels_s) == 764); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 17 01:56:08 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Feb 06 13:14:56 UTC 2023 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 9835f90455..5891d0b559 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -222,6 +222,14 @@ static constexpr LogField fields[] = { {engine->outputChannels.gppwmOutput[1], "GPPWM Output 2", "%", 2}, {engine->outputChannels.gppwmOutput[2], "GPPWM Output 3", "%", 2}, {engine->outputChannels.gppwmOutput[3], "GPPWM Output 4", "%", 2}, + {engine->outputChannels.gppwmXAxis[0], "gppwmXAxis 1", "", 0}, + {engine->outputChannels.gppwmXAxis[1], "gppwmXAxis 2", "", 0}, + {engine->outputChannels.gppwmXAxis[2], "gppwmXAxis 3", "", 0}, + {engine->outputChannels.gppwmXAxis[3], "gppwmXAxis 4", "", 0}, + {engine->outputChannels.gppwmYAxis[0], "gppwmYAxis 1", "", 1}, + {engine->outputChannels.gppwmYAxis[1], "gppwmYAxis 2", "", 1}, + {engine->outputChannels.gppwmYAxis[2], "gppwmYAxis 3", "", 1}, + {engine->outputChannels.gppwmYAxis[3], "gppwmYAxis 4", "", 1}, {engine->outputChannels.rawBattery, "rawBattery", "V", 3}, {engine->outputChannels.ignBlendBias[0], "ignBlendBias 1", "%", 1}, {engine->outputChannels.ignBlendBias[1], "ignBlendBias 2", "%", 1}, diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index eef925ec26..2fba54764b 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Tue Jan 24 01:29:38 UTC 2023 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Mon Feb 06 13:14:54 UTC 2023 // see also gen_config_and_enums.bat @@ -390,6 +390,8 @@ case GPPWM_LuaGauge2: return "GPPWM_LuaGauge2"; case GPPWM_Map: return "GPPWM_Map"; +case GPPWM_Rpm: + return "GPPWM_Rpm"; case GPPWM_Tps: return "GPPWM_Tps"; case GPPWM_VVT_1E: diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 7f37452acd..ef0ff3272c 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1006407179 -#define TS_SIGNATURE "rusEFI master.2023.02.06.48way.1006407179" +#define SIGNATURE_HASH 261913651 +#define TS_SIGNATURE "rusEFI master.2023.02.06.48way.261913651" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d7cc6f0eaf..22c7b95e4a 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 516496168 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-2chan.516496168" +#define SIGNATURE_HASH 715778320 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-2chan.715778320" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 2ba9bc7d11..a14ed5fe15 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1672648557 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-4chan.1672648557" +#define SIGNATURE_HASH 1473406293 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-4chan.1473406293" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 1780f1d71e..a2ad6eb81d 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2238605546 -#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-8chan.2238605546" +#define SIGNATURE_HASH 2970524370 +#define TS_SIGNATURE "rusEFI master.2023.02.06.alphax-8chan.2970524370" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 9cf09be918..0e53119397 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 806450019 -#define TS_SIGNATURE "rusEFI master.2023.02.06.atlas.806450019" +#define SIGNATURE_HASH 74547547 +#define TS_SIGNATURE "rusEFI master.2023.02.06.atlas.74547547" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 941ccab465..441542dd8c 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3661092797 -#define TS_SIGNATURE "rusEFI master.2023.02.06.core8.3661092797" +#define SIGNATURE_HASH 3998688645 +#define TS_SIGNATURE "rusEFI master.2023.02.06.core8.3998688645" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 708ad94205..d954039717 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 752584260 -#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.752584260" +#define SIGNATURE_HASH 414938236 +#define TS_SIGNATURE "rusEFI master.2023.02.06.cypress.414938236" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 80aebdbe77..563e739476 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1150589154 -#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.1150589154" +#define SIGNATURE_HASH 1895066330 +#define TS_SIGNATURE "rusEFI master.2023.02.06.f407-discovery.1895066330" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index f804e34975..5bd7b7250e 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 752584260 -#define TS_SIGNATURE "rusEFI master.2023.02.06.f429-discovery.752584260" +#define SIGNATURE_HASH 414938236 +#define TS_SIGNATURE "rusEFI master.2023.02.06.f429-discovery.414938236" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 40f5d69bfb..09571d108f 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1857518208 -#define TS_SIGNATURE "rusEFI master.2023.02.06.frankenso_na6.1857518208" +#define SIGNATURE_HASH 1524074680 +#define TS_SIGNATURE "rusEFI master.2023.02.06.frankenso_na6.1524074680" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 98f086a40c..cd94ee89e2 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3776626875 -#define TS_SIGNATURE "rusEFI master.2023.02.06.harley81.3776626875" +#define SIGNATURE_HASH 3581555331 +#define TS_SIGNATURE "rusEFI master.2023.02.06.harley81.3581555331" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index f0e59eaccd..b2a4ef8d3f 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 924312896 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-gm-e67.924312896" +#define SIGNATURE_HASH 58136440 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-gm-e67.58136440" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index be8eb493a8..6da6529587 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1116467844 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-honda-k.1116467844" +#define SIGNATURE_HASH 1995112636 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-honda-k.1995112636" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 377f3be04f..8ad2584044 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3230434989 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-nb1.3230434989" +#define SIGNATURE_HASH 4109137045 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen-nb1.4109137045" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index eb4a54604e..9681062b87 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 405945316 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121nissan.405945316" +#define SIGNATURE_HASH 743623132 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121nissan.743623132" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d9d59cee86..65352c5fa4 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3194622297 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121vag.3194622297" +#define SIGNATURE_HASH 2315969377 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen121vag.2315969377" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index b93bf5adab..b504f4daf8 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 214956927 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen128.214956927" +#define SIGNATURE_HASH 950995271 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen128.950995271" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index c471127cc4..3e38a8c99a 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2403318951 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen154hyundai.2403318951" +#define SIGNATURE_HASH 3143585439 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen154hyundai.3143585439" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ed56121593..92a3d848fb 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3575482575 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen72.3575482575" +#define SIGNATURE_HASH 3783097079 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen72.3783097079" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a15eaf2d0d..6cd48ad317 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2358581305 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen81.2358581305" +#define SIGNATURE_HASH 3103123969 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen81.3103123969" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 3de2933b66..5775f5390c 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 959354248 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen88bmw.959354248" +#define SIGNATURE_HASH 223242160 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellen88bmw.223242160" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 37b83dacfc..37f6362150 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1922512755 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA6.1922512755" +#define SIGNATURE_HASH 1190643019 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA6.1190643019" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 74b517e889..9bb186c19a 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2362587052 -#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA8_96.2362587052" +#define SIGNATURE_HASH 3098723732 +#define TS_SIGNATURE "rusEFI master.2023.02.06.hellenNA8_96.3098723732" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 4b118c6289..1dc5e4fe48 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1141646472 -#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.1141646472" +#define SIGNATURE_HASH 1886181040 +#define TS_SIGNATURE "rusEFI master.2023.02.06.kin.1886181040" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index d150dfd2ab..a8df18ad5b 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4082457471 -#define TS_SIGNATURE "rusEFI master.2023.02.06.m74_9.4082457471" +#define SIGNATURE_HASH 3342182727 +#define TS_SIGNATURE "rusEFI master.2023.02.06.m74_9.3342182727" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f6cecb57a1..51d3dcf972 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3111313732 -#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f4.3111313732" +#define SIGNATURE_HASH 2366772092 +#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f4.2366772092" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index f2afdafc8d..a461fe6999 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3111313732 -#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f7.3111313732" +#define SIGNATURE_HASH 2366772092 +#define TS_SIGNATURE "rusEFI master.2023.02.06.mre_f7.2366772092" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 467723e15e..3e3eb697a1 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2083610530 -#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_405.2083610530" +#define SIGNATURE_HASH 1213312410 +#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_405.1213312410" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 87be86455a..9be994c879 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2083610530 -#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_469.2083610530" +#define SIGNATURE_HASH 1213312410 +#define TS_SIGNATURE "rusEFI master.2023.02.06.prometheus_469.1213312410" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 6d8a72c1a4..e0981000ee 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 281693684 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f4.281693684" +#define SIGNATURE_HASH 615169996 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f4.615169996" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d88cb62a70..c0b4f7d544 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 281693684 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f7.281693684" +#define SIGNATURE_HASH 615169996 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_f7.615169996" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index aa06f69595..9f834f3076 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 281693684 -#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_h7.281693684" +#define SIGNATURE_HASH 615169996 +#define TS_SIGNATURE "rusEFI master.2023.02.06.proteus_h7.615169996" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index a7b5668efd..7662edd7fa 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 654779779 -#define TS_SIGNATURE "rusEFI master.2023.02.06.s105.654779779" +#define SIGNATURE_HASH 325572539 +#define TS_SIGNATURE "rusEFI master.2023.02.06.s105.325572539" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b31a03f046..3554e4a1e8 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1438998430 -#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.1438998430" +#define SIGNATURE_HASH 1638247846 +#define TS_SIGNATURE "rusEFI master.2023.02.06.subaru_eg33_f7.1638247846" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index c4fc175b2a..12ad9a3754 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1964860616 -#define TS_SIGNATURE "rusEFI master.2023.02.06.tdg-pdm8.1964860616" +#define SIGNATURE_HASH 1098749680 +#define TS_SIGNATURE "rusEFI master.2023.02.06.tdg-pdm8.1098749680" 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 5733b2b821..1d57fde355 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 Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class AcControl { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,17 +403,17 @@ public class AcControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(924); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(924); - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(924); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(924); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(924); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(924); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(924); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(924); - public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(924); - public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(924); - public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(924); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(940); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(940); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(940); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(940); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(940); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(940); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(940); + public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(940); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(940); + public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(940); + public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(940); public static final Field[] VALUES = { ACBUTTONSTATE, M_ACENABLED, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index 6872764b42..d77bf31c0e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.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/antilag_system_state.txt Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class AntilagSystem { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,18 +403,18 @@ public class AntilagSystem { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(888); - public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(888); - public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(888); - public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(888); - public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(888); - public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(888); - public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(888); - public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(888); - public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(888); - public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(888); - public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(888); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(888); + public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(904); + public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(904); + public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(904); + public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(904); + public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(904); + public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(904); + public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(904); + public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(904); + public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(904); + public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(904); + public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(904); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(904); public static final Field[] VALUES = { ISANTILAGCONDITION, ALSMINRPMCONDITION, 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 266aeae275..efdb88ce05 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 Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class BoostControl { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,23 +403,23 @@ public class BoostControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(900); - public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(900); - public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(900); - public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(900); - public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(900); - public static final Field HASINITBOOST = Field.create("HASINITBOOST", 0, FieldType.BIT, 5).setBaseOffset(900); - public static final Field RPMTOOLOW = Field.create("RPMTOOLOW", 0, FieldType.BIT, 6).setBaseOffset(900); - public static final Field TPSTOOLOW = Field.create("TPSTOOLOW", 0, FieldType.BIT, 7).setBaseOffset(900); - public static final Field MAPTOOLOW = Field.create("MAPTOOLOW", 0, FieldType.BIT, 8).setBaseOffset(900); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.INT16).setScale(0.5).setBaseOffset(900); - public static final Field BOOSTOUTPUT = Field.create("BOOSTOUTPUT", 6, FieldType.INT16).setScale(0.01).setBaseOffset(900); - public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(900); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(900); - public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(900); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(900); - public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(900); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(900); + public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(916); + public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(916); + public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(916); + public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(916); + public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(916); + public static final Field HASINITBOOST = Field.create("HASINITBOOST", 0, FieldType.BIT, 5).setBaseOffset(916); + public static final Field RPMTOOLOW = Field.create("RPMTOOLOW", 0, FieldType.BIT, 6).setBaseOffset(916); + public static final Field TPSTOOLOW = Field.create("TPSTOOLOW", 0, FieldType.BIT, 7).setBaseOffset(916); + public static final Field MAPTOOLOW = Field.create("MAPTOOLOW", 0, FieldType.BIT, 8).setBaseOffset(916); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.INT16).setScale(0.5).setBaseOffset(916); + public static final Field BOOSTOUTPUT = Field.create("BOOSTOUTPUT", 6, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(916); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(916); + public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(916); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(916); + public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(916); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(916); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index b7816fb05d..dac26c7179 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,27 +1,27 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sun Jan 15 04:27:57 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class ElectronicThrottle { - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1240); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1240); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1240); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 28, FieldType.BIT, 1).setBaseOffset(1240); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1240); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1240); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1240); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1240); - public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1240); - public static final Field JAMTIMER = Field.create("JAMTIMER", 46, FieldType.INT16).setScale(0.01).setBaseOffset(1240); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1256); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1256); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1256); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 28, FieldType.BIT, 1).setBaseOffset(1256); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1256); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1256); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1256); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1256); + public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1256); + public static final Field JAMTIMER = Field.create("JAMTIMER", 46, FieldType.INT16).setScale(0.01).setBaseOffset(1256); public static final Field[] VALUES = { IDLEPOSITION, TRIM, 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 419b335a34..22d4582c45 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 Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class EngineState { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,46 +403,46 @@ public class EngineState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(948); - public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(948); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(948); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(948); - public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(948); - public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(948); - public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(948); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(948); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(948); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(948); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(948); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(948); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(948); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(948); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(948); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(948); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(948); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(948); - public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(948); - public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(948); - public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(948); - public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(948); - public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(948); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 76, FieldType.INT16).setScale(1.0).setBaseOffset(948); - public static final Field ALIGNMENTFILL_AT_78 = Field.create("ALIGNMENTFILL_AT_78", 78, FieldType.INT8).setScale(1.0).setBaseOffset(948); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 80, FieldType.BIT, 0).setBaseOffset(948); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 80, FieldType.BIT, 1).setBaseOffset(948); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 80, FieldType.BIT, 2).setBaseOffset(948); - public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 80, FieldType.BIT, 3).setBaseOffset(948); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 84, FieldType.INT).setScale(1.0).setBaseOffset(948); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 88, FieldType.FLOAT).setBaseOffset(948); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 92, FieldType.FLOAT).setBaseOffset(948); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 96, FieldType.INT16).setScale(1.0).setBaseOffset(948); - public static final Field ALIGNMENTFILL_AT_98 = Field.create("ALIGNMENTFILL_AT_98", 98, FieldType.INT8).setScale(1.0).setBaseOffset(948); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 100, FieldType.INT).setScale(1.0).setBaseOffset(948); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 104, FieldType.INT).setScale(1.0).setBaseOffset(948); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 108, FieldType.FLOAT).setBaseOffset(948); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 112, FieldType.FLOAT).setBaseOffset(948); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 116, FieldType.INT16).setScale(0.01).setBaseOffset(948); - public static final Field ALIGNMENTFILL_AT_118 = Field.create("ALIGNMENTFILL_AT_118", 118, FieldType.INT8).setScale(1.0).setBaseOffset(948); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(964); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(964); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(964); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(964); + public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(964); + public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(964); + public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(964); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(964); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(964); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(964); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(964); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(964); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(964); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(964); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(964); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(964); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(964); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(964); + public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(964); + public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(964); + public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(964); + public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(964); + public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(964); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 76, FieldType.INT16).setScale(1.0).setBaseOffset(964); + public static final Field ALIGNMENTFILL_AT_78 = Field.create("ALIGNMENTFILL_AT_78", 78, FieldType.INT8).setScale(1.0).setBaseOffset(964); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 80, FieldType.BIT, 0).setBaseOffset(964); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 80, FieldType.BIT, 1).setBaseOffset(964); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 80, FieldType.BIT, 2).setBaseOffset(964); + public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 80, FieldType.BIT, 3).setBaseOffset(964); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 84, FieldType.INT).setScale(1.0).setBaseOffset(964); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 88, FieldType.FLOAT).setBaseOffset(964); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 92, FieldType.FLOAT).setBaseOffset(964); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 96, FieldType.INT16).setScale(1.0).setBaseOffset(964); + public static final Field ALIGNMENTFILL_AT_98 = Field.create("ALIGNMENTFILL_AT_98", 98, FieldType.INT8).setScale(1.0).setBaseOffset(964); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 100, FieldType.INT).setScale(1.0).setBaseOffset(964); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 104, FieldType.INT).setScale(1.0).setBaseOffset(964); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 108, FieldType.FLOAT).setBaseOffset(964); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 112, FieldType.FLOAT).setBaseOffset(964); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 116, FieldType.INT16).setScale(0.01).setBaseOffset(964); + public static final Field ALIGNMENTFILL_AT_118 = Field.create("ALIGNMENTFILL_AT_118", 118, FieldType.INT8).setScale(1.0).setBaseOffset(964); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java index e46e634605..5c763920cc 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java @@ -1,18 +1,18 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FanControl { - public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(936); - public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(936); - public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(936); - public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(936); - public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(936); - public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(936); - public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(936); + public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(952); + public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(952); + public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(952); + public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(952); + public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(952); + public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(952); + public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(952); public static final Field[] VALUES = { CRANKING, NOTRUNNING, 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 e096b5c4f1..ca42562063 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 Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class FuelComputer { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,20 +403,20 @@ public class FuelComputer { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 4, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 8, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 12, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 16, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 20, FieldType.FLOAT).setBaseOffset(748); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 24, FieldType.FLOAT).setBaseOffset(748); - public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 28, FieldType.INT16).setScale(0.01).setBaseOffset(748); - public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 30, FieldType.INT16).setScale(1.0E-4).setBaseOffset(748); - public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.INT16).setScale(0.001).setBaseOffset(748); - public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 34, FieldType.INT16).setScale(0.001).setBaseOffset(748); - public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 36, FieldType.FLOAT).setBaseOffset(748); - public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 40, FieldType.FLOAT).setBaseOffset(748); - public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 44, FieldType.BIT, 0).setBaseOffset(748); + public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 4, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 8, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 12, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 16, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 20, FieldType.FLOAT).setBaseOffset(764); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 24, FieldType.FLOAT).setBaseOffset(764); + public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 28, FieldType.INT16).setScale(0.01).setBaseOffset(764); + public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 30, FieldType.INT16).setScale(1.0E-4).setBaseOffset(764); + public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.INT16).setScale(0.001).setBaseOffset(764); + public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 34, FieldType.INT16).setScale(0.001).setBaseOffset(764); + public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 36, FieldType.FLOAT).setBaseOffset(764); + public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 40, FieldType.FLOAT).setBaseOffset(764); + public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 44, FieldType.BIT, 0).setBaseOffset(764); public static final Field[] VALUES = { TOTALFUELCORRECTION, RUNNING_POSTCRANKINGFUELCORRECTION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java index c34fdbd640..e8ee89efb4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelPump { - public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(940); - public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(940); - public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(940); - public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(940); + public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(956); + public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(956); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(956); + public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(956); public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java index f8699047c9..9ae9beb30e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class HighPressureFuelPump { - public static final Field M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 0, FieldType.FLOAT).setBaseOffset(844); - public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 4, FieldType.FLOAT).setBaseOffset(844); - public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 8, FieldType.FLOAT).setBaseOffset(844); - public static final Field NOVALVE = Field.create("NOVALVE", 12, FieldType.BIT, 0).setBaseOffset(844); - public static final Field ANGLEABOVEMIN = Field.create("ANGLEABOVEMIN", 12, FieldType.BIT, 1).setBaseOffset(844); - public static final Field ISHPFPINACTIVE = Field.create("ISHPFPINACTIVE", 12, FieldType.BIT, 2).setBaseOffset(844); - public static final Field NEXTLOBE = Field.create("NEXTLOBE", 16, FieldType.FLOAT).setBaseOffset(844); - public static final Field DI_NEXTSTART = Field.create("DI_NEXTSTART", 20, FieldType.FLOAT).setBaseOffset(844); + public static final Field M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 0, FieldType.FLOAT).setBaseOffset(860); + public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 4, FieldType.FLOAT).setBaseOffset(860); + public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 8, FieldType.FLOAT).setBaseOffset(860); + public static final Field NOVALVE = Field.create("NOVALVE", 12, FieldType.BIT, 0).setBaseOffset(860); + public static final Field ANGLEABOVEMIN = Field.create("ANGLEABOVEMIN", 12, FieldType.BIT, 1).setBaseOffset(860); + public static final Field ISHPFPINACTIVE = Field.create("ISHPFPINACTIVE", 12, FieldType.BIT, 2).setBaseOffset(860); + public static final Field NEXTLOBE = Field.create("NEXTLOBE", 16, FieldType.FLOAT).setBaseOffset(860); + public static final Field DI_NEXTSTART = Field.create("DI_NEXTSTART", 20, FieldType.FLOAT).setBaseOffset(860); public static final Field[] VALUES = { M_REQUESTED_PUMP, FUEL_REQUESTED_PERCENT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index 579a4e2bcd..ed10dffa7f 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,37 +1,37 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IdleState { - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1200); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1200); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1200); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1200); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1200); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1200); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1200); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1200); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1200); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1200); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1200); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1200); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1200); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1200); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1200); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1200); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1200); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1200); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1200); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1200); - public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1200); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1200); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1200); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1200); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1200); - public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1200); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1216); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1216); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1216); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1216); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1216); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1216); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1216); + public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1216); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1216); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1216); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1216); + public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1216); + public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1216); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1216); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1216); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1216); + public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1216); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1216); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1216); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1216); + public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1216); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1216); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1216); + public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1216); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1216); + public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1216); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java index b5269736fa..558d7a6e55 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.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/ignition_state.txt Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class IgnitionState { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,16 +403,16 @@ public class IgnitionState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(796); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 4, FieldType.FLOAT).setBaseOffset(796); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 8, FieldType.FLOAT).setBaseOffset(796); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 12, FieldType.INT16).setScale(0.01).setBaseOffset(796); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 14, FieldType.INT16).setScale(0.01).setBaseOffset(796); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 16, FieldType.INT16).setScale(0.01).setBaseOffset(796); - public static final Field ALIGNMENTFILL_AT_18 = Field.create("ALIGNMENTFILL_AT_18", 18, FieldType.INT8).setScale(1.0).setBaseOffset(796); - public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 20, FieldType.FLOAT).setBaseOffset(796); - public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 24, FieldType.FLOAT).setBaseOffset(796); - public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 28, FieldType.FLOAT).setBaseOffset(796); + public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(812); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 4, FieldType.FLOAT).setBaseOffset(812); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 8, FieldType.FLOAT).setBaseOffset(812); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 12, FieldType.INT16).setScale(0.01).setBaseOffset(812); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 14, FieldType.INT16).setScale(0.01).setBaseOffset(812); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 16, FieldType.INT16).setScale(0.01).setBaseOffset(812); + public static final Field ALIGNMENTFILL_AT_18 = Field.create("ALIGNMENTFILL_AT_18", 18, FieldType.INT8).setScale(1.0).setBaseOffset(812); + public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 20, FieldType.FLOAT).setBaseOffset(812); + public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 24, FieldType.FLOAT).setBaseOffset(812); + public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 28, FieldType.FLOAT).setBaseOffset(812); public static final Field[] VALUES = { BASEDWELL, SPARKDWELL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java index 81025be5ae..d78dc9ea6c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java @@ -1,14 +1,14 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class InjectorModel { - public static final Field M_DEADTIME = Field.create("M_DEADTIME", 0, FieldType.FLOAT).setBaseOffset(868); - public static final Field PRESSUREDELTA = Field.create("PRESSUREDELTA", 4, FieldType.FLOAT).setBaseOffset(868); - public static final Field PRESSURERATIO = Field.create("PRESSURERATIO", 8, FieldType.FLOAT).setBaseOffset(868); + public static final Field M_DEADTIME = Field.create("M_DEADTIME", 0, FieldType.FLOAT).setBaseOffset(884); + public static final Field PRESSUREDELTA = Field.create("PRESSUREDELTA", 4, FieldType.FLOAT).setBaseOffset(884); + public static final Field PRESSURERATIO = Field.create("PRESSURERATIO", 8, FieldType.FLOAT).setBaseOffset(884); public static final Field[] VALUES = { M_DEADTIME, PRESSUREDELTA, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java index cad2946acf..bec71dccc4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/knock_controller.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/knock_controller.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class KnockController { - public static final Field M_KNOCKRETARD = Field.create("M_KNOCKRETARD", 0, FieldType.FLOAT).setBaseOffset(828); - public static final Field M_KNOCKTHRESHOLD = Field.create("M_KNOCKTHRESHOLD", 4, FieldType.FLOAT).setBaseOffset(828); - public static final Field M_KNOCKCOUNT = Field.create("M_KNOCKCOUNT", 8, FieldType.INT).setScale(1.0).setBaseOffset(828); - public static final Field M_MAXIMUMRETARD = Field.create("M_MAXIMUMRETARD", 12, FieldType.FLOAT).setBaseOffset(828); + public static final Field M_KNOCKRETARD = Field.create("M_KNOCKRETARD", 0, FieldType.FLOAT).setBaseOffset(844); + public static final Field M_KNOCKTHRESHOLD = Field.create("M_KNOCKTHRESHOLD", 4, FieldType.FLOAT).setBaseOffset(844); + public static final Field M_KNOCKCOUNT = Field.create("M_KNOCKCOUNT", 8, FieldType.INT).setScale(1.0).setBaseOffset(844); + public static final Field M_MAXIMUMRETARD = Field.create("M_MAXIMUMRETARD", 12, FieldType.FLOAT).setBaseOffset(844); public static final Field[] VALUES = { M_KNOCKRETARD, M_KNOCKTHRESHOLD, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java index dde71b7d19..6b60646d61 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java @@ -1,22 +1,22 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LaunchControl { - public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(880); - public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(880); - public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(880); - public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(880); - public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(880); - public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(880); - public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(880); - public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(880); - public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(880); - public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(880); - public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(880); + public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(896); + public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(896); + public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(896); + public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(896); + public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(896); + public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(896); + public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(896); + public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(896); + public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(896); + public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(896); + public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(896); public static final Field[] VALUES = { RETARDTHRESHOLDRPM, COMBINEDCONDITIONS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java index 83b3b01ea7..a823d8b78c 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class MainRelay { - public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(944); - public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(944); - public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(944); - public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(944); + public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(960); + public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(960); + public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(960); + public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(960); public static final Field[] VALUES = { ISBENCHTEST, HASIGNITIONVOLTAGE, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index 993b37f411..ac41d20fd5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,28 +1,28 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TpsAccelState { - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1068); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1068); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1068); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1068); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1068); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1068); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1068); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1068); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1068); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1068); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1068); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1068); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1068); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1068); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1068); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1068); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1068); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1084); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1084); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1084); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1084); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1084); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1084); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1084); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1084); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1084); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1084); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1084); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1084); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1084); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1084); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1084); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1084); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1084); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 6d59f14f48..b406704dc3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,28 +1,28 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1116); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1116); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1116); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1116); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1116); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1116); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1116); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1116); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1116); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1116); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1132); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1132); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1132); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1132); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1132); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1132); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1132); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1132); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1132); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1132); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, 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 e15f07f56c..933da8b23f 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 Sat Jan 21 02:47:03 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class TriggerState { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,14 +403,14 @@ public class TriggerState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1168); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1168); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1168); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1168); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 16, FieldType.INT8).setScale(1.0).setBaseOffset(1168); - public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 17, FieldType.INT8).setScale(1.0).setBaseOffset(1168); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 18, FieldType.INT8).setScale(1.0).setBaseOffset(1168); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 19, FieldType.INT8).setScale(1.0).setBaseOffset(1168); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1184); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1184); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1184); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1184); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 16, FieldType.INT8).setScale(1.0).setBaseOffset(1184); + public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 17, FieldType.INT8).setScale(1.0).setBaseOffset(1184); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 18, FieldType.INT8).setScale(1.0).setBaseOffset(1184); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 19, FieldType.INT8).setScale(1.0).setBaseOffset(1184); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, 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 34e7ae6e7e..bce223fcec 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 Sat Jan 21 02:47:03 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class TriggerStatePrimary { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -403,7 +403,7 @@ public class TriggerStatePrimary { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1188); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1204); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, }; 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 1980cf66b5..ff005ca105 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 Sat Jan 21 02:47:02 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Feb 06 13:14:56 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class TsOutputs { public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; - public static final int FLASH_DATA_VERSION = 10018; + public static final int FLASH_DATA_VERSION = 10019; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -679,191 +679,199 @@ public class TsOutputs { public static final Field GPPWMOUTPUT2 = Field.create("GPPWMOUTPUT2", 555, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field GPPWMOUTPUT3 = Field.create("GPPWMOUTPUT3", 556, FieldType.INT8).setScale(0.5).setBaseOffset(0); public static final Field GPPWMOUTPUT4 = Field.create("GPPWMOUTPUT4", 557, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field RAWBATTERY = Field.create("RAWBATTERY", 558, FieldType.INT16).setScale(0.001).setBaseOffset(0); - public static final Field IGNBLENDBIAS1 = Field.create("IGNBLENDBIAS1", 560, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field IGNBLENDBIAS2 = Field.create("IGNBLENDBIAS2", 561, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field IGNBLENDBIAS3 = Field.create("IGNBLENDBIAS3", 562, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field IGNBLENDBIAS4 = Field.create("IGNBLENDBIAS4", 563, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field IGNBLENDOUTPUT1 = Field.create("IGNBLENDOUTPUT1", 564, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field IGNBLENDOUTPUT2 = Field.create("IGNBLENDOUTPUT2", 566, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field IGNBLENDOUTPUT3 = Field.create("IGNBLENDOUTPUT3", 568, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field IGNBLENDOUTPUT4 = Field.create("IGNBLENDOUTPUT4", 570, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field VEBLENDBIAS1 = Field.create("VEBLENDBIAS1", 572, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field VEBLENDBIAS2 = Field.create("VEBLENDBIAS2", 573, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field VEBLENDBIAS3 = Field.create("VEBLENDBIAS3", 574, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field VEBLENDBIAS4 = Field.create("VEBLENDBIAS4", 575, FieldType.INT8).setScale(0.5).setBaseOffset(0); - public static final Field VEBLENDOUTPUT1 = Field.create("VEBLENDOUTPUT1", 576, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field VEBLENDOUTPUT2 = Field.create("VEBLENDOUTPUT2", 578, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field VEBLENDOUTPUT3 = Field.create("VEBLENDOUTPUT3", 580, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field VEBLENDOUTPUT4 = Field.create("VEBLENDOUTPUT4", 582, FieldType.INT16).setScale(0.01).setBaseOffset(0); - public static final Field COILSTATE1 = Field.create("COILSTATE1", 584, FieldType.BIT, 0).setBaseOffset(0); - public static final Field COILSTATE2 = Field.create("COILSTATE2", 584, FieldType.BIT, 1).setBaseOffset(0); - public static final Field COILSTATE3 = Field.create("COILSTATE3", 584, FieldType.BIT, 2).setBaseOffset(0); - public static final Field COILSTATE4 = Field.create("COILSTATE4", 584, FieldType.BIT, 3).setBaseOffset(0); - public static final Field COILSTATE5 = Field.create("COILSTATE5", 584, FieldType.BIT, 4).setBaseOffset(0); - public static final Field COILSTATE6 = Field.create("COILSTATE6", 584, FieldType.BIT, 5).setBaseOffset(0); - public static final Field COILSTATE7 = Field.create("COILSTATE7", 584, FieldType.BIT, 6).setBaseOffset(0); - public static final Field COILSTATE8 = Field.create("COILSTATE8", 584, FieldType.BIT, 7).setBaseOffset(0); - public static final Field COILSTATE9 = Field.create("COILSTATE9", 584, FieldType.BIT, 8).setBaseOffset(0); - public static final Field COILSTATE10 = Field.create("COILSTATE10", 584, FieldType.BIT, 9).setBaseOffset(0); - public static final Field COILSTATE11 = Field.create("COILSTATE11", 584, FieldType.BIT, 10).setBaseOffset(0); - public static final Field COILSTATE12 = Field.create("COILSTATE12", 584, FieldType.BIT, 11).setBaseOffset(0); - public static final Field INJECTORSTATE1 = Field.create("INJECTORSTATE1", 584, FieldType.BIT, 12).setBaseOffset(0); - public static final Field INJECTORSTATE2 = Field.create("INJECTORSTATE2", 584, FieldType.BIT, 13).setBaseOffset(0); - public static final Field INJECTORSTATE3 = Field.create("INJECTORSTATE3", 584, FieldType.BIT, 14).setBaseOffset(0); - public static final Field INJECTORSTATE4 = Field.create("INJECTORSTATE4", 584, FieldType.BIT, 15).setBaseOffset(0); - public static final Field INJECTORSTATE5 = Field.create("INJECTORSTATE5", 584, FieldType.BIT, 16).setBaseOffset(0); - public static final Field INJECTORSTATE6 = Field.create("INJECTORSTATE6", 584, FieldType.BIT, 17).setBaseOffset(0); - public static final Field INJECTORSTATE7 = Field.create("INJECTORSTATE7", 584, FieldType.BIT, 18).setBaseOffset(0); - public static final Field INJECTORSTATE8 = Field.create("INJECTORSTATE8", 584, FieldType.BIT, 19).setBaseOffset(0); - public static final Field INJECTORSTATE9 = Field.create("INJECTORSTATE9", 584, FieldType.BIT, 20).setBaseOffset(0); - public static final Field INJECTORSTATE10 = Field.create("INJECTORSTATE10", 584, FieldType.BIT, 21).setBaseOffset(0); - public static final Field INJECTORSTATE11 = Field.create("INJECTORSTATE11", 584, FieldType.BIT, 22).setBaseOffset(0); - public static final Field INJECTORSTATE12 = Field.create("INJECTORSTATE12", 584, FieldType.BIT, 23).setBaseOffset(0); - public static final Field OUTPUTREQUESTPERIOD = Field.create("OUTPUTREQUESTPERIOD", 588, FieldType.INT).setScale(1.0).setBaseOffset(0); - public static final Field MAPFAST = Field.create("MAPFAST", 592, FieldType.FLOAT).setBaseOffset(0); - public static final Field LUAGAUGES1 = Field.create("LUAGAUGES1", 596, FieldType.FLOAT).setBaseOffset(0); - public static final Field LUAGAUGES2 = Field.create("LUAGAUGES2", 600, FieldType.FLOAT).setBaseOffset(0); - public static final Field RAWMAF2 = Field.create("RAWMAF2", 604, FieldType.INT16).setScale(0.001).setBaseOffset(0); - public static final Field MAFMEASURED2 = Field.create("MAFMEASURED2", 606, FieldType.INT16).setScale(0.1).setBaseOffset(0); - public static final Field SCHEDULINGUSEDCOUNT = Field.create("SCHEDULINGUSEDCOUNT", 608, FieldType.INT16).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 610, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 611, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 612, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 613, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 614, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 615, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 616, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 617, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 618, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 619, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 620, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 621, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 622, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 623, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 624, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 625, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 626, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 627, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 628, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 629, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 630, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 631, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 632, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 633, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 634, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 635, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 636, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 637, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 638, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 639, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 640, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 641, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 642, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 643, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 644, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 645, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 646, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 647, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 648, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 649, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 650, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 651, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 652, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 653, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 654, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 655, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 656, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 657, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 658, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 659, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 660, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 661, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 662, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 663, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 664, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 665, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 666, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 667, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 668, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 669, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 670, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 671, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 672, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 673, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 674, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 675, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 676, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 677, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 678, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 679, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 680, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 681, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 682, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 683, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 684, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 685, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 686, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 687, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND79 = Field.create("UNUSEDATTHEEND79", 688, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND80 = Field.create("UNUSEDATTHEEND80", 689, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND81 = Field.create("UNUSEDATTHEEND81", 690, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND82 = Field.create("UNUSEDATTHEEND82", 691, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND83 = Field.create("UNUSEDATTHEEND83", 692, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND84 = Field.create("UNUSEDATTHEEND84", 693, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND85 = Field.create("UNUSEDATTHEEND85", 694, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND86 = Field.create("UNUSEDATTHEEND86", 695, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND87 = Field.create("UNUSEDATTHEEND87", 696, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND88 = Field.create("UNUSEDATTHEEND88", 697, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND89 = Field.create("UNUSEDATTHEEND89", 698, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND90 = Field.create("UNUSEDATTHEEND90", 699, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND91 = Field.create("UNUSEDATTHEEND91", 700, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND92 = Field.create("UNUSEDATTHEEND92", 701, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND93 = Field.create("UNUSEDATTHEEND93", 702, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND94 = Field.create("UNUSEDATTHEEND94", 703, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND95 = Field.create("UNUSEDATTHEEND95", 704, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND96 = Field.create("UNUSEDATTHEEND96", 705, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND97 = Field.create("UNUSEDATTHEEND97", 706, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND98 = Field.create("UNUSEDATTHEEND98", 707, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND99 = Field.create("UNUSEDATTHEEND99", 708, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND100 = Field.create("UNUSEDATTHEEND100", 709, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND101 = Field.create("UNUSEDATTHEEND101", 710, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND102 = Field.create("UNUSEDATTHEEND102", 711, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND103 = Field.create("UNUSEDATTHEEND103", 712, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND104 = Field.create("UNUSEDATTHEEND104", 713, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND105 = Field.create("UNUSEDATTHEEND105", 714, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND106 = Field.create("UNUSEDATTHEEND106", 715, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND107 = Field.create("UNUSEDATTHEEND107", 716, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND108 = Field.create("UNUSEDATTHEEND108", 717, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND109 = Field.create("UNUSEDATTHEEND109", 718, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND110 = Field.create("UNUSEDATTHEEND110", 719, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND111 = Field.create("UNUSEDATTHEEND111", 720, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND112 = Field.create("UNUSEDATTHEEND112", 721, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND113 = Field.create("UNUSEDATTHEEND113", 722, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND114 = Field.create("UNUSEDATTHEEND114", 723, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND115 = Field.create("UNUSEDATTHEEND115", 724, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND116 = Field.create("UNUSEDATTHEEND116", 725, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND117 = Field.create("UNUSEDATTHEEND117", 726, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND118 = Field.create("UNUSEDATTHEEND118", 727, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND119 = Field.create("UNUSEDATTHEEND119", 728, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND120 = Field.create("UNUSEDATTHEEND120", 729, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND121 = Field.create("UNUSEDATTHEEND121", 730, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND122 = Field.create("UNUSEDATTHEEND122", 731, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND123 = Field.create("UNUSEDATTHEEND123", 732, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND124 = Field.create("UNUSEDATTHEEND124", 733, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND125 = Field.create("UNUSEDATTHEEND125", 734, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND126 = Field.create("UNUSEDATTHEEND126", 735, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND127 = Field.create("UNUSEDATTHEEND127", 736, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND128 = Field.create("UNUSEDATTHEEND128", 737, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND129 = Field.create("UNUSEDATTHEEND129", 738, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND130 = Field.create("UNUSEDATTHEEND130", 739, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND131 = Field.create("UNUSEDATTHEEND131", 740, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND132 = Field.create("UNUSEDATTHEEND132", 741, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND133 = Field.create("UNUSEDATTHEEND133", 742, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND134 = Field.create("UNUSEDATTHEEND134", 743, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND135 = Field.create("UNUSEDATTHEEND135", 744, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDATTHEEND136 = Field.create("UNUSEDATTHEEND136", 745, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field ALIGNMENTFILL_AT_746 = Field.create("ALIGNMENTFILL_AT_746", 746, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field GPPWMXAXIS1 = Field.create("GPPWMXAXIS1", 558, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field GPPWMXAXIS2 = Field.create("GPPWMXAXIS2", 560, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field GPPWMXAXIS3 = Field.create("GPPWMXAXIS3", 562, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field GPPWMXAXIS4 = Field.create("GPPWMXAXIS4", 564, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field GPPWMYAXIS1 = Field.create("GPPWMYAXIS1", 566, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field GPPWMYAXIS2 = Field.create("GPPWMYAXIS2", 568, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field GPPWMYAXIS3 = Field.create("GPPWMYAXIS3", 570, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field GPPWMYAXIS4 = Field.create("GPPWMYAXIS4", 572, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field RAWBATTERY = Field.create("RAWBATTERY", 574, FieldType.INT16).setScale(0.001).setBaseOffset(0); + public static final Field IGNBLENDBIAS1 = Field.create("IGNBLENDBIAS1", 576, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field IGNBLENDBIAS2 = Field.create("IGNBLENDBIAS2", 577, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field IGNBLENDBIAS3 = Field.create("IGNBLENDBIAS3", 578, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field IGNBLENDBIAS4 = Field.create("IGNBLENDBIAS4", 579, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field IGNBLENDOUTPUT1 = Field.create("IGNBLENDOUTPUT1", 580, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field IGNBLENDOUTPUT2 = Field.create("IGNBLENDOUTPUT2", 582, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field IGNBLENDOUTPUT3 = Field.create("IGNBLENDOUTPUT3", 584, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field IGNBLENDOUTPUT4 = Field.create("IGNBLENDOUTPUT4", 586, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field VEBLENDBIAS1 = Field.create("VEBLENDBIAS1", 588, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field VEBLENDBIAS2 = Field.create("VEBLENDBIAS2", 589, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field VEBLENDBIAS3 = Field.create("VEBLENDBIAS3", 590, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field VEBLENDBIAS4 = Field.create("VEBLENDBIAS4", 591, FieldType.INT8).setScale(0.5).setBaseOffset(0); + public static final Field VEBLENDOUTPUT1 = Field.create("VEBLENDOUTPUT1", 592, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field VEBLENDOUTPUT2 = Field.create("VEBLENDOUTPUT2", 594, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field VEBLENDOUTPUT3 = Field.create("VEBLENDOUTPUT3", 596, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field VEBLENDOUTPUT4 = Field.create("VEBLENDOUTPUT4", 598, FieldType.INT16).setScale(0.01).setBaseOffset(0); + public static final Field COILSTATE1 = Field.create("COILSTATE1", 600, FieldType.BIT, 0).setBaseOffset(0); + public static final Field COILSTATE2 = Field.create("COILSTATE2", 600, FieldType.BIT, 1).setBaseOffset(0); + public static final Field COILSTATE3 = Field.create("COILSTATE3", 600, FieldType.BIT, 2).setBaseOffset(0); + public static final Field COILSTATE4 = Field.create("COILSTATE4", 600, FieldType.BIT, 3).setBaseOffset(0); + public static final Field COILSTATE5 = Field.create("COILSTATE5", 600, FieldType.BIT, 4).setBaseOffset(0); + public static final Field COILSTATE6 = Field.create("COILSTATE6", 600, FieldType.BIT, 5).setBaseOffset(0); + public static final Field COILSTATE7 = Field.create("COILSTATE7", 600, FieldType.BIT, 6).setBaseOffset(0); + public static final Field COILSTATE8 = Field.create("COILSTATE8", 600, FieldType.BIT, 7).setBaseOffset(0); + public static final Field COILSTATE9 = Field.create("COILSTATE9", 600, FieldType.BIT, 8).setBaseOffset(0); + public static final Field COILSTATE10 = Field.create("COILSTATE10", 600, FieldType.BIT, 9).setBaseOffset(0); + public static final Field COILSTATE11 = Field.create("COILSTATE11", 600, FieldType.BIT, 10).setBaseOffset(0); + public static final Field COILSTATE12 = Field.create("COILSTATE12", 600, FieldType.BIT, 11).setBaseOffset(0); + public static final Field INJECTORSTATE1 = Field.create("INJECTORSTATE1", 600, FieldType.BIT, 12).setBaseOffset(0); + public static final Field INJECTORSTATE2 = Field.create("INJECTORSTATE2", 600, FieldType.BIT, 13).setBaseOffset(0); + public static final Field INJECTORSTATE3 = Field.create("INJECTORSTATE3", 600, FieldType.BIT, 14).setBaseOffset(0); + public static final Field INJECTORSTATE4 = Field.create("INJECTORSTATE4", 600, FieldType.BIT, 15).setBaseOffset(0); + public static final Field INJECTORSTATE5 = Field.create("INJECTORSTATE5", 600, FieldType.BIT, 16).setBaseOffset(0); + public static final Field INJECTORSTATE6 = Field.create("INJECTORSTATE6", 600, FieldType.BIT, 17).setBaseOffset(0); + public static final Field INJECTORSTATE7 = Field.create("INJECTORSTATE7", 600, FieldType.BIT, 18).setBaseOffset(0); + public static final Field INJECTORSTATE8 = Field.create("INJECTORSTATE8", 600, FieldType.BIT, 19).setBaseOffset(0); + public static final Field INJECTORSTATE9 = Field.create("INJECTORSTATE9", 600, FieldType.BIT, 20).setBaseOffset(0); + public static final Field INJECTORSTATE10 = Field.create("INJECTORSTATE10", 600, FieldType.BIT, 21).setBaseOffset(0); + public static final Field INJECTORSTATE11 = Field.create("INJECTORSTATE11", 600, FieldType.BIT, 22).setBaseOffset(0); + public static final Field INJECTORSTATE12 = Field.create("INJECTORSTATE12", 600, FieldType.BIT, 23).setBaseOffset(0); + public static final Field OUTPUTREQUESTPERIOD = Field.create("OUTPUTREQUESTPERIOD", 604, FieldType.INT).setScale(1.0).setBaseOffset(0); + public static final Field MAPFAST = Field.create("MAPFAST", 608, FieldType.FLOAT).setBaseOffset(0); + public static final Field LUAGAUGES1 = Field.create("LUAGAUGES1", 612, FieldType.FLOAT).setBaseOffset(0); + public static final Field LUAGAUGES2 = Field.create("LUAGAUGES2", 616, FieldType.FLOAT).setBaseOffset(0); + public static final Field RAWMAF2 = Field.create("RAWMAF2", 620, FieldType.INT16).setScale(0.001).setBaseOffset(0); + public static final Field MAFMEASURED2 = Field.create("MAFMEASURED2", 622, FieldType.INT16).setScale(0.1).setBaseOffset(0); + public static final Field SCHEDULINGUSEDCOUNT = Field.create("SCHEDULINGUSEDCOUNT", 624, FieldType.INT16).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 626, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 627, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 628, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 629, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 630, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 631, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 632, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 633, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 634, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 635, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 636, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 637, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 638, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 639, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 640, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 641, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 642, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 643, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 644, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 645, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 646, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 647, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 648, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 649, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 650, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 651, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 652, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 653, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 654, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 655, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 656, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 657, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 658, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 659, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 660, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 661, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 662, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 663, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 664, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 665, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 666, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 667, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 668, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 669, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 670, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 671, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 672, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 673, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 674, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 675, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 676, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 677, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 678, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 679, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 680, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 681, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 682, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 683, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 684, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 685, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 686, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 687, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 688, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 689, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 690, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 691, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 692, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 693, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 694, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 695, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 696, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 697, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 698, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 699, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 700, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 701, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 702, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 703, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND79 = Field.create("UNUSEDATTHEEND79", 704, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND80 = Field.create("UNUSEDATTHEEND80", 705, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND81 = Field.create("UNUSEDATTHEEND81", 706, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND82 = Field.create("UNUSEDATTHEEND82", 707, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND83 = Field.create("UNUSEDATTHEEND83", 708, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND84 = Field.create("UNUSEDATTHEEND84", 709, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND85 = Field.create("UNUSEDATTHEEND85", 710, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND86 = Field.create("UNUSEDATTHEEND86", 711, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND87 = Field.create("UNUSEDATTHEEND87", 712, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND88 = Field.create("UNUSEDATTHEEND88", 713, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND89 = Field.create("UNUSEDATTHEEND89", 714, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND90 = Field.create("UNUSEDATTHEEND90", 715, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND91 = Field.create("UNUSEDATTHEEND91", 716, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND92 = Field.create("UNUSEDATTHEEND92", 717, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND93 = Field.create("UNUSEDATTHEEND93", 718, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND94 = Field.create("UNUSEDATTHEEND94", 719, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND95 = Field.create("UNUSEDATTHEEND95", 720, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND96 = Field.create("UNUSEDATTHEEND96", 721, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND97 = Field.create("UNUSEDATTHEEND97", 722, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND98 = Field.create("UNUSEDATTHEEND98", 723, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND99 = Field.create("UNUSEDATTHEEND99", 724, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND100 = Field.create("UNUSEDATTHEEND100", 725, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND101 = Field.create("UNUSEDATTHEEND101", 726, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND102 = Field.create("UNUSEDATTHEEND102", 727, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND103 = Field.create("UNUSEDATTHEEND103", 728, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND104 = Field.create("UNUSEDATTHEEND104", 729, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND105 = Field.create("UNUSEDATTHEEND105", 730, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND106 = Field.create("UNUSEDATTHEEND106", 731, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND107 = Field.create("UNUSEDATTHEEND107", 732, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND108 = Field.create("UNUSEDATTHEEND108", 733, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND109 = Field.create("UNUSEDATTHEEND109", 734, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND110 = Field.create("UNUSEDATTHEEND110", 735, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND111 = Field.create("UNUSEDATTHEEND111", 736, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND112 = Field.create("UNUSEDATTHEEND112", 737, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND113 = Field.create("UNUSEDATTHEEND113", 738, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND114 = Field.create("UNUSEDATTHEEND114", 739, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND115 = Field.create("UNUSEDATTHEEND115", 740, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND116 = Field.create("UNUSEDATTHEEND116", 741, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND117 = Field.create("UNUSEDATTHEEND117", 742, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND118 = Field.create("UNUSEDATTHEEND118", 743, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND119 = Field.create("UNUSEDATTHEEND119", 744, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND120 = Field.create("UNUSEDATTHEEND120", 745, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND121 = Field.create("UNUSEDATTHEEND121", 746, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND122 = Field.create("UNUSEDATTHEEND122", 747, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND123 = Field.create("UNUSEDATTHEEND123", 748, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND124 = Field.create("UNUSEDATTHEEND124", 749, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND125 = Field.create("UNUSEDATTHEEND125", 750, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND126 = Field.create("UNUSEDATTHEEND126", 751, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND127 = Field.create("UNUSEDATTHEEND127", 752, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND128 = Field.create("UNUSEDATTHEEND128", 753, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND129 = Field.create("UNUSEDATTHEEND129", 754, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND130 = Field.create("UNUSEDATTHEEND130", 755, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND131 = Field.create("UNUSEDATTHEEND131", 756, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND132 = Field.create("UNUSEDATTHEEND132", 757, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND133 = Field.create("UNUSEDATTHEEND133", 758, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND134 = Field.create("UNUSEDATTHEEND134", 759, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND135 = Field.create("UNUSEDATTHEEND135", 760, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field UNUSEDATTHEEND136 = Field.create("UNUSEDATTHEEND136", 761, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field ALIGNMENTFILL_AT_762 = Field.create("ALIGNMENTFILL_AT_762", 762, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field[] VALUES = { SD_PRESENT, SD_LOGGING_INTERNAL, @@ -1141,6 +1149,14 @@ public class TsOutputs { GPPWMOUTPUT2, GPPWMOUTPUT3, GPPWMOUTPUT4, + GPPWMXAXIS1, + GPPWMXAXIS2, + GPPWMXAXIS3, + GPPWMXAXIS4, + GPPWMYAXIS1, + GPPWMYAXIS2, + GPPWMYAXIS3, + GPPWMYAXIS4, RAWBATTERY, IGNBLENDBIAS1, IGNBLENDBIAS2, @@ -1325,6 +1341,6 @@ public class TsOutputs { UNUSEDATTHEEND134, UNUSEDATTHEEND135, UNUSEDATTHEEND136, - ALIGNMENTFILL_AT_746, + ALIGNMENTFILL_AT_762, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index bcc5786847..1c77d01a32 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Sun Jan 15 13:37:00 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1192); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1192); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1208); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1208); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index fa2978674c..86f28a13b8 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Sun Jan 15 04:27:57 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Mon Feb 06 13:14:57 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1288); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1288); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1288); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1288); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1288); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1288); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1288); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1288); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1304); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1304); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1304); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1304); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,