From 64c70c3e2d6aef2ba4fdba60bbde9d7d641e89cd Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 8 Apr 2019 11:19:07 -0400 Subject: [PATCH] rusEfi settings editor is broken for one byte enums #709 --- firmware/controllers/algo/rusefi_generated.h | 1 + firmware/controllers/engine_controller.cpp | 35 +- firmware/integration/rusefi_config.txt | 2 + .../models/src/com/rusefi/config/Field.java | 18 +- .../src/com/rusefi/config/FieldType.java | 14 +- .../models/src/com/rusefi/config/Fields.java | 707 +++++++++--------- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/ui/SettingsTab.java | 10 +- .../com/rusefi/ui/config/BaseConfigField.java | 9 +- .../com/rusefi/ui/config/BitConfigField.java | 4 +- .../com/rusefi/ui/config/EnumConfigField.java | 10 +- java_tools/ConfigDefinition.jar | Bin 43011 -> 43103 bytes .../src/com/rusefi/ConfigField.java | 8 +- 13 files changed, 436 insertions(+), 384 deletions(-) diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index eabe052701..5389a1619c 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -368,6 +368,7 @@ #define communicationLedPin_offset_hex 728 #define configResetPin_offset 2062 #define configResetPin_offset_hex 80e +#define CONSOLE_DATA_PROTOCOL_TAG " @" #define consoleLoopPeriodMs_offset 716 #define consoleLoopPeriodMs_offset_hex 2cc #define consoleSerialRxPin_offset 1839 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index cb7921c068..f3e89f2c16 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -427,7 +427,18 @@ static void getShort(int offset) { /** * this response is part of dev console API */ - scheduleMsg(&logger, "short @%d is %d", offset, value); + scheduleMsg(&logger, "short%s%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, value); +} + +static void getByte(int offset) { + if (isOutOfBounds(offset)) + return; + uint8_t *ptr = (uint8_t *) (&((char *) engineConfiguration)[offset]); + uint8_t value = *ptr; + /** + * this response is part of dev console API + */ + scheduleMsg(&logger, "byte%s%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, value); } static void setBit(const char *offsetStr, const char *bitStr, const char *valueStr) { @@ -454,7 +465,7 @@ static void setBit(const char *offsetStr, const char *bitStr, const char *valueS /** * this response is part of dev console API */ - scheduleMsg(&logger, "bit @%d/%d is %d", offset, bit, value); + scheduleMsg(&logger, "bit%s%d/%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, bit, value); incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); } @@ -467,6 +478,15 @@ static void setShort(const int offset, const int value) { incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); } +static void setByte(const int offset, const int value) { + if (isOutOfBounds(offset)) + return; + uint8_t *ptr = (uint8_t *) (&((char *) engineConfiguration)[offset]); + *ptr = (uint8_t) value; + getByte(offset); + incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); +} + static void getBit(int offset, int bit) { if (isOutOfBounds(offset)) return; @@ -475,7 +495,7 @@ static void getBit(int offset, int bit) { /** * this response is part of dev console API */ - scheduleMsg(&logger, "bit @%d/%d is %d", offset, bit, value); + scheduleMsg(&logger, "bit%s%d/%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, bit, value); } static void getInt(int offset) { @@ -486,7 +506,7 @@ static void getInt(int offset) { /** * this response is part of dev console API */ - scheduleMsg(&logger, "int @%d is %d", offset, value); + scheduleMsg(&logger, "int%s%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, value); } static void setInt(const int offset, const int value) { @@ -506,7 +526,7 @@ static void getFloat(int offset) { /** * this response is part of dev console API */ - scheduleMsg(&logger, "float @%d is %.5f", offset, value); + scheduleMsg(&logger, "float%s%d is %.5f", CONSOLE_DATA_PROTOCOL_TAG, offset, value); } static void setFloat(const char *offsetStr, const char *valueStr) { @@ -578,10 +598,13 @@ static void initConfigActions(void) { addConsoleActionSS("set_float", (VoidCharPtrCharPtr) setFloat); addConsoleActionII("set_int", (VoidIntInt) setInt); addConsoleActionII("set_short", (VoidIntInt) setShort); + addConsoleActionII("set_byte", (VoidIntInt) setByte); addConsoleActionSSS("set_bit", setBit); + addConsoleActionI("get_float", getFloat); addConsoleActionI("get_int", getInt); addConsoleActionI("get_short", getShort); + addConsoleActionI("get_byte", getByte); addConsoleActionII("get_bit", getBit); } @@ -775,5 +798,5 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190407; + return 20190408; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index eba95d7a43..b7782132e0 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -53,6 +53,8 @@ struct_no_prefix engine_configuration_s #define SERVO_COUNT 8 +#define CONSOLE_DATA_PROTOCOL_TAG " @" + #define ETB_BIAS_CURVE_LENGTH 8 ! this is here so that rusEfi console can access it, too diff --git a/java_console/models/src/com/rusefi/config/Field.java b/java_console/models/src/com/rusefi/config/Field.java index 2867ee5eab..97a4141f69 100644 --- a/java_console/models/src/com/rusefi/config/Field.java +++ b/java_console/models/src/com/rusefi/config/Field.java @@ -5,14 +5,16 @@ import com.rusefi.core.Pair; import java.util.HashMap; import java.util.Map; +import static com.rusefi.config.FieldType.*; + /** * @see Fields */ public class Field { - private static final String BIT_VALUE_PREFIX = "bit @"; - private static final String INT_VALUE_PREFIX = "int @"; - private static final String FLOAT_VALUE_PREFIX = "float @"; + private static final String BIT_VALUE_PREFIX = "bit" + Fields.CONSOLE_DATA_PROTOCOL_TAG; + private static final String INT_VALUE_PREFIX = INT_TYPE_STRING + Fields.CONSOLE_DATA_PROTOCOL_TAG; + private static final String FLOAT_VALUE_PREFIX = FLOAT_TYPE_STRING + Fields.CONSOLE_DATA_PROTOCOL_TAG; public static final int NO_BIT_OFFSET = -1; public final static Map VALUES = new HashMap<>(); @@ -76,7 +78,7 @@ public class Field { } public static boolean isIntValueMessage(String message) { - return message.startsWith(INT_VALUE_PREFIX); + return message.startsWith(INT_VALUE_PREFIX) || message.startsWith(BYTE_TYPE_STRING) || message.startsWith(SHORT_TYPE_STRING); } public static boolean isBitValueMessage(String message) { @@ -89,8 +91,12 @@ public class Field { public static Pair parseResponse(String message) { try { - if (isIntValueMessage(message)) { - message = message.substring(INT_VALUE_PREFIX.length()); + int atPosition = message.indexOf(Fields.CONSOLE_DATA_PROTOCOL_TAG); + if (atPosition == -1) + return null; + String firstToken = message.substring(0, atPosition); + if (firstToken.equals(INT_TYPE_STRING) || firstToken.equals(BYTE_TYPE_STRING) || firstToken.equals(SHORT_TYPE_STRING)) { + message = message.substring(atPosition + Fields.CONSOLE_DATA_PROTOCOL_TAG.length()); String[] a = message.split(" is "); if (a.length != 2) return null; diff --git a/java_console/models/src/com/rusefi/config/FieldType.java b/java_console/models/src/com/rusefi/config/FieldType.java index 8b528a15d9..90810d5d14 100644 --- a/java_console/models/src/com/rusefi/config/FieldType.java +++ b/java_console/models/src/com/rusefi/config/FieldType.java @@ -6,16 +6,26 @@ public enum FieldType { * signed 16 bit type */ INT16, + INT8, BIT, FLOAT; + public static final String INT_TYPE_STRING = "int"; + public static final String FLOAT_TYPE_STRING = "float"; + public static final String BYTE_TYPE_STRING = "byte"; + public static final String SHORT_TYPE_STRING = "short"; + private String getTypeForCommand() { switch (this) { case FLOAT: - return "float"; + return FLOAT_TYPE_STRING; + case INT16: + return SHORT_TYPE_STRING; + case INT8: + return BYTE_TYPE_STRING; case INT: default: - return "int"; + return INT_TYPE_STRING; } } diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 01392a0890..79868066e6 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Apr 03 18:19:59 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 08 10:00:09 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; @@ -227,6 +227,7 @@ public class Fields { public static final int communicationLedPin_offset = 1832; public static final int communicationLedPin_offset_hex = 728; public static final int configResetPin_offset = 2062; + public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; public static final int consoleLoopPeriodMs_offset = 716; public static final int consoleSerialRxPin_offset = 1839; public static final int consoleSerialTxPin_offset = 1838; @@ -1236,12 +1237,12 @@ public class Fields { public static final Field ISSUE_294_27 = Field.create("ISSUE_294_27", 76, FieldType.BIT, 26); public static final Field ISSUE_294_28 = Field.create("ISSUE_294_28", 76, FieldType.BIT, 27); public static final Field ISSUE_294_29 = Field.create("ISSUE_294_29", 76, FieldType.BIT, 28); - public static final Field TPSMIN = Field.create("TPSMIN", 80, FieldType.INT); - public static final Field TPSMAX = Field.create("TPSMAX", 82, FieldType.INT); - public static final Field TPSERRORDETECTIONTOOLOW = Field.create("TPSERRORDETECTIONTOOLOW", 84, FieldType.INT); - public static final Field TPSERRORDETECTIONTOOHIGH = Field.create("TPSERRORDETECTIONTOOHIGH", 86, FieldType.INT); + public static final Field TPSMIN = Field.create("TPSMIN", 80, FieldType.INT16); + public static final Field TPSMAX = Field.create("TPSMAX", 82, FieldType.INT16); + public static final Field TPSERRORDETECTIONTOOLOW = Field.create("TPSERRORDETECTIONTOOLOW", 84, FieldType.INT16); + public static final Field TPSERRORDETECTIONTOOHIGH = Field.create("TPSERRORDETECTIONTOOHIGH", 86, FieldType.INT16); public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 88, FieldType.FLOAT); - public static final Field CRANKING_RPM = Field.create("CRANKING_RPM", 92, FieldType.INT); + public static final Field CRANKING_RPM = Field.create("CRANKING_RPM", 92, FieldType.INT16); public static final Field PRIMINGSQUIRTDURATIONMS = Field.create("PRIMINGSQUIRTDURATIONMS", 96, FieldType.FLOAT); public static final Field IGNITIONDWELLFORCRANKINGMS = Field.create("IGNITIONDWELLFORCRANKINGMS", 100, FieldType.FLOAT); public static final Field CRANKINGCHARGEANGLE = Field.create("CRANKINGCHARGEANGLE", 104, FieldType.FLOAT); @@ -1249,7 +1250,7 @@ public class Fields { public static final Field MAP_SENSOR_HIGHVALUE = Field.create("MAP_SENSOR_HIGHVALUE", 240, FieldType.FLOAT); public static final Field MAP_SENSOR_TYPE = Field.create("MAP_SENSOR_TYPE", 244, FieldType.INT); public static final String[] adc_channel_e = {"PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; - public static final Field MAP_SENSOR_HWCHANNEL = Field.create("MAP_SENSOR_HWCHANNEL", 248, FieldType.INT, adc_channel_e); + public static final Field MAP_SENSOR_HWCHANNEL = Field.create("MAP_SENSOR_HWCHANNEL", 248, FieldType.INT8, adc_channel_e); public static final Field CLT_TEMPC_1 = Field.create("CLT_TEMPC_1", 252, FieldType.FLOAT); public static final Field CLT_TEMPC_2 = Field.create("CLT_TEMPC_2", 256, FieldType.FLOAT); public static final Field CLT_TEMPC_3 = Field.create("CLT_TEMPC_3", 260, FieldType.FLOAT); @@ -1257,7 +1258,7 @@ public class Fields { public static final Field CLT_RESISTANCE_2 = Field.create("CLT_RESISTANCE_2", 268, FieldType.FLOAT); public static final Field CLT_RESISTANCE_3 = Field.create("CLT_RESISTANCE_3", 272, FieldType.FLOAT); public static final Field CLT_BIAS_RESISTOR = Field.create("CLT_BIAS_RESISTOR", 276, FieldType.FLOAT); - public static final Field CLT_ADCCHANNEL = Field.create("CLT_ADCCHANNEL", 280, FieldType.INT, adc_channel_e); + public static final Field CLT_ADCCHANNEL = Field.create("CLT_ADCCHANNEL", 280, FieldType.INT8, adc_channel_e); public static final Field IAT_TEMPC_1 = Field.create("IAT_TEMPC_1", 284, FieldType.FLOAT); public static final Field IAT_TEMPC_2 = Field.create("IAT_TEMPC_2", 288, FieldType.FLOAT); public static final Field IAT_TEMPC_3 = Field.create("IAT_TEMPC_3", 292, FieldType.FLOAT); @@ -1265,7 +1266,7 @@ public class Fields { public static final Field IAT_RESISTANCE_2 = Field.create("IAT_RESISTANCE_2", 300, FieldType.FLOAT); public static final Field IAT_RESISTANCE_3 = Field.create("IAT_RESISTANCE_3", 304, FieldType.FLOAT); public static final Field IAT_BIAS_RESISTOR = Field.create("IAT_BIAS_RESISTOR", 308, FieldType.FLOAT); - public static final Field IAT_ADCCHANNEL = Field.create("IAT_ADCCHANNEL", 312, FieldType.INT, adc_channel_e); + public static final Field IAT_ADCCHANNEL = Field.create("IAT_ADCCHANNEL", 312, FieldType.INT8, adc_channel_e); public static final Field STEP1RPM = Field.create("STEP1RPM", 316, FieldType.INT); public static final Field STEP1TIMING = Field.create("STEP1TIMING", 320, FieldType.INT); public static final Field HIP9011PRESCALERANDSDO = Field.create("HIP9011PRESCALERANDSDO", 324, FieldType.INT); @@ -1300,10 +1301,10 @@ public class Fields { public static final Field BYFIRMWAREVERSION = Field.create("BYFIRMWAREVERSION", 500, FieldType.INT); public static final Field HD44780WIDTH = Field.create("HD44780WIDTH", 504, FieldType.INT); public static final Field HD44780HEIGHT = Field.create("HD44780HEIGHT", 508, FieldType.INT); - public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 512, FieldType.INT, adc_channel_e); - public static final Field VBATTADCCHANNEL = Field.create("VBATTADCCHANNEL", 513, FieldType.INT, adc_channel_e); - public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 514, FieldType.INT, adc_channel_e); - public static final Field TPS2ADCCHANNEL = Field.create("TPS2ADCCHANNEL", 515, FieldType.INT, adc_channel_e); + public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 512, FieldType.INT8, adc_channel_e); + public static final Field VBATTADCCHANNEL = Field.create("VBATTADCCHANNEL", 513, FieldType.INT8, adc_channel_e); + public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 514, FieldType.INT8, adc_channel_e); + public static final Field TPS2ADCCHANNEL = Field.create("TPS2ADCCHANNEL", 515, FieldType.INT8, adc_channel_e); public static final Field OVERRIDECRANKINGIGNITION = Field.create("OVERRIDECRANKINGIGNITION", 516, FieldType.INT); public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT); public static final String[] trigger_type_e = {"custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"}; @@ -1317,117 +1318,117 @@ public class Fields { public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 544, FieldType.FLOAT); public static final Field ADCVCC = Field.create("ADCVCC", 548, FieldType.FLOAT); public static final Field MAXKNOCKSUBDEG = Field.create("MAXKNOCKSUBDEG", 552, FieldType.FLOAT); - public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 556, FieldType.INT, adc_channel_e); - public static final Field AFR_HWCHANNEL = Field.create("AFR_HWCHANNEL", 560, FieldType.INT, adc_channel_e); + public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 556, FieldType.INT8, adc_channel_e); + public static final Field AFR_HWCHANNEL = Field.create("AFR_HWCHANNEL", 560, FieldType.INT8, adc_channel_e); public static final Field AFR_V1 = Field.create("AFR_V1", 564, FieldType.FLOAT); public static final Field AFR_VALUE1 = Field.create("AFR_VALUE1", 568, FieldType.FLOAT); public static final Field AFR_V2 = Field.create("AFR_V2", 572, FieldType.FLOAT); public static final Field AFR_VALUE2 = Field.create("AFR_VALUE2", 576, FieldType.FLOAT); - public static final Field THROTTLEPEDALPOSITIONADCCHANNEL = Field.create("THROTTLEPEDALPOSITIONADCCHANNEL", 580, FieldType.INT, adc_channel_e); + public static final Field THROTTLEPEDALPOSITIONADCCHANNEL = Field.create("THROTTLEPEDALPOSITIONADCCHANNEL", 580, FieldType.INT8, adc_channel_e); public static final Field BAROSENSOR_LOWVALUE = Field.create("BAROSENSOR_LOWVALUE", 584, FieldType.FLOAT); public static final Field BAROSENSOR_HIGHVALUE = Field.create("BAROSENSOR_HIGHVALUE", 588, FieldType.FLOAT); public static final Field BAROSENSOR_TYPE = Field.create("BAROSENSOR_TYPE", 592, FieldType.INT); - public static final Field BAROSENSOR_HWCHANNEL = Field.create("BAROSENSOR_HWCHANNEL", 596, FieldType.INT, adc_channel_e); + public static final Field BAROSENSOR_HWCHANNEL = Field.create("BAROSENSOR_HWCHANNEL", 596, FieldType.INT8, adc_channel_e); public static final Field IDLE_SOLENOIDFREQUENCY = Field.create("IDLE_SOLENOIDFREQUENCY", 600, FieldType.INT); public static final String[] brain_pin_e = {"NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; - public static final Field IDLE_SOLENOIDPIN = Field.create("IDLE_SOLENOIDPIN", 604, FieldType.INT, brain_pin_e); - public static final Field IDLE_STEPPERDIRECTIONPIN = Field.create("IDLE_STEPPERDIRECTIONPIN", 605, FieldType.INT, brain_pin_e); - public static final Field IDLE_STEPPERSTEPPIN = Field.create("IDLE_STEPPERSTEPPIN", 606, FieldType.INT, brain_pin_e); + public static final Field IDLE_SOLENOIDPIN = Field.create("IDLE_SOLENOIDPIN", 604, FieldType.INT8, brain_pin_e); + public static final Field IDLE_STEPPERDIRECTIONPIN = Field.create("IDLE_STEPPERDIRECTIONPIN", 605, FieldType.INT8, brain_pin_e); + public static final Field IDLE_STEPPERSTEPPIN = Field.create("IDLE_STEPPERSTEPPIN", 606, FieldType.INT8, brain_pin_e); public static final String[] pin_output_mode_e = {"default", "default inverted", "open collector", "open collector inverted"}; - public static final Field IDLE_SOLENOIDPINMODE = Field.create("IDLE_SOLENOIDPINMODE", 607, FieldType.INT, pin_output_mode_e); + public static final Field IDLE_SOLENOIDPINMODE = Field.create("IDLE_SOLENOIDPINMODE", 607, FieldType.INT8, pin_output_mode_e); public static final Field MANIDLEPOSITION = Field.create("MANIDLEPOSITION", 608, FieldType.FLOAT); public static final Field MAPFREQUENCY0KPA = Field.create("MAPFREQUENCY0KPA", 612, FieldType.FLOAT); public static final Field MAPFREQUENCY100KPA = Field.create("MAPFREQUENCY100KPA", 616, FieldType.FLOAT); public static final Field TRIGGERSIMULATORFREQUENCY = Field.create("TRIGGERSIMULATORFREQUENCY", 620, FieldType.INT); - public static final Field INJECTIONPINS1 = Field.create("INJECTIONPINS1", 624, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS2 = Field.create("INJECTIONPINS2", 625, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS3 = Field.create("INJECTIONPINS3", 626, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS4 = Field.create("INJECTIONPINS4", 627, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS5 = Field.create("INJECTIONPINS5", 628, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS6 = Field.create("INJECTIONPINS6", 629, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS7 = Field.create("INJECTIONPINS7", 630, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS8 = Field.create("INJECTIONPINS8", 631, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS9 = Field.create("INJECTIONPINS9", 632, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS10 = Field.create("INJECTIONPINS10", 633, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS11 = Field.create("INJECTIONPINS11", 634, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINS12 = Field.create("INJECTIONPINS12", 635, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS1 = Field.create("IGNITIONPINS1", 636, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS2 = Field.create("IGNITIONPINS2", 637, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS3 = Field.create("IGNITIONPINS3", 638, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS4 = Field.create("IGNITIONPINS4", 639, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS5 = Field.create("IGNITIONPINS5", 640, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS6 = Field.create("IGNITIONPINS6", 641, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS7 = Field.create("IGNITIONPINS7", 642, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS8 = Field.create("IGNITIONPINS8", 643, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS9 = Field.create("IGNITIONPINS9", 644, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS10 = Field.create("IGNITIONPINS10", 645, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS11 = Field.create("IGNITIONPINS11", 646, FieldType.INT, brain_pin_e); - public static final Field IGNITIONPINS12 = Field.create("IGNITIONPINS12", 647, FieldType.INT, brain_pin_e); - public static final Field INJECTIONPINMODE = Field.create("INJECTIONPINMODE", 648, FieldType.INT, pin_output_mode_e); - public static final Field IGNITIONPINMODE = Field.create("IGNITIONPINMODE", 649, FieldType.INT, pin_output_mode_e); - public static final Field HD44780_RS = Field.create("HD44780_RS", 650, FieldType.INT, brain_pin_e); - public static final Field HD44780_E = Field.create("HD44780_E", 651, FieldType.INT, brain_pin_e); - public static final Field HD44780_DB4 = Field.create("HD44780_DB4", 652, FieldType.INT, brain_pin_e); - public static final Field HD44780_DB5 = Field.create("HD44780_DB5", 653, FieldType.INT, brain_pin_e); - public static final Field HD44780_DB6 = Field.create("HD44780_DB6", 654, FieldType.INT, brain_pin_e); - public static final Field HD44780_DB7 = Field.create("HD44780_DB7", 655, FieldType.INT, brain_pin_e); - public static final Field GPS_RX_PIN = Field.create("GPS_RX_PIN", 656, FieldType.INT, brain_pin_e); - public static final Field GPS_TX_PIN = Field.create("GPS_TX_PIN", 657, FieldType.INT, brain_pin_e); - public static final Field FUELPUMPPIN = Field.create("FUELPUMPPIN", 658, FieldType.INT, brain_pin_e); - public static final Field FUELPUMPPINMODE = Field.create("FUELPUMPPINMODE", 659, FieldType.INT, pin_output_mode_e); - public static final Field MALFUNCTIONINDICATORPIN = Field.create("MALFUNCTIONINDICATORPIN", 660, FieldType.INT, brain_pin_e); - public static final Field MALFUNCTIONINDICATORPINMODE = Field.create("MALFUNCTIONINDICATORPINMODE", 661, FieldType.INT, pin_output_mode_e); - public static final Field FANPINMODE = Field.create("FANPINMODE", 662, FieldType.INT, pin_output_mode_e); - public static final Field FANPIN = Field.create("FANPIN", 663, FieldType.INT, brain_pin_e); - public static final Field CLUTCHDOWNPIN = Field.create("CLUTCHDOWNPIN", 664, FieldType.INT, brain_pin_e); - public static final Field ALTERNATORCONTROLPIN = Field.create("ALTERNATORCONTROLPIN", 665, FieldType.INT, brain_pin_e); - public static final Field ALTERNATORCONTROLPINMODE = Field.create("ALTERNATORCONTROLPINMODE", 666, FieldType.INT, pin_output_mode_e); - public static final Field CLUTCHDOWNPINMODE = Field.create("CLUTCHDOWNPINMODE", 667, FieldType.INT); - public static final Field DIGITALPOTENTIOMETERCHIPSELECT1 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT1", 668, FieldType.INT, brain_pin_e); - public static final Field DIGITALPOTENTIOMETERCHIPSELECT2 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT2", 669, FieldType.INT, brain_pin_e); - public static final Field DIGITALPOTENTIOMETERCHIPSELECT3 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT3", 670, FieldType.INT, brain_pin_e); - public static final Field DIGITALPOTENTIOMETERCHIPSELECT4 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT4", 671, FieldType.INT, brain_pin_e); - public static final Field ELECTRONICTHROTTLEPIN1MODE = Field.create("ELECTRONICTHROTTLEPIN1MODE", 672, FieldType.INT, pin_output_mode_e); - public static final Field WBOHEATERPIN = Field.create("WBOHEATERPIN", 673, FieldType.INT, brain_pin_e); - public static final Field CJ125CSPIN = Field.create("CJ125CSPIN", 674, FieldType.INT, brain_pin_e); - public static final Field UNUSEDETBM = Field.create("UNUSEDETBM", 675, FieldType.INT); + public static final Field INJECTIONPINS1 = Field.create("INJECTIONPINS1", 624, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS2 = Field.create("INJECTIONPINS2", 625, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS3 = Field.create("INJECTIONPINS3", 626, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS4 = Field.create("INJECTIONPINS4", 627, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS5 = Field.create("INJECTIONPINS5", 628, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS6 = Field.create("INJECTIONPINS6", 629, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS7 = Field.create("INJECTIONPINS7", 630, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS8 = Field.create("INJECTIONPINS8", 631, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS9 = Field.create("INJECTIONPINS9", 632, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS10 = Field.create("INJECTIONPINS10", 633, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS11 = Field.create("INJECTIONPINS11", 634, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINS12 = Field.create("INJECTIONPINS12", 635, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS1 = Field.create("IGNITIONPINS1", 636, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS2 = Field.create("IGNITIONPINS2", 637, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS3 = Field.create("IGNITIONPINS3", 638, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS4 = Field.create("IGNITIONPINS4", 639, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS5 = Field.create("IGNITIONPINS5", 640, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS6 = Field.create("IGNITIONPINS6", 641, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS7 = Field.create("IGNITIONPINS7", 642, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS8 = Field.create("IGNITIONPINS8", 643, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS9 = Field.create("IGNITIONPINS9", 644, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS10 = Field.create("IGNITIONPINS10", 645, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS11 = Field.create("IGNITIONPINS11", 646, FieldType.INT8, brain_pin_e); + public static final Field IGNITIONPINS12 = Field.create("IGNITIONPINS12", 647, FieldType.INT8, brain_pin_e); + public static final Field INJECTIONPINMODE = Field.create("INJECTIONPINMODE", 648, FieldType.INT8, pin_output_mode_e); + public static final Field IGNITIONPINMODE = Field.create("IGNITIONPINMODE", 649, FieldType.INT8, pin_output_mode_e); + public static final Field HD44780_RS = Field.create("HD44780_RS", 650, FieldType.INT8, brain_pin_e); + public static final Field HD44780_E = Field.create("HD44780_E", 651, FieldType.INT8, brain_pin_e); + public static final Field HD44780_DB4 = Field.create("HD44780_DB4", 652, FieldType.INT8, brain_pin_e); + public static final Field HD44780_DB5 = Field.create("HD44780_DB5", 653, FieldType.INT8, brain_pin_e); + public static final Field HD44780_DB6 = Field.create("HD44780_DB6", 654, FieldType.INT8, brain_pin_e); + public static final Field HD44780_DB7 = Field.create("HD44780_DB7", 655, FieldType.INT8, brain_pin_e); + public static final Field GPS_RX_PIN = Field.create("GPS_RX_PIN", 656, FieldType.INT8, brain_pin_e); + public static final Field GPS_TX_PIN = Field.create("GPS_TX_PIN", 657, FieldType.INT8, brain_pin_e); + public static final Field FUELPUMPPIN = Field.create("FUELPUMPPIN", 658, FieldType.INT8, brain_pin_e); + public static final Field FUELPUMPPINMODE = Field.create("FUELPUMPPINMODE", 659, FieldType.INT8, pin_output_mode_e); + public static final Field MALFUNCTIONINDICATORPIN = Field.create("MALFUNCTIONINDICATORPIN", 660, FieldType.INT8, brain_pin_e); + public static final Field MALFUNCTIONINDICATORPINMODE = Field.create("MALFUNCTIONINDICATORPINMODE", 661, FieldType.INT8, pin_output_mode_e); + public static final Field FANPINMODE = Field.create("FANPINMODE", 662, FieldType.INT8, pin_output_mode_e); + public static final Field FANPIN = Field.create("FANPIN", 663, FieldType.INT8, brain_pin_e); + public static final Field CLUTCHDOWNPIN = Field.create("CLUTCHDOWNPIN", 664, FieldType.INT8, brain_pin_e); + public static final Field ALTERNATORCONTROLPIN = Field.create("ALTERNATORCONTROLPIN", 665, FieldType.INT8, brain_pin_e); + public static final Field ALTERNATORCONTROLPINMODE = Field.create("ALTERNATORCONTROLPINMODE", 666, FieldType.INT8, pin_output_mode_e); + public static final Field CLUTCHDOWNPINMODE = Field.create("CLUTCHDOWNPINMODE", 667, FieldType.INT8); + public static final Field DIGITALPOTENTIOMETERCHIPSELECT1 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT1", 668, FieldType.INT8, brain_pin_e); + public static final Field DIGITALPOTENTIOMETERCHIPSELECT2 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT2", 669, FieldType.INT8, brain_pin_e); + public static final Field DIGITALPOTENTIOMETERCHIPSELECT3 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT3", 670, FieldType.INT8, brain_pin_e); + public static final Field DIGITALPOTENTIOMETERCHIPSELECT4 = Field.create("DIGITALPOTENTIOMETERCHIPSELECT4", 671, FieldType.INT8, brain_pin_e); + public static final Field ELECTRONICTHROTTLEPIN1MODE = Field.create("ELECTRONICTHROTTLEPIN1MODE", 672, FieldType.INT8, pin_output_mode_e); + public static final Field WBOHEATERPIN = Field.create("WBOHEATERPIN", 673, FieldType.INT8, brain_pin_e); + public static final Field CJ125CSPIN = Field.create("CJ125CSPIN", 674, FieldType.INT8, brain_pin_e); + public static final Field UNUSEDETBM = Field.create("UNUSEDETBM", 675, FieldType.INT8); public static final Field DIGITALPOTENTIOMETERSPIDEVICE = Field.create("DIGITALPOTENTIOMETERSPIDEVICE", 676, FieldType.INT); - public static final Field ETB1_DIRECTIONPIN1 = Field.create("ETB1_DIRECTIONPIN1", 680, FieldType.INT, brain_pin_e); - public static final Field ETB1_DIRECTIONPIN2 = Field.create("ETB1_DIRECTIONPIN2", 681, FieldType.INT, brain_pin_e); - public static final Field ETB1_CONTROLPIN1 = Field.create("ETB1_CONTROLPIN1", 682, FieldType.INT, brain_pin_e); - public static final Field ETB1_CONTROLPIN2 = Field.create("ETB1_CONTROLPIN2", 683, FieldType.INT, brain_pin_e); + public static final Field ETB1_DIRECTIONPIN1 = Field.create("ETB1_DIRECTIONPIN1", 680, FieldType.INT8, brain_pin_e); + public static final Field ETB1_DIRECTIONPIN2 = Field.create("ETB1_DIRECTIONPIN2", 681, FieldType.INT8, brain_pin_e); + public static final Field ETB1_CONTROLPIN1 = Field.create("ETB1_CONTROLPIN1", 682, FieldType.INT8, brain_pin_e); + public static final Field ETB1_CONTROLPIN2 = Field.create("ETB1_CONTROLPIN2", 683, FieldType.INT8, brain_pin_e); public static final Field FUELLEVELEMPTYTANKVOLTAGE = Field.create("FUELLEVELEMPTYTANKVOLTAGE", 684, FieldType.FLOAT); public static final Field FUELLEVELFULLTANKVOLTAGE = Field.create("FUELLEVELFULLTANKVOLTAGE", 688, FieldType.FLOAT); public static final String[] ego_sensor_e = {"BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom"}; public static final Field AFR_TYPE = Field.create("AFR_TYPE", 692, FieldType.INT, ego_sensor_e); public static final Field FUELCLOSEDLOOPAFRLOWTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRLOWTHRESHOLD", 696, FieldType.FLOAT); public static final String[] brain_input_pin_e = {"NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; - public static final Field TRIGGERINPUTPINS1 = Field.create("TRIGGERINPUTPINS1", 700, FieldType.INT, brain_input_pin_e); - public static final Field TRIGGERINPUTPINS2 = Field.create("TRIGGERINPUTPINS2", 701, FieldType.INT, brain_input_pin_e); - public static final Field TRIGGERINPUTPINS3 = Field.create("TRIGGERINPUTPINS3", 702, FieldType.INT, brain_input_pin_e); - public static final Field HIP9011CSPINMODE = Field.create("HIP9011CSPINMODE", 703, FieldType.INT, pin_output_mode_e); - public static final Field TACHOUTPUTPIN = Field.create("TACHOUTPUTPIN", 704, FieldType.INT, brain_pin_e); - public static final Field TACHOUTPUTPINMODE = Field.create("TACHOUTPUTPINMODE", 705, FieldType.INT, pin_output_mode_e); - public static final Field MAINRELAYPIN = Field.create("MAINRELAYPIN", 706, FieldType.INT, brain_pin_e); - public static final Field SDCARDCSPIN = Field.create("SDCARDCSPIN", 707, FieldType.INT, brain_pin_e); - public static final Field CANTXPIN = Field.create("CANTXPIN", 708, FieldType.INT, brain_pin_e); - public static final Field CANRXPIN = Field.create("CANRXPIN", 709, FieldType.INT, brain_pin_e); - public static final Field BOARDTESTMODEJUMPERPIN = Field.create("BOARDTESTMODEJUMPERPIN", 710, FieldType.INT, brain_pin_e); - public static final Field UNUSEDMA2 = Field.create("UNUSEDMA2", 711, FieldType.INT); + public static final Field TRIGGERINPUTPINS1 = Field.create("TRIGGERINPUTPINS1", 700, FieldType.INT8, brain_input_pin_e); + public static final Field TRIGGERINPUTPINS2 = Field.create("TRIGGERINPUTPINS2", 701, FieldType.INT8, brain_input_pin_e); + public static final Field TRIGGERINPUTPINS3 = Field.create("TRIGGERINPUTPINS3", 702, FieldType.INT8, brain_input_pin_e); + public static final Field HIP9011CSPINMODE = Field.create("HIP9011CSPINMODE", 703, FieldType.INT8, pin_output_mode_e); + public static final Field TACHOUTPUTPIN = Field.create("TACHOUTPUTPIN", 704, FieldType.INT8, brain_pin_e); + public static final Field TACHOUTPUTPINMODE = Field.create("TACHOUTPUTPINMODE", 705, FieldType.INT8, pin_output_mode_e); + public static final Field MAINRELAYPIN = Field.create("MAINRELAYPIN", 706, FieldType.INT8, brain_pin_e); + public static final Field SDCARDCSPIN = Field.create("SDCARDCSPIN", 707, FieldType.INT8, brain_pin_e); + public static final Field CANTXPIN = Field.create("CANTXPIN", 708, FieldType.INT8, brain_pin_e); + public static final Field CANRXPIN = Field.create("CANRXPIN", 709, FieldType.INT8, brain_pin_e); + public static final Field BOARDTESTMODEJUMPERPIN = Field.create("BOARDTESTMODEJUMPERPIN", 710, FieldType.INT8, brain_pin_e); + public static final Field UNUSEDMA2 = Field.create("UNUSEDMA2", 711, FieldType.INT8); public static final Field IDLETHREADPERIODMS = Field.create("IDLETHREADPERIODMS", 712, FieldType.INT); public static final Field CONSOLELOOPPERIODMS = Field.create("CONSOLELOOPPERIODMS", 716, FieldType.INT); public static final Field LCDTHREADPERIODMS = Field.create("LCDTHREADPERIODMS", 720, FieldType.INT); public static final Field GENERALPERIODICTHREADPERIODMS = Field.create("GENERALPERIODICTHREADPERIODMS", 724, FieldType.INT); public static final Field TUNERSTUDIOSERIALSPEED = Field.create("TUNERSTUDIOSERIALSPEED", 728, FieldType.INT); public static final Field CANDEVICEMODE = Field.create("CANDEVICEMODE", 732, FieldType.INT); - public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 736, FieldType.INT, brain_pin_e); - public static final Field TRIGGERSIMULATORPINS2 = Field.create("TRIGGERSIMULATORPINS2", 737, FieldType.INT, brain_pin_e); - public static final Field TRIGGERSIMULATORPINS3 = Field.create("TRIGGERSIMULATORPINS3", 738, FieldType.INT, brain_pin_e); - public static final Field TRIGGERSIMULATORPINMODES1 = Field.create("TRIGGERSIMULATORPINMODES1", 739, FieldType.INT, pin_output_mode_e); - public static final Field TRIGGERSIMULATORPINMODES2 = Field.create("TRIGGERSIMULATORPINMODES2", 740, FieldType.INT, pin_output_mode_e); - public static final Field TRIGGERSIMULATORPINMODES3 = Field.create("TRIGGERSIMULATORPINMODES3", 741, FieldType.INT, pin_output_mode_e); - public static final Field O2HEATERPIN = Field.create("O2HEATERPIN", 742, FieldType.INT, brain_pin_e); - public static final Field O2HEATERPINMODETODO = Field.create("O2HEATERPINMODETODO", 743, FieldType.INT, pin_output_mode_e); + public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 736, FieldType.INT8, brain_pin_e); + public static final Field TRIGGERSIMULATORPINS2 = Field.create("TRIGGERSIMULATORPINS2", 737, FieldType.INT8, brain_pin_e); + public static final Field TRIGGERSIMULATORPINS3 = Field.create("TRIGGERSIMULATORPINS3", 738, FieldType.INT8, brain_pin_e); + public static final Field TRIGGERSIMULATORPINMODES1 = Field.create("TRIGGERSIMULATORPINMODES1", 739, FieldType.INT8, pin_output_mode_e); + public static final Field TRIGGERSIMULATORPINMODES2 = Field.create("TRIGGERSIMULATORPINMODES2", 740, FieldType.INT8, pin_output_mode_e); + public static final Field TRIGGERSIMULATORPINMODES3 = Field.create("TRIGGERSIMULATORPINMODES3", 741, FieldType.INT8, pin_output_mode_e); + public static final Field O2HEATERPIN = Field.create("O2HEATERPIN", 742, FieldType.INT8, brain_pin_e); + public static final Field O2HEATERPINMODETODO = Field.create("O2HEATERPINMODETODO", 743, FieldType.INT8, pin_output_mode_e); public static final Field IS_ENABLED_SPI_1 = Field.create("IS_ENABLED_SPI_1", 744, FieldType.BIT, 0); public static final Field IS_ENABLED_SPI_2 = Field.create("IS_ENABLED_SPI_2", 744, FieldType.BIT, 1); public static final Field IS_ENABLED_SPI_3 = Field.create("IS_ENABLED_SPI_3", 744, FieldType.BIT, 2); @@ -1459,82 +1460,82 @@ public class Fields { public static final Field UNUSED_BOARD_984_28 = Field.create("UNUSED_BOARD_984_28", 744, FieldType.BIT, 28); public static final Field UNUSED_BOARD_984_29 = Field.create("UNUSED_BOARD_984_29", 744, FieldType.BIT, 29); public static final Field UNUSED_BOARD_984_30 = Field.create("UNUSED_BOARD_984_30", 744, FieldType.BIT, 30); - public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 748, FieldType.INT, brain_input_pin_e); - public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 749, FieldType.INT, brain_input_pin_e); - public static final Field LOGICANALYZERPINS3 = Field.create("LOGICANALYZERPINS3", 750, FieldType.INT, brain_input_pin_e); - public static final Field LOGICANALYZERPINS4 = Field.create("LOGICANALYZERPINS4", 751, FieldType.INT, brain_input_pin_e); - public static final Field MAINRELAYPINMODE = Field.create("MAINRELAYPINMODE", 752, FieldType.INT, pin_output_mode_e); - public static final Field HIP9011CSPIN = Field.create("HIP9011CSPIN", 753, FieldType.INT, brain_pin_e); - public static final Field HIP9011INTHOLDPIN = Field.create("HIP9011INTHOLDPIN", 754, FieldType.INT, brain_pin_e); - public static final Field HIP9011INTHOLDPINMODE = Field.create("HIP9011INTHOLDPINMODE", 755, FieldType.INT, pin_output_mode_e); + public static final Field LOGICANALYZERPINS1 = Field.create("LOGICANALYZERPINS1", 748, FieldType.INT8, brain_input_pin_e); + public static final Field LOGICANALYZERPINS2 = Field.create("LOGICANALYZERPINS2", 749, FieldType.INT8, brain_input_pin_e); + public static final Field LOGICANALYZERPINS3 = Field.create("LOGICANALYZERPINS3", 750, FieldType.INT8, brain_input_pin_e); + public static final Field LOGICANALYZERPINS4 = Field.create("LOGICANALYZERPINS4", 751, FieldType.INT8, brain_input_pin_e); + public static final Field MAINRELAYPINMODE = Field.create("MAINRELAYPINMODE", 752, FieldType.INT8, pin_output_mode_e); + public static final Field HIP9011CSPIN = Field.create("HIP9011CSPIN", 753, FieldType.INT8, brain_pin_e); + public static final Field HIP9011INTHOLDPIN = Field.create("HIP9011INTHOLDPIN", 754, FieldType.INT8, brain_pin_e); + public static final Field HIP9011INTHOLDPINMODE = Field.create("HIP9011INTHOLDPINMODE", 755, FieldType.INT8, pin_output_mode_e); public static final Field UNREALISTICRPMTHREASHOLD = Field.create("UNREALISTICRPMTHREASHOLD", 760, FieldType.INT); - public static final Field GPIOPINMODES1 = Field.create("GPIOPINMODES1", 764, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES2 = Field.create("GPIOPINMODES2", 765, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES3 = Field.create("GPIOPINMODES3", 766, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES4 = Field.create("GPIOPINMODES4", 767, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES5 = Field.create("GPIOPINMODES5", 768, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES6 = Field.create("GPIOPINMODES6", 769, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES7 = Field.create("GPIOPINMODES7", 770, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES8 = Field.create("GPIOPINMODES8", 771, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES9 = Field.create("GPIOPINMODES9", 772, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES10 = Field.create("GPIOPINMODES10", 773, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES11 = Field.create("GPIOPINMODES11", 774, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES12 = Field.create("GPIOPINMODES12", 775, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES13 = Field.create("GPIOPINMODES13", 776, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES14 = Field.create("GPIOPINMODES14", 777, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES15 = Field.create("GPIOPINMODES15", 778, FieldType.INT, pin_output_mode_e); - public static final Field GPIOPINMODES16 = Field.create("GPIOPINMODES16", 779, FieldType.INT, pin_output_mode_e); - public static final Field FSIOOUTPUTPINS1 = Field.create("FSIOOUTPUTPINS1", 780, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS2 = Field.create("FSIOOUTPUTPINS2", 781, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS3 = Field.create("FSIOOUTPUTPINS3", 782, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS4 = Field.create("FSIOOUTPUTPINS4", 783, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS5 = Field.create("FSIOOUTPUTPINS5", 784, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS6 = Field.create("FSIOOUTPUTPINS6", 785, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS7 = Field.create("FSIOOUTPUTPINS7", 786, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS8 = Field.create("FSIOOUTPUTPINS8", 787, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS9 = Field.create("FSIOOUTPUTPINS9", 788, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS10 = Field.create("FSIOOUTPUTPINS10", 789, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS11 = Field.create("FSIOOUTPUTPINS11", 790, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS12 = Field.create("FSIOOUTPUTPINS12", 791, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS13 = Field.create("FSIOOUTPUTPINS13", 792, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS14 = Field.create("FSIOOUTPUTPINS14", 793, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS15 = Field.create("FSIOOUTPUTPINS15", 794, FieldType.INT, brain_pin_e); - public static final Field FSIOOUTPUTPINS16 = Field.create("FSIOOUTPUTPINS16", 795, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS1 = Field.create("MAX31855_CS1", 796, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS2 = Field.create("MAX31855_CS2", 797, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS3 = Field.create("MAX31855_CS3", 798, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS4 = Field.create("MAX31855_CS4", 799, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS5 = Field.create("MAX31855_CS5", 800, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS6 = Field.create("MAX31855_CS6", 801, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS7 = Field.create("MAX31855_CS7", 802, FieldType.INT, brain_pin_e); - public static final Field MAX31855_CS8 = Field.create("MAX31855_CS8", 803, FieldType.INT, brain_pin_e); + public static final Field GPIOPINMODES1 = Field.create("GPIOPINMODES1", 764, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES2 = Field.create("GPIOPINMODES2", 765, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES3 = Field.create("GPIOPINMODES3", 766, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES4 = Field.create("GPIOPINMODES4", 767, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES5 = Field.create("GPIOPINMODES5", 768, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES6 = Field.create("GPIOPINMODES6", 769, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES7 = Field.create("GPIOPINMODES7", 770, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES8 = Field.create("GPIOPINMODES8", 771, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES9 = Field.create("GPIOPINMODES9", 772, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES10 = Field.create("GPIOPINMODES10", 773, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES11 = Field.create("GPIOPINMODES11", 774, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES12 = Field.create("GPIOPINMODES12", 775, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES13 = Field.create("GPIOPINMODES13", 776, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES14 = Field.create("GPIOPINMODES14", 777, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES15 = Field.create("GPIOPINMODES15", 778, FieldType.INT8, pin_output_mode_e); + public static final Field GPIOPINMODES16 = Field.create("GPIOPINMODES16", 779, FieldType.INT8, pin_output_mode_e); + public static final Field FSIOOUTPUTPINS1 = Field.create("FSIOOUTPUTPINS1", 780, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS2 = Field.create("FSIOOUTPUTPINS2", 781, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS3 = Field.create("FSIOOUTPUTPINS3", 782, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS4 = Field.create("FSIOOUTPUTPINS4", 783, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS5 = Field.create("FSIOOUTPUTPINS5", 784, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS6 = Field.create("FSIOOUTPUTPINS6", 785, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS7 = Field.create("FSIOOUTPUTPINS7", 786, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS8 = Field.create("FSIOOUTPUTPINS8", 787, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS9 = Field.create("FSIOOUTPUTPINS9", 788, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS10 = Field.create("FSIOOUTPUTPINS10", 789, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS11 = Field.create("FSIOOUTPUTPINS11", 790, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS12 = Field.create("FSIOOUTPUTPINS12", 791, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS13 = Field.create("FSIOOUTPUTPINS13", 792, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS14 = Field.create("FSIOOUTPUTPINS14", 793, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS15 = Field.create("FSIOOUTPUTPINS15", 794, FieldType.INT8, brain_pin_e); + public static final Field FSIOOUTPUTPINS16 = Field.create("FSIOOUTPUTPINS16", 795, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS1 = Field.create("MAX31855_CS1", 796, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS2 = Field.create("MAX31855_CS2", 797, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS3 = Field.create("MAX31855_CS3", 798, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS4 = Field.create("MAX31855_CS4", 799, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS5 = Field.create("MAX31855_CS5", 800, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS6 = Field.create("MAX31855_CS6", 801, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS7 = Field.create("MAX31855_CS7", 802, FieldType.INT8, brain_pin_e); + public static final Field MAX31855_CS8 = Field.create("MAX31855_CS8", 803, FieldType.INT8, brain_pin_e); public static final Field MAX31855SPIDEVICE = Field.create("MAX31855SPIDEVICE", 804, FieldType.INT); public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 808, FieldType.INT); public static final Field MAPMINBUFFERLENGTH = Field.create("MAPMINBUFFERLENGTH", 812, FieldType.INT); - public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT); - public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT); + public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT16); + public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT16); public static final Field NB2RATIOFROM = Field.create("NB2RATIOFROM", 820, FieldType.FLOAT); public static final Field NB2RATIOTO = Field.create("NB2RATIOTO", 824, FieldType.FLOAT); - public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 828, FieldType.INT, brain_pin_e); - public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 829, FieldType.INT, pin_output_mode_e); - public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 830, FieldType.INT, brain_pin_e); - public static final Field ACRELAYPINMODE = Field.create("ACRELAYPINMODE", 831, FieldType.INT, pin_output_mode_e); - public static final Field FSIOFREQUENCY1 = Field.create("FSIOFREQUENCY1", 832, FieldType.INT); - public static final Field FSIOFREQUENCY2 = Field.create("FSIOFREQUENCY2", 834, FieldType.INT); - public static final Field FSIOFREQUENCY3 = Field.create("FSIOFREQUENCY3", 836, FieldType.INT); - public static final Field FSIOFREQUENCY4 = Field.create("FSIOFREQUENCY4", 838, FieldType.INT); - public static final Field FSIOFREQUENCY5 = Field.create("FSIOFREQUENCY5", 840, FieldType.INT); - public static final Field FSIOFREQUENCY6 = Field.create("FSIOFREQUENCY6", 842, FieldType.INT); - public static final Field FSIOFREQUENCY7 = Field.create("FSIOFREQUENCY7", 844, FieldType.INT); - public static final Field FSIOFREQUENCY8 = Field.create("FSIOFREQUENCY8", 846, FieldType.INT); - public static final Field FSIOFREQUENCY9 = Field.create("FSIOFREQUENCY9", 848, FieldType.INT); - public static final Field FSIOFREQUENCY10 = Field.create("FSIOFREQUENCY10", 850, FieldType.INT); - public static final Field FSIOFREQUENCY11 = Field.create("FSIOFREQUENCY11", 852, FieldType.INT); - public static final Field FSIOFREQUENCY12 = Field.create("FSIOFREQUENCY12", 854, FieldType.INT); - public static final Field FSIOFREQUENCY13 = Field.create("FSIOFREQUENCY13", 856, FieldType.INT); - public static final Field FSIOFREQUENCY14 = Field.create("FSIOFREQUENCY14", 858, FieldType.INT); - public static final Field FSIOFREQUENCY15 = Field.create("FSIOFREQUENCY15", 860, FieldType.INT); - public static final Field FSIOFREQUENCY16 = Field.create("FSIOFREQUENCY16", 862, FieldType.INT); + public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 828, FieldType.INT8, brain_pin_e); + public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 829, FieldType.INT8, pin_output_mode_e); + public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 830, FieldType.INT8, brain_pin_e); + public static final Field ACRELAYPINMODE = Field.create("ACRELAYPINMODE", 831, FieldType.INT8, pin_output_mode_e); + public static final Field FSIOFREQUENCY1 = Field.create("FSIOFREQUENCY1", 832, FieldType.INT16); + public static final Field FSIOFREQUENCY2 = Field.create("FSIOFREQUENCY2", 834, FieldType.INT16); + public static final Field FSIOFREQUENCY3 = Field.create("FSIOFREQUENCY3", 836, FieldType.INT16); + public static final Field FSIOFREQUENCY4 = Field.create("FSIOFREQUENCY4", 838, FieldType.INT16); + public static final Field FSIOFREQUENCY5 = Field.create("FSIOFREQUENCY5", 840, FieldType.INT16); + public static final Field FSIOFREQUENCY6 = Field.create("FSIOFREQUENCY6", 842, FieldType.INT16); + public static final Field FSIOFREQUENCY7 = Field.create("FSIOFREQUENCY7", 844, FieldType.INT16); + public static final Field FSIOFREQUENCY8 = Field.create("FSIOFREQUENCY8", 846, FieldType.INT16); + public static final Field FSIOFREQUENCY9 = Field.create("FSIOFREQUENCY9", 848, FieldType.INT16); + public static final Field FSIOFREQUENCY10 = Field.create("FSIOFREQUENCY10", 850, FieldType.INT16); + public static final Field FSIOFREQUENCY11 = Field.create("FSIOFREQUENCY11", 852, FieldType.INT16); + public static final Field FSIOFREQUENCY12 = Field.create("FSIOFREQUENCY12", 854, FieldType.INT16); + public static final Field FSIOFREQUENCY13 = Field.create("FSIOFREQUENCY13", 856, FieldType.INT16); + public static final Field FSIOFREQUENCY14 = Field.create("FSIOFREQUENCY14", 858, FieldType.INT16); + public static final Field FSIOFREQUENCY15 = Field.create("FSIOFREQUENCY15", 860, FieldType.INT16); + public static final Field FSIOFREQUENCY16 = Field.create("FSIOFREQUENCY16", 862, FieldType.INT16); public static final Field FSIO_SETTING1 = Field.create("FSIO_SETTING1", 864, FieldType.INT); public static final Field FSIO_SETTING2 = Field.create("FSIO_SETTING2", 868, FieldType.INT); public static final Field FSIO_SETTING3 = Field.create("FSIO_SETTING3", 872, FieldType.INT); @@ -1551,45 +1552,45 @@ public class Fields { public static final Field FSIO_SETTING14 = Field.create("FSIO_SETTING14", 916, FieldType.INT); public static final Field FSIO_SETTING15 = Field.create("FSIO_SETTING15", 920, FieldType.INT); public static final Field FSIO_SETTING16 = Field.create("FSIO_SETTING16", 924, FieldType.INT); - public static final Field SPI1MOSIPIN = Field.create("SPI1MOSIPIN", 928, FieldType.INT, brain_pin_e); - public static final Field SPI1MISOPIN = Field.create("SPI1MISOPIN", 929, FieldType.INT, brain_pin_e); - public static final Field SPI1SCKPIN = Field.create("SPI1SCKPIN", 930, FieldType.INT, brain_pin_e); - public static final Field SPI2MOSIPIN = Field.create("SPI2MOSIPIN", 931, FieldType.INT, brain_pin_e); - public static final Field SPI2MISOPIN = Field.create("SPI2MISOPIN", 932, FieldType.INT, brain_pin_e); - public static final Field SPI2SCKPIN = Field.create("SPI2SCKPIN", 933, FieldType.INT, brain_pin_e); - public static final Field SPI3MOSIPIN = Field.create("SPI3MOSIPIN", 934, FieldType.INT, brain_pin_e); - public static final Field SPI3MISOPIN = Field.create("SPI3MISOPIN", 935, FieldType.INT, brain_pin_e); - public static final Field SPI3SCKPIN = Field.create("SPI3SCKPIN", 936, FieldType.INT, brain_pin_e); - public static final Field CDMINPUTPIN = Field.create("CDMINPUTPIN", 937, FieldType.INT, brain_pin_e); - public static final Field JOYSTICKCENTERPIN = Field.create("JOYSTICKCENTERPIN", 938, FieldType.INT, brain_pin_e); - public static final Field JOYSTICKAPIN = Field.create("JOYSTICKAPIN", 939, FieldType.INT, brain_pin_e); - public static final Field JOYSTICKBPIN = Field.create("JOYSTICKBPIN", 940, FieldType.INT, brain_pin_e); - public static final Field JOYSTICKCPIN = Field.create("JOYSTICKCPIN", 941, FieldType.INT, brain_pin_e); - public static final Field JOYSTICKDPIN = Field.create("JOYSTICKDPIN", 942, FieldType.INT, brain_pin_e); - public static final Field UNUSEDJOY = Field.create("UNUSEDJOY", 943, FieldType.INT); + public static final Field SPI1MOSIPIN = Field.create("SPI1MOSIPIN", 928, FieldType.INT8, brain_pin_e); + public static final Field SPI1MISOPIN = Field.create("SPI1MISOPIN", 929, FieldType.INT8, brain_pin_e); + public static final Field SPI1SCKPIN = Field.create("SPI1SCKPIN", 930, FieldType.INT8, brain_pin_e); + public static final Field SPI2MOSIPIN = Field.create("SPI2MOSIPIN", 931, FieldType.INT8, brain_pin_e); + public static final Field SPI2MISOPIN = Field.create("SPI2MISOPIN", 932, FieldType.INT8, brain_pin_e); + public static final Field SPI2SCKPIN = Field.create("SPI2SCKPIN", 933, FieldType.INT8, brain_pin_e); + public static final Field SPI3MOSIPIN = Field.create("SPI3MOSIPIN", 934, FieldType.INT8, brain_pin_e); + public static final Field SPI3MISOPIN = Field.create("SPI3MISOPIN", 935, FieldType.INT8, brain_pin_e); + public static final Field SPI3SCKPIN = Field.create("SPI3SCKPIN", 936, FieldType.INT8, brain_pin_e); + public static final Field CDMINPUTPIN = Field.create("CDMINPUTPIN", 937, FieldType.INT8, brain_pin_e); + public static final Field JOYSTICKCENTERPIN = Field.create("JOYSTICKCENTERPIN", 938, FieldType.INT8, brain_pin_e); + public static final Field JOYSTICKAPIN = Field.create("JOYSTICKAPIN", 939, FieldType.INT8, brain_pin_e); + public static final Field JOYSTICKBPIN = Field.create("JOYSTICKBPIN", 940, FieldType.INT8, brain_pin_e); + public static final Field JOYSTICKCPIN = Field.create("JOYSTICKCPIN", 941, FieldType.INT8, brain_pin_e); + public static final Field JOYSTICKDPIN = Field.create("JOYSTICKDPIN", 942, FieldType.INT8, brain_pin_e); + public static final Field UNUSEDJOY = Field.create("UNUSEDJOY", 943, FieldType.INT8); public static final String[] sensor_chart_e = {"none", "trigger", "MAP", "RPM ACCEL", "DETAILED RPM", "INVALID"}; public static final Field SENSORCHARTMODE = Field.create("SENSORCHARTMODE", 944, FieldType.INT, sensor_chart_e); public static final Field MAFSENSORTYPE = Field.create("MAFSENSORTYPE", 948, FieldType.INT); - public static final Field FSIODIGITALINPUTS1 = Field.create("FSIODIGITALINPUTS1", 952, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS2 = Field.create("FSIODIGITALINPUTS2", 953, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS3 = Field.create("FSIODIGITALINPUTS3", 954, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS4 = Field.create("FSIODIGITALINPUTS4", 955, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS5 = Field.create("FSIODIGITALINPUTS5", 956, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS6 = Field.create("FSIODIGITALINPUTS6", 957, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS7 = Field.create("FSIODIGITALINPUTS7", 958, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS8 = Field.create("FSIODIGITALINPUTS8", 959, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS9 = Field.create("FSIODIGITALINPUTS9", 960, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS10 = Field.create("FSIODIGITALINPUTS10", 961, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS11 = Field.create("FSIODIGITALINPUTS11", 962, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS12 = Field.create("FSIODIGITALINPUTS12", 963, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS13 = Field.create("FSIODIGITALINPUTS13", 964, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS14 = Field.create("FSIODIGITALINPUTS14", 965, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS15 = Field.create("FSIODIGITALINPUTS15", 966, FieldType.INT, brain_pin_e); - public static final Field FSIODIGITALINPUTS16 = Field.create("FSIODIGITALINPUTS16", 967, FieldType.INT, brain_pin_e); - public static final Field VEHICLESPEEDSENSORINPUTPIN = Field.create("VEHICLESPEEDSENSORINPUTPIN", 968, FieldType.INT, brain_input_pin_e); - public static final Field CLUTCHUPPIN = Field.create("CLUTCHUPPIN", 969, FieldType.INT, brain_pin_e); - public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 970, FieldType.INT, brain_input_pin_e); - public static final Field CLUTCHUPPINMODE = Field.create("CLUTCHUPPINMODE", 971, FieldType.INT); + public static final Field FSIODIGITALINPUTS1 = Field.create("FSIODIGITALINPUTS1", 952, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS2 = Field.create("FSIODIGITALINPUTS2", 953, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS3 = Field.create("FSIODIGITALINPUTS3", 954, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS4 = Field.create("FSIODIGITALINPUTS4", 955, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS5 = Field.create("FSIODIGITALINPUTS5", 956, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS6 = Field.create("FSIODIGITALINPUTS6", 957, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS7 = Field.create("FSIODIGITALINPUTS7", 958, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS8 = Field.create("FSIODIGITALINPUTS8", 959, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS9 = Field.create("FSIODIGITALINPUTS9", 960, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS10 = Field.create("FSIODIGITALINPUTS10", 961, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS11 = Field.create("FSIODIGITALINPUTS11", 962, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS12 = Field.create("FSIODIGITALINPUTS12", 963, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS13 = Field.create("FSIODIGITALINPUTS13", 964, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS14 = Field.create("FSIODIGITALINPUTS14", 965, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS15 = Field.create("FSIODIGITALINPUTS15", 966, FieldType.INT8, brain_pin_e); + public static final Field FSIODIGITALINPUTS16 = Field.create("FSIODIGITALINPUTS16", 967, FieldType.INT8, brain_pin_e); + public static final Field VEHICLESPEEDSENSORINPUTPIN = Field.create("VEHICLESPEEDSENSORINPUTPIN", 968, FieldType.INT8, brain_input_pin_e); + public static final Field CLUTCHUPPIN = Field.create("CLUTCHUPPIN", 969, FieldType.INT8, brain_pin_e); + public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 970, FieldType.INT8, brain_input_pin_e); + public static final Field CLUTCHUPPINMODE = Field.create("CLUTCHUPPINMODE", 971, FieldType.INT8); public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); @@ -1621,7 +1622,7 @@ public class Fields { public static final Field USEFSIO4FORSERIOUSENGINEWARNING = Field.create("USEFSIO4FORSERIOUSENGINEWARNING", 1464, FieldType.BIT, 28); public static final Field UNUSED_BIT_1472_29 = Field.create("UNUSED_BIT_1472_29", 1464, FieldType.BIT, 29); public static final Field UNUSED_BIT_1472_30 = Field.create("UNUSED_BIT_1472_30", 1464, FieldType.BIT, 30); - public static final Field HIPOUTPUTCHANNEL = Field.create("HIPOUTPUTCHANNEL", 1468, FieldType.INT, adc_channel_e); + public static final Field HIPOUTPUTCHANNEL = Field.create("HIPOUTPUTCHANNEL", 1468, FieldType.INT8, adc_channel_e); public static final Field IDLEMODE = Field.create("IDLEMODE", 1472, FieldType.INT); public static final Field ISINJECTIONENABLED = Field.create("ISINJECTIONENABLED", 1476, FieldType.BIT, 0); public static final Field ISIGNITIONENABLED = Field.create("ISIGNITIONENABLED", 1476, FieldType.BIT, 1); @@ -1646,35 +1647,35 @@ public class Fields { public static final Field UNUSED_1484_BIT_20 = Field.create("UNUSED_1484_BIT_20", 1476, FieldType.BIT, 20); public static final Field UNUSED_1484_BIT_21 = Field.create("UNUSED_1484_BIT_21", 1476, FieldType.BIT, 21); public static final Field ENGINECHARTSIZE = Field.create("ENGINECHARTSIZE", 1480, FieldType.INT); - public static final Field IDLEPIDRPMUPPERLIMIT = Field.create("IDLEPIDRPMUPPERLIMIT", 1484, FieldType.INT); - public static final Field PRIMEINJFALLOFFTEMPERATURE = Field.create("PRIMEINJFALLOFFTEMPERATURE", 1486, FieldType.INT); - public static final Field ACSWITCHADC = Field.create("ACSWITCHADC", 1488, FieldType.INT, adc_channel_e); + public static final Field IDLEPIDRPMUPPERLIMIT = Field.create("IDLEPIDRPMUPPERLIMIT", 1484, FieldType.INT16); + public static final Field PRIMEINJFALLOFFTEMPERATURE = Field.create("PRIMEINJFALLOFFTEMPERATURE", 1486, FieldType.INT16); + public static final Field ACSWITCHADC = Field.create("ACSWITCHADC", 1488, FieldType.INT8, adc_channel_e); public static final Field IGNMATHCALCULATEATINDEX = Field.create("IGNMATHCALCULATEATINDEX", 1492, FieldType.INT); - public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1496, FieldType.INT); - public static final Field ACCUTOFFHIGHRPM = Field.create("ACCUTOFFHIGHRPM", 1498, FieldType.INT); - public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1500, FieldType.INT); - public static final Field WARNINGPERIOD = Field.create("WARNINGPERIOD", 1502, FieldType.INT); - public static final Field VREFADCCHANNEL = Field.create("VREFADCCHANNEL", 1504, FieldType.INT, adc_channel_e); + public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1496, FieldType.INT16); + public static final Field ACCUTOFFHIGHRPM = Field.create("ACCUTOFFHIGHRPM", 1498, FieldType.INT16); + public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1500, FieldType.INT16); + public static final Field WARNINGPERIOD = Field.create("WARNINGPERIOD", 1502, FieldType.INT16); + public static final Field VREFADCCHANNEL = Field.create("VREFADCCHANNEL", 1504, FieldType.INT8, adc_channel_e); public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1508, FieldType.FLOAT); public static final Field KNOCKDETECTIONWINDOWEND = Field.create("KNOCKDETECTIONWINDOWEND", 1512, FieldType.FLOAT); public static final Field IDLESTEPPERREACTIONTIME = Field.create("IDLESTEPPERREACTIONTIME", 1516, FieldType.FLOAT); public static final Field KNOCKVTHRESHOLD = Field.create("KNOCKVTHRESHOLD", 1520, FieldType.FLOAT); - public static final Field FSIOINPUTMODES1 = Field.create("FSIOINPUTMODES1", 1524, FieldType.INT); - public static final Field FSIOINPUTMODES2 = Field.create("FSIOINPUTMODES2", 1525, FieldType.INT); - public static final Field FSIOINPUTMODES3 = Field.create("FSIOINPUTMODES3", 1526, FieldType.INT); - public static final Field FSIOINPUTMODES4 = Field.create("FSIOINPUTMODES4", 1527, FieldType.INT); - public static final Field FSIOINPUTMODES5 = Field.create("FSIOINPUTMODES5", 1528, FieldType.INT); - public static final Field FSIOINPUTMODES6 = Field.create("FSIOINPUTMODES6", 1529, FieldType.INT); - public static final Field FSIOINPUTMODES7 = Field.create("FSIOINPUTMODES7", 1530, FieldType.INT); - public static final Field FSIOINPUTMODES8 = Field.create("FSIOINPUTMODES8", 1531, FieldType.INT); - public static final Field FSIOINPUTMODES9 = Field.create("FSIOINPUTMODES9", 1532, FieldType.INT); - public static final Field FSIOINPUTMODES10 = Field.create("FSIOINPUTMODES10", 1533, FieldType.INT); - public static final Field FSIOINPUTMODES11 = Field.create("FSIOINPUTMODES11", 1534, FieldType.INT); - public static final Field FSIOINPUTMODES12 = Field.create("FSIOINPUTMODES12", 1535, FieldType.INT); - public static final Field FSIOINPUTMODES13 = Field.create("FSIOINPUTMODES13", 1536, FieldType.INT); - public static final Field FSIOINPUTMODES14 = Field.create("FSIOINPUTMODES14", 1537, FieldType.INT); - public static final Field FSIOINPUTMODES15 = Field.create("FSIOINPUTMODES15", 1538, FieldType.INT); - public static final Field FSIOINPUTMODES16 = Field.create("FSIOINPUTMODES16", 1539, FieldType.INT); + public static final Field FSIOINPUTMODES1 = Field.create("FSIOINPUTMODES1", 1524, FieldType.INT8); + public static final Field FSIOINPUTMODES2 = Field.create("FSIOINPUTMODES2", 1525, FieldType.INT8); + public static final Field FSIOINPUTMODES3 = Field.create("FSIOINPUTMODES3", 1526, FieldType.INT8); + public static final Field FSIOINPUTMODES4 = Field.create("FSIOINPUTMODES4", 1527, FieldType.INT8); + public static final Field FSIOINPUTMODES5 = Field.create("FSIOINPUTMODES5", 1528, FieldType.INT8); + public static final Field FSIOINPUTMODES6 = Field.create("FSIOINPUTMODES6", 1529, FieldType.INT8); + public static final Field FSIOINPUTMODES7 = Field.create("FSIOINPUTMODES7", 1530, FieldType.INT8); + public static final Field FSIOINPUTMODES8 = Field.create("FSIOINPUTMODES8", 1531, FieldType.INT8); + public static final Field FSIOINPUTMODES9 = Field.create("FSIOINPUTMODES9", 1532, FieldType.INT8); + public static final Field FSIOINPUTMODES10 = Field.create("FSIOINPUTMODES10", 1533, FieldType.INT8); + public static final Field FSIOINPUTMODES11 = Field.create("FSIOINPUTMODES11", 1534, FieldType.INT8); + public static final Field FSIOINPUTMODES12 = Field.create("FSIOINPUTMODES12", 1535, FieldType.INT8); + public static final Field FSIOINPUTMODES13 = Field.create("FSIOINPUTMODES13", 1536, FieldType.INT8); + public static final Field FSIOINPUTMODES14 = Field.create("FSIOINPUTMODES14", 1537, FieldType.INT8); + public static final Field FSIOINPUTMODES15 = Field.create("FSIOINPUTMODES15", 1538, FieldType.INT8); + public static final Field FSIOINPUTMODES16 = Field.create("FSIOINPUTMODES16", 1539, FieldType.INT8); public static final Field IDLESTEPPERTOTALSTEPS = Field.create("IDLESTEPPERTOTALSTEPS", 1552, FieldType.INT); public static final Field NOACCELAFTERHARDLIMITPERIODSECS = Field.create("NOACCELAFTERHARDLIMITPERIODSECS", 1556, FieldType.FLOAT); public static final Field MAPAVERAGINGSCHEDULINGATINDEX = Field.create("MAPAVERAGINGSCHEDULINGATINDEX", 1560, FieldType.INT); @@ -1685,56 +1686,56 @@ public class Fields { public static final Field ALTERNATORCONTROL_PFACTOR = Field.create("ALTERNATORCONTROL_PFACTOR", 1736, FieldType.FLOAT); public static final Field ALTERNATORCONTROL_IFACTOR = Field.create("ALTERNATORCONTROL_IFACTOR", 1740, FieldType.FLOAT); public static final Field ALTERNATORCONTROL_DFACTOR = Field.create("ALTERNATORCONTROL_DFACTOR", 1744, FieldType.FLOAT); - public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 1748, FieldType.INT); - public static final Field ALTERNATORCONTROL_PERIODMS = Field.create("ALTERNATORCONTROL_PERIODMS", 1750, FieldType.INT); - public static final Field ALTERNATORCONTROL_MINVALUE = Field.create("ALTERNATORCONTROL_MINVALUE", 1752, FieldType.INT); - public static final Field ALTERNATORCONTROL_MAXVALUE = Field.create("ALTERNATORCONTROL_MAXVALUE", 1754, FieldType.INT); + public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 1748, FieldType.INT16); + public static final Field ALTERNATORCONTROL_PERIODMS = Field.create("ALTERNATORCONTROL_PERIODMS", 1750, FieldType.INT16); + public static final Field ALTERNATORCONTROL_MINVALUE = Field.create("ALTERNATORCONTROL_MINVALUE", 1752, FieldType.INT16); + public static final Field ALTERNATORCONTROL_MAXVALUE = Field.create("ALTERNATORCONTROL_MAXVALUE", 1754, FieldType.INT16); public static final Field ETB_PFACTOR = Field.create("ETB_PFACTOR", 1756, FieldType.FLOAT); public static final Field ETB_IFACTOR = Field.create("ETB_IFACTOR", 1760, FieldType.FLOAT); public static final Field ETB_DFACTOR = Field.create("ETB_DFACTOR", 1764, FieldType.FLOAT); - public static final Field ETB_OFFSET = Field.create("ETB_OFFSET", 1768, FieldType.INT); - public static final Field ETB_PERIODMS = Field.create("ETB_PERIODMS", 1770, FieldType.INT); - public static final Field ETB_MINVALUE = Field.create("ETB_MINVALUE", 1772, FieldType.INT); - public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1774, FieldType.INT); + public static final Field ETB_OFFSET = Field.create("ETB_OFFSET", 1768, FieldType.INT16); + public static final Field ETB_PERIODMS = Field.create("ETB_PERIODMS", 1770, FieldType.INT16); + public static final Field ETB_MINVALUE = Field.create("ETB_MINVALUE", 1772, FieldType.INT16); + public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1774, FieldType.INT16); public static final Field WARMUPAFRPID_PFACTOR = Field.create("WARMUPAFRPID_PFACTOR", 1776, FieldType.FLOAT); public static final Field WARMUPAFRPID_IFACTOR = Field.create("WARMUPAFRPID_IFACTOR", 1780, FieldType.FLOAT); public static final Field WARMUPAFRPID_DFACTOR = Field.create("WARMUPAFRPID_DFACTOR", 1784, FieldType.FLOAT); - public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 1788, FieldType.INT); - public static final Field WARMUPAFRPID_PERIODMS = Field.create("WARMUPAFRPID_PERIODMS", 1790, FieldType.INT); - public static final Field WARMUPAFRPID_MINVALUE = Field.create("WARMUPAFRPID_MINVALUE", 1792, FieldType.INT); - public static final Field WARMUPAFRPID_MAXVALUE = Field.create("WARMUPAFRPID_MAXVALUE", 1794, FieldType.INT); + public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 1788, FieldType.INT16); + public static final Field WARMUPAFRPID_PERIODMS = Field.create("WARMUPAFRPID_PERIODMS", 1790, FieldType.INT16); + public static final Field WARMUPAFRPID_MINVALUE = Field.create("WARMUPAFRPID_MINVALUE", 1792, FieldType.INT16); + public static final Field WARMUPAFRPID_MAXVALUE = Field.create("WARMUPAFRPID_MAXVALUE", 1794, FieldType.INT16); public static final Field MAPERRORDETECTIONTOOLOW = Field.create("MAPERRORDETECTIONTOOLOW", 1796, FieldType.FLOAT); public static final Field MAPERRORDETECTIONTOOHIGH = Field.create("MAPERRORDETECTIONTOOHIGH", 1800, FieldType.FLOAT); public static final Field STEP1RPMWINDOW = Field.create("STEP1RPMWINDOW", 1804, FieldType.INT); public static final Field IDLERPMPID_PFACTOR = Field.create("IDLERPMPID_PFACTOR", 1808, FieldType.FLOAT); public static final Field IDLERPMPID_IFACTOR = Field.create("IDLERPMPID_IFACTOR", 1812, FieldType.FLOAT); public static final Field IDLERPMPID_DFACTOR = Field.create("IDLERPMPID_DFACTOR", 1816, FieldType.FLOAT); - public static final Field IDLERPMPID_OFFSET = Field.create("IDLERPMPID_OFFSET", 1820, FieldType.INT); - public static final Field IDLERPMPID_PERIODMS = Field.create("IDLERPMPID_PERIODMS", 1822, FieldType.INT); - public static final Field IDLERPMPID_MINVALUE = Field.create("IDLERPMPID_MINVALUE", 1824, FieldType.INT); - public static final Field IDLERPMPID_MAXVALUE = Field.create("IDLERPMPID_MAXVALUE", 1826, FieldType.INT); + public static final Field IDLERPMPID_OFFSET = Field.create("IDLERPMPID_OFFSET", 1820, FieldType.INT16); + public static final Field IDLERPMPID_PERIODMS = Field.create("IDLERPMPID_PERIODMS", 1822, FieldType.INT16); + public static final Field IDLERPMPID_MINVALUE = Field.create("IDLERPMPID_MINVALUE", 1824, FieldType.INT16); + public static final Field IDLERPMPID_MAXVALUE = Field.create("IDLERPMPID_MAXVALUE", 1826, FieldType.INT16); public static final Field WWAEBETA = Field.create("WWAEBETA", 1828, FieldType.FLOAT); - public static final Field COMMUNICATIONLEDPIN = Field.create("COMMUNICATIONLEDPIN", 1832, FieldType.INT, brain_pin_e); - public static final Field RUNNINGLEDPIN = Field.create("RUNNINGLEDPIN", 1833, FieldType.INT, brain_pin_e); - public static final Field BINARYSERIALTXPIN = Field.create("BINARYSERIALTXPIN", 1834, FieldType.INT, brain_pin_e); - public static final Field BINARYSERIALRXPIN = Field.create("BINARYSERIALRXPIN", 1835, FieldType.INT, brain_pin_e); - public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 1836, FieldType.INT, brain_pin_e); - public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 1837, FieldType.INT, brain_pin_e); - public static final Field CONSOLESERIALTXPIN = Field.create("CONSOLESERIALTXPIN", 1838, FieldType.INT, brain_pin_e); - public static final Field CONSOLESERIALRXPIN = Field.create("CONSOLESERIALRXPIN", 1839, FieldType.INT, brain_pin_e); + public static final Field COMMUNICATIONLEDPIN = Field.create("COMMUNICATIONLEDPIN", 1832, FieldType.INT8, brain_pin_e); + public static final Field RUNNINGLEDPIN = Field.create("RUNNINGLEDPIN", 1833, FieldType.INT8, brain_pin_e); + public static final Field BINARYSERIALTXPIN = Field.create("BINARYSERIALTXPIN", 1834, FieldType.INT8, brain_pin_e); + public static final Field BINARYSERIALRXPIN = Field.create("BINARYSERIALRXPIN", 1835, FieldType.INT8, brain_pin_e); + public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 1836, FieldType.INT8, brain_pin_e); + public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 1837, FieldType.INT8, brain_pin_e); + public static final Field CONSOLESERIALTXPIN = Field.create("CONSOLESERIALTXPIN", 1838, FieldType.INT8, brain_pin_e); + public static final Field CONSOLESERIALRXPIN = Field.create("CONSOLESERIALRXPIN", 1839, FieldType.INT8, brain_pin_e); public static final Field THROTTLEPEDALUPVOLTAGE = Field.create("THROTTLEPEDALUPVOLTAGE", 1904, FieldType.FLOAT); public static final Field THROTTLEPEDALWOTVOLTAGE = Field.create("THROTTLEPEDALWOTVOLTAGE", 1908, FieldType.FLOAT); - public static final Field STARTUPFUELPUMPDURATION = Field.create("STARTUPFUELPUMPDURATION", 1912, FieldType.INT); - public static final Field IDLEPIDRPMDEADZONE = Field.create("IDLEPIDRPMDEADZONE", 1914, FieldType.INT); + public static final Field STARTUPFUELPUMPDURATION = Field.create("STARTUPFUELPUMPDURATION", 1912, FieldType.INT16); + public static final Field IDLEPIDRPMDEADZONE = Field.create("IDLEPIDRPMDEADZONE", 1914, FieldType.INT16); public static final Field TARGETVBATT = Field.create("TARGETVBATT", 2044, FieldType.FLOAT); public static final Field ALTERNATOROFFABOVETPS = Field.create("ALTERNATOROFFABOVETPS", 2048, FieldType.FLOAT); public static final Field STARTOFCRANKINGPRIMINGPULSE = Field.create("STARTOFCRANKINGPRIMINGPULSE", 2052, FieldType.FLOAT); - public static final Field AFTERCRANKINGIACTAPERDURATION = Field.create("AFTERCRANKINGIACTAPERDURATION", 2056, FieldType.INT); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 2058, FieldType.INT); - public static final Field FATALERRORPIN = Field.create("FATALERRORPIN", 2060, FieldType.INT, brain_pin_e); - public static final Field WARNINIGLEDPIN = Field.create("WARNINIGLEDPIN", 2061, FieldType.INT, brain_pin_e); - public static final Field CONFIGRESETPIN = Field.create("CONFIGRESETPIN", 2062, FieldType.INT, brain_pin_e); - public static final Field LIS302DLCSPIN = Field.create("LIS302DLCSPIN", 2063, FieldType.INT, brain_pin_e); + public static final Field AFTERCRANKINGIACTAPERDURATION = Field.create("AFTERCRANKINGIACTAPERDURATION", 2056, FieldType.INT16); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 2058, FieldType.INT16); + public static final Field FATALERRORPIN = Field.create("FATALERRORPIN", 2060, FieldType.INT8, brain_pin_e); + public static final Field WARNINIGLEDPIN = Field.create("WARNINIGLEDPIN", 2061, FieldType.INT8, brain_pin_e); + public static final Field CONFIGRESETPIN = Field.create("CONFIGRESETPIN", 2062, FieldType.INT8, brain_pin_e); + public static final Field LIS302DLCSPIN = Field.create("LIS302DLCSPIN", 2063, FieldType.INT8, brain_pin_e); public static final Field TPSACCELLENGTH = Field.create("TPSACCELLENGTH", 2064, FieldType.INT); public static final Field TPSACCELENRICHMENTTHRESHOLD = Field.create("TPSACCELENRICHMENTTHRESHOLD", 2068, FieldType.FLOAT); public static final Field VVTOFFSET = Field.create("VVTOFFSET", 2072, FieldType.FLOAT); @@ -1751,31 +1752,31 @@ public class Fields { public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2112, FieldType.INT, debug_mode_e); public static final Field WARMUPAFRTHRESHOLD = Field.create("WARMUPAFRTHRESHOLD", 2148, FieldType.FLOAT); public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2152, FieldType.FLOAT); - public static final Field FSIOADC1 = Field.create("FSIOADC1", 2220, FieldType.INT, adc_channel_e); - public static final Field FSIOADC2 = Field.create("FSIOADC2", 2221, FieldType.INT, adc_channel_e); - public static final Field FSIOADC3 = Field.create("FSIOADC3", 2222, FieldType.INT, adc_channel_e); - public static final Field FSIOADC4 = Field.create("FSIOADC4", 2223, FieldType.INT, adc_channel_e); + public static final Field FSIOADC1 = Field.create("FSIOADC1", 2220, FieldType.INT8, adc_channel_e); + public static final Field FSIOADC2 = Field.create("FSIOADC2", 2221, FieldType.INT8, adc_channel_e); + public static final Field FSIOADC3 = Field.create("FSIOADC3", 2222, FieldType.INT8, adc_channel_e); + public static final Field FSIOADC4 = Field.create("FSIOADC4", 2223, FieldType.INT8, adc_channel_e); public static final Field FIXEDTIMING = Field.create("FIXEDTIMING", 2224, FieldType.FLOAT); public static final Field MAPLOWVALUEVOLTAGE = Field.create("MAPLOWVALUEVOLTAGE", 2228, FieldType.FLOAT); public static final Field MAPHIGHVALUEVOLTAGE = Field.create("MAPHIGHVALUEVOLTAGE", 2232, FieldType.FLOAT); public static final Field EGOVALUESHIFT = Field.create("EGOVALUESHIFT", 2236, FieldType.FLOAT); - public static final Field AUXPIDPINS1 = Field.create("AUXPIDPINS1", 2240, FieldType.INT, brain_pin_e); - public static final Field AUXPIDPINS2 = Field.create("AUXPIDPINS2", 2241, FieldType.INT, brain_pin_e); - public static final Field AUXPIDPINS3 = Field.create("AUXPIDPINS3", 2242, FieldType.INT, brain_pin_e); - public static final Field AUXPIDPINS4 = Field.create("AUXPIDPINS4", 2243, FieldType.INT, brain_pin_e); - public static final Field CAMINPUT = Field.create("CAMINPUT", 2244, FieldType.INT, brain_input_pin_e); - public static final Field CJ125CSPINMODE = Field.create("CJ125CSPINMODE", 2245, FieldType.INT, pin_output_mode_e); - public static final Field DIZZYSPARKOUTPUTPIN = Field.create("DIZZYSPARKOUTPUTPIN", 2246, FieldType.INT, brain_pin_e); - public static final Field DIZZYSPARKOUTPUTPINMODE = Field.create("DIZZYSPARKOUTPUTPINMODE", 2247, FieldType.INT, pin_output_mode_e); + public static final Field AUXPIDPINS1 = Field.create("AUXPIDPINS1", 2240, FieldType.INT8, brain_pin_e); + public static final Field AUXPIDPINS2 = Field.create("AUXPIDPINS2", 2241, FieldType.INT8, brain_pin_e); + public static final Field AUXPIDPINS3 = Field.create("AUXPIDPINS3", 2242, FieldType.INT8, brain_pin_e); + public static final Field AUXPIDPINS4 = Field.create("AUXPIDPINS4", 2243, FieldType.INT8, brain_pin_e); + public static final Field CAMINPUT = Field.create("CAMINPUT", 2244, FieldType.INT8, brain_input_pin_e); + public static final Field CJ125CSPINMODE = Field.create("CJ125CSPINMODE", 2245, FieldType.INT8, pin_output_mode_e); + public static final Field DIZZYSPARKOUTPUTPIN = Field.create("DIZZYSPARKOUTPUTPIN", 2246, FieldType.INT8, brain_pin_e); + public static final Field DIZZYSPARKOUTPUTPINMODE = Field.create("DIZZYSPARKOUTPUTPINMODE", 2247, FieldType.INT8, pin_output_mode_e); public static final Field CRANKINGIACPOSITION = Field.create("CRANKINGIACPOSITION", 2248, FieldType.INT); public static final Field TCHARGEMINRPMMINTPS = Field.create("TCHARGEMINRPMMINTPS", 2252, FieldType.FLOAT); public static final Field TCHARGEMINRPMMAXTPS = Field.create("TCHARGEMINRPMMAXTPS", 2256, FieldType.FLOAT); public static final Field TCHARGEMAXRPMMINTPS = Field.create("TCHARGEMAXRPMMINTPS", 2260, FieldType.FLOAT); public static final Field TCHARGEMAXRPMMAXTPS = Field.create("TCHARGEMAXRPMMAXTPS", 2264, FieldType.FLOAT); - public static final Field AUXPIDFREQUENCY1 = Field.create("AUXPIDFREQUENCY1", 2268, FieldType.INT); - public static final Field AUXPIDFREQUENCY2 = Field.create("AUXPIDFREQUENCY2", 2270, FieldType.INT); - public static final Field AUXPIDFREQUENCY3 = Field.create("AUXPIDFREQUENCY3", 2272, FieldType.INT); - public static final Field AUXPIDFREQUENCY4 = Field.create("AUXPIDFREQUENCY4", 2274, FieldType.INT); + public static final Field AUXPIDFREQUENCY1 = Field.create("AUXPIDFREQUENCY1", 2268, FieldType.INT16); + public static final Field AUXPIDFREQUENCY2 = Field.create("AUXPIDFREQUENCY2", 2270, FieldType.INT16); + public static final Field AUXPIDFREQUENCY3 = Field.create("AUXPIDFREQUENCY3", 2272, FieldType.INT16); + public static final Field AUXPIDFREQUENCY4 = Field.create("AUXPIDFREQUENCY4", 2274, FieldType.INT16); public static final Field ALTERNATORPWMFREQUENCY = Field.create("ALTERNATORPWMFREQUENCY", 2276, FieldType.INT); public static final String[] mass_storage_e = {"Auto", "Always", "Never"}; public static final Field STORAGEMODE = Field.create("STORAGEMODE", 2280, FieldType.INT, mass_storage_e); @@ -1801,7 +1802,7 @@ public class Fields { public static final Field AUXTEMPSENSOR1_RESISTANCE_2 = Field.create("AUXTEMPSENSOR1_RESISTANCE_2", 2484, FieldType.FLOAT); public static final Field AUXTEMPSENSOR1_RESISTANCE_3 = Field.create("AUXTEMPSENSOR1_RESISTANCE_3", 2488, FieldType.FLOAT); public static final Field AUXTEMPSENSOR1_BIAS_RESISTOR = Field.create("AUXTEMPSENSOR1_BIAS_RESISTOR", 2492, FieldType.FLOAT); - public static final Field AUXTEMPSENSOR1_ADCCHANNEL = Field.create("AUXTEMPSENSOR1_ADCCHANNEL", 2496, FieldType.INT, adc_channel_e); + public static final Field AUXTEMPSENSOR1_ADCCHANNEL = Field.create("AUXTEMPSENSOR1_ADCCHANNEL", 2496, FieldType.INT8, adc_channel_e); public static final Field AUXTEMPSENSOR2_TEMPC_1 = Field.create("AUXTEMPSENSOR2_TEMPC_1", 2500, FieldType.FLOAT); public static final Field AUXTEMPSENSOR2_TEMPC_2 = Field.create("AUXTEMPSENSOR2_TEMPC_2", 2504, FieldType.FLOAT); public static final Field AUXTEMPSENSOR2_TEMPC_3 = Field.create("AUXTEMPSENSOR2_TEMPC_3", 2508, FieldType.FLOAT); @@ -1809,18 +1810,18 @@ public class Fields { public static final Field AUXTEMPSENSOR2_RESISTANCE_2 = Field.create("AUXTEMPSENSOR2_RESISTANCE_2", 2516, FieldType.FLOAT); public static final Field AUXTEMPSENSOR2_RESISTANCE_3 = Field.create("AUXTEMPSENSOR2_RESISTANCE_3", 2520, FieldType.FLOAT); public static final Field AUXTEMPSENSOR2_BIAS_RESISTOR = Field.create("AUXTEMPSENSOR2_BIAS_RESISTOR", 2524, FieldType.FLOAT); - public static final Field AUXTEMPSENSOR2_ADCCHANNEL = Field.create("AUXTEMPSENSOR2_ADCCHANNEL", 2528, FieldType.INT, adc_channel_e); - public static final Field FUELCLOSEDLOOPCLTTHRESHOLD = Field.create("FUELCLOSEDLOOPCLTTHRESHOLD", 2532, FieldType.INT); - public static final Field FUELCLOSEDLOOPTPSTHRESHOLD = Field.create("FUELCLOSEDLOOPTPSTHRESHOLD", 2534, FieldType.INT); - public static final Field FUELCLOSEDLOOPRPMTHRESHOLD = Field.create("FUELCLOSEDLOOPRPMTHRESHOLD", 2536, FieldType.INT); - public static final Field ETBFREQ = Field.create("ETBFREQ", 2538, FieldType.INT); + public static final Field AUXTEMPSENSOR2_ADCCHANNEL = Field.create("AUXTEMPSENSOR2_ADCCHANNEL", 2528, FieldType.INT8, adc_channel_e); + public static final Field FUELCLOSEDLOOPCLTTHRESHOLD = Field.create("FUELCLOSEDLOOPCLTTHRESHOLD", 2532, FieldType.INT16); + public static final Field FUELCLOSEDLOOPTPSTHRESHOLD = Field.create("FUELCLOSEDLOOPTPSTHRESHOLD", 2534, FieldType.INT16); + public static final Field FUELCLOSEDLOOPRPMTHRESHOLD = Field.create("FUELCLOSEDLOOPRPMTHRESHOLD", 2536, FieldType.INT16); + public static final Field ETBFREQ = Field.create("ETBFREQ", 2538, FieldType.INT16); public static final Field FUELCLOSEDLOOPPID_PFACTOR = Field.create("FUELCLOSEDLOOPPID_PFACTOR", 2540, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_IFACTOR = Field.create("FUELCLOSEDLOOPPID_IFACTOR", 2544, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_DFACTOR = Field.create("FUELCLOSEDLOOPPID_DFACTOR", 2548, FieldType.FLOAT); - public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2552, FieldType.INT); - public static final Field FUELCLOSEDLOOPPID_PERIODMS = Field.create("FUELCLOSEDLOOPPID_PERIODMS", 2554, FieldType.INT); - public static final Field FUELCLOSEDLOOPPID_MINVALUE = Field.create("FUELCLOSEDLOOPPID_MINVALUE", 2556, FieldType.INT); - public static final Field FUELCLOSEDLOOPPID_MAXVALUE = Field.create("FUELCLOSEDLOOPPID_MAXVALUE", 2558, FieldType.INT); + public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2552, FieldType.INT16); + public static final Field FUELCLOSEDLOOPPID_PERIODMS = Field.create("FUELCLOSEDLOOPPID_PERIODMS", 2554, FieldType.INT16); + public static final Field FUELCLOSEDLOOPPID_MINVALUE = Field.create("FUELCLOSEDLOOPPID_MINVALUE", 2556, FieldType.INT16); + public static final Field FUELCLOSEDLOOPPID_MAXVALUE = Field.create("FUELCLOSEDLOOPPID_MAXVALUE", 2558, FieldType.INT16); public static final Field FUELCLOSEDLOOPAFRHIGHTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRHIGHTHRESHOLD", 2560, FieldType.FLOAT); public static final Field TIMING_OFFSET_CYLINDER1 = Field.create("TIMING_OFFSET_CYLINDER1", 2564, FieldType.INT); public static final Field TIMING_OFFSET_CYLINDER2 = Field.create("TIMING_OFFSET_CYLINDER2", 2568, FieldType.INT); @@ -1837,76 +1838,76 @@ public class Fields { public static final Field IDLEPIDACTIVATIONTIME = Field.create("IDLEPIDACTIVATIONTIME", 2612, FieldType.FLOAT); public static final Field SDCARDSPIDEVICE = Field.create("SDCARDSPIDEVICE", 2616, FieldType.INT); public static final String[] pin_mode_e = {"default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"}; - public static final Field SPI1SCKMODE = Field.create("SPI1SCKMODE", 2620, FieldType.INT, pin_mode_e); - public static final Field SPI1MOSIMODE = Field.create("SPI1MOSIMODE", 2621, FieldType.INT, pin_mode_e); - public static final Field SPI1MISOMODE = Field.create("SPI1MISOMODE", 2622, FieldType.INT, pin_mode_e); - public static final Field SPI2SCKMODE = Field.create("SPI2SCKMODE", 2623, FieldType.INT, pin_mode_e); - public static final Field SPI2MOSIMODE = Field.create("SPI2MOSIMODE", 2624, FieldType.INT, pin_mode_e); - public static final Field SPI2MISOMODE = Field.create("SPI2MISOMODE", 2625, FieldType.INT, pin_mode_e); - public static final Field SPI3SCKMODE = Field.create("SPI3SCKMODE", 2626, FieldType.INT, pin_mode_e); - public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2627, FieldType.INT, pin_mode_e); - public static final Field SPI3MISOMODE = Field.create("SPI3MISOMODE", 2628, FieldType.INT, pin_mode_e); - public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2629, FieldType.INT, pin_output_mode_e); - public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2632, FieldType.INT, brain_pin_e); - public static final Field CJ125UA = Field.create("CJ125UA", 2633, FieldType.INT, adc_channel_e); - public static final Field CJ125UR = Field.create("CJ125UR", 2634, FieldType.INT, adc_channel_e); - public static final Field BRAKEPEDALPINMODE = Field.create("BRAKEPEDALPINMODE", 2635, FieldType.INT); + public static final Field SPI1SCKMODE = Field.create("SPI1SCKMODE", 2620, FieldType.INT8, pin_mode_e); + public static final Field SPI1MOSIMODE = Field.create("SPI1MOSIMODE", 2621, FieldType.INT8, pin_mode_e); + public static final Field SPI1MISOMODE = Field.create("SPI1MISOMODE", 2622, FieldType.INT8, pin_mode_e); + public static final Field SPI2SCKMODE = Field.create("SPI2SCKMODE", 2623, FieldType.INT8, pin_mode_e); + public static final Field SPI2MOSIMODE = Field.create("SPI2MOSIMODE", 2624, FieldType.INT8, pin_mode_e); + public static final Field SPI2MISOMODE = Field.create("SPI2MISOMODE", 2625, FieldType.INT8, pin_mode_e); + public static final Field SPI3SCKMODE = Field.create("SPI3SCKMODE", 2626, FieldType.INT8, pin_mode_e); + public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2627, FieldType.INT8, pin_mode_e); + public static final Field SPI3MISOMODE = Field.create("SPI3MISOMODE", 2628, FieldType.INT8, pin_mode_e); + public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2629, FieldType.INT8, pin_output_mode_e); + public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2632, FieldType.INT8, brain_pin_e); + public static final Field CJ125UA = Field.create("CJ125UA", 2633, FieldType.INT8, adc_channel_e); + public static final Field CJ125UR = Field.create("CJ125UR", 2634, FieldType.INT8, adc_channel_e); + public static final Field BRAKEPEDALPINMODE = Field.create("BRAKEPEDALPINMODE", 2635, FieldType.INT8); public static final Field AUXPID1_PFACTOR = Field.create("AUXPID1_PFACTOR", 2636, FieldType.FLOAT); public static final Field AUXPID1_IFACTOR = Field.create("AUXPID1_IFACTOR", 2640, FieldType.FLOAT); public static final Field AUXPID1_DFACTOR = Field.create("AUXPID1_DFACTOR", 2644, FieldType.FLOAT); - public static final Field AUXPID1_OFFSET = Field.create("AUXPID1_OFFSET", 2648, FieldType.INT); - public static final Field AUXPID1_PERIODMS = Field.create("AUXPID1_PERIODMS", 2650, FieldType.INT); - public static final Field AUXPID1_MINVALUE = Field.create("AUXPID1_MINVALUE", 2652, FieldType.INT); - public static final Field AUXPID1_MAXVALUE = Field.create("AUXPID1_MAXVALUE", 2654, FieldType.INT); + public static final Field AUXPID1_OFFSET = Field.create("AUXPID1_OFFSET", 2648, FieldType.INT16); + public static final Field AUXPID1_PERIODMS = Field.create("AUXPID1_PERIODMS", 2650, FieldType.INT16); + public static final Field AUXPID1_MINVALUE = Field.create("AUXPID1_MINVALUE", 2652, FieldType.INT16); + public static final Field AUXPID1_MAXVALUE = Field.create("AUXPID1_MAXVALUE", 2654, FieldType.INT16); public static final Field AUXPID2_PFACTOR = Field.create("AUXPID2_PFACTOR", 2656, FieldType.FLOAT); public static final Field AUXPID2_IFACTOR = Field.create("AUXPID2_IFACTOR", 2660, FieldType.FLOAT); public static final Field AUXPID2_DFACTOR = Field.create("AUXPID2_DFACTOR", 2664, FieldType.FLOAT); - public static final Field AUXPID2_OFFSET = Field.create("AUXPID2_OFFSET", 2668, FieldType.INT); - public static final Field AUXPID2_PERIODMS = Field.create("AUXPID2_PERIODMS", 2670, FieldType.INT); - public static final Field AUXPID2_MINVALUE = Field.create("AUXPID2_MINVALUE", 2672, FieldType.INT); - public static final Field AUXPID2_MAXVALUE = Field.create("AUXPID2_MAXVALUE", 2674, FieldType.INT); + public static final Field AUXPID2_OFFSET = Field.create("AUXPID2_OFFSET", 2668, FieldType.INT16); + public static final Field AUXPID2_PERIODMS = Field.create("AUXPID2_PERIODMS", 2670, FieldType.INT16); + public static final Field AUXPID2_MINVALUE = Field.create("AUXPID2_MINVALUE", 2672, FieldType.INT16); + public static final Field AUXPID2_MAXVALUE = Field.create("AUXPID2_MAXVALUE", 2674, FieldType.INT16); public static final Field AUXPID3_PFACTOR = Field.create("AUXPID3_PFACTOR", 2676, FieldType.FLOAT); public static final Field AUXPID3_IFACTOR = Field.create("AUXPID3_IFACTOR", 2680, FieldType.FLOAT); public static final Field AUXPID3_DFACTOR = Field.create("AUXPID3_DFACTOR", 2684, FieldType.FLOAT); - public static final Field AUXPID3_OFFSET = Field.create("AUXPID3_OFFSET", 2688, FieldType.INT); - public static final Field AUXPID3_PERIODMS = Field.create("AUXPID3_PERIODMS", 2690, FieldType.INT); - public static final Field AUXPID3_MINVALUE = Field.create("AUXPID3_MINVALUE", 2692, FieldType.INT); - public static final Field AUXPID3_MAXVALUE = Field.create("AUXPID3_MAXVALUE", 2694, FieldType.INT); + public static final Field AUXPID3_OFFSET = Field.create("AUXPID3_OFFSET", 2688, FieldType.INT16); + public static final Field AUXPID3_PERIODMS = Field.create("AUXPID3_PERIODMS", 2690, FieldType.INT16); + public static final Field AUXPID3_MINVALUE = Field.create("AUXPID3_MINVALUE", 2692, FieldType.INT16); + public static final Field AUXPID3_MAXVALUE = Field.create("AUXPID3_MAXVALUE", 2694, FieldType.INT16); public static final Field AUXPID4_PFACTOR = Field.create("AUXPID4_PFACTOR", 2696, FieldType.FLOAT); public static final Field AUXPID4_IFACTOR = Field.create("AUXPID4_IFACTOR", 2700, FieldType.FLOAT); public static final Field AUXPID4_DFACTOR = Field.create("AUXPID4_DFACTOR", 2704, FieldType.FLOAT); - public static final Field AUXPID4_OFFSET = Field.create("AUXPID4_OFFSET", 2708, FieldType.INT); - public static final Field AUXPID4_PERIODMS = Field.create("AUXPID4_PERIODMS", 2710, FieldType.INT); - public static final Field AUXPID4_MINVALUE = Field.create("AUXPID4_MINVALUE", 2712, FieldType.INT); - public static final Field AUXPID4_MAXVALUE = Field.create("AUXPID4_MAXVALUE", 2714, FieldType.INT); - public static final Field OILPRESSURE_HWCHANNEL = Field.create("OILPRESSURE_HWCHANNEL", 2716, FieldType.INT, adc_channel_e); + public static final Field AUXPID4_OFFSET = Field.create("AUXPID4_OFFSET", 2708, FieldType.INT16); + public static final Field AUXPID4_PERIODMS = Field.create("AUXPID4_PERIODMS", 2710, FieldType.INT16); + public static final Field AUXPID4_MINVALUE = Field.create("AUXPID4_MINVALUE", 2712, FieldType.INT16); + public static final Field AUXPID4_MAXVALUE = Field.create("AUXPID4_MAXVALUE", 2714, FieldType.INT16); + public static final Field OILPRESSURE_HWCHANNEL = Field.create("OILPRESSURE_HWCHANNEL", 2716, FieldType.INT8, adc_channel_e); public static final Field OILPRESSURE_V1 = Field.create("OILPRESSURE_V1", 2720, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE1 = Field.create("OILPRESSURE_VALUE1", 2724, FieldType.FLOAT); public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2728, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2732, FieldType.FLOAT); public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2736, FieldType.INT); - public static final Field FLEXFUELSENSOR = Field.create("FLEXFUELSENSOR", 3124, FieldType.INT, brain_input_pin_e); - public static final Field TEST557PIN = Field.create("TEST557PIN", 3125, FieldType.INT, brain_pin_e); - public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 3126, FieldType.INT, pin_output_mode_e); - public static final Field EXTERNALKNOCKSENSEADC = Field.create("EXTERNALKNOCKSENSEADC", 3127, FieldType.INT, adc_channel_e); - public static final Field STEPPERENABLEPIN = Field.create("STEPPERENABLEPIN", 3128, FieldType.INT, brain_pin_e); - public static final Field TLE8888_CS = Field.create("TLE8888_CS", 3129, FieldType.INT, brain_pin_e); - public static final Field TLE8888_CSPINMODE = Field.create("TLE8888_CSPINMODE", 3130, FieldType.INT, pin_output_mode_e); - public static final Field UNUSEDTEST55 = Field.create("UNUSEDTEST55", 3131, FieldType.INT); - public static final Field SERVOOUTPUTPINS1 = Field.create("SERVOOUTPUTPINS1", 3164, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS2 = Field.create("SERVOOUTPUTPINS2", 3165, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS3 = Field.create("SERVOOUTPUTPINS3", 3166, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS4 = Field.create("SERVOOUTPUTPINS4", 3167, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS5 = Field.create("SERVOOUTPUTPINS5", 3168, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS6 = Field.create("SERVOOUTPUTPINS6", 3169, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS7 = Field.create("SERVOOUTPUTPINS7", 3170, FieldType.INT, brain_pin_e); - public static final Field SERVOOUTPUTPINS8 = Field.create("SERVOOUTPUTPINS8", 3171, FieldType.INT, brain_pin_e); - public static final Field COASTINGFUELCUTRPMHIGH = Field.create("COASTINGFUELCUTRPMHIGH", 3172, FieldType.INT); - public static final Field COASTINGFUELCUTRPMLOW = Field.create("COASTINGFUELCUTRPMLOW", 3174, FieldType.INT); - public static final Field COASTINGFUELCUTTPS = Field.create("COASTINGFUELCUTTPS", 3176, FieldType.INT); - public static final Field COASTINGFUELCUTCLT = Field.create("COASTINGFUELCUTCLT", 3178, FieldType.INT); - public static final Field PIDEXTRAFORLOWRPM = Field.create("PIDEXTRAFORLOWRPM", 3180, FieldType.INT); - public static final Field COASTINGFUELCUTMAP = Field.create("COASTINGFUELCUTMAP", 3182, FieldType.INT); + public static final Field FLEXFUELSENSOR = Field.create("FLEXFUELSENSOR", 3124, FieldType.INT8, brain_input_pin_e); + public static final Field TEST557PIN = Field.create("TEST557PIN", 3125, FieldType.INT8, brain_pin_e); + public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 3126, FieldType.INT8, pin_output_mode_e); + public static final Field EXTERNALKNOCKSENSEADC = Field.create("EXTERNALKNOCKSENSEADC", 3127, FieldType.INT8, adc_channel_e); + public static final Field STEPPERENABLEPIN = Field.create("STEPPERENABLEPIN", 3128, FieldType.INT8, brain_pin_e); + public static final Field TLE8888_CS = Field.create("TLE8888_CS", 3129, FieldType.INT8, brain_pin_e); + public static final Field TLE8888_CSPINMODE = Field.create("TLE8888_CSPINMODE", 3130, FieldType.INT8, pin_output_mode_e); + public static final Field UNUSEDTEST55 = Field.create("UNUSEDTEST55", 3131, FieldType.INT8); + public static final Field SERVOOUTPUTPINS1 = Field.create("SERVOOUTPUTPINS1", 3164, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS2 = Field.create("SERVOOUTPUTPINS2", 3165, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS3 = Field.create("SERVOOUTPUTPINS3", 3166, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS4 = Field.create("SERVOOUTPUTPINS4", 3167, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS5 = Field.create("SERVOOUTPUTPINS5", 3168, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS6 = Field.create("SERVOOUTPUTPINS6", 3169, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS7 = Field.create("SERVOOUTPUTPINS7", 3170, FieldType.INT8, brain_pin_e); + public static final Field SERVOOUTPUTPINS8 = Field.create("SERVOOUTPUTPINS8", 3171, FieldType.INT8, brain_pin_e); + public static final Field COASTINGFUELCUTRPMHIGH = Field.create("COASTINGFUELCUTRPMHIGH", 3172, FieldType.INT16); + public static final Field COASTINGFUELCUTRPMLOW = Field.create("COASTINGFUELCUTRPMLOW", 3174, FieldType.INT16); + public static final Field COASTINGFUELCUTTPS = Field.create("COASTINGFUELCUTTPS", 3176, FieldType.INT16); + public static final Field COASTINGFUELCUTCLT = Field.create("COASTINGFUELCUTCLT", 3178, FieldType.INT16); + public static final Field PIDEXTRAFORLOWRPM = Field.create("PIDEXTRAFORLOWRPM", 3180, FieldType.INT16); + public static final Field COASTINGFUELCUTMAP = Field.create("COASTINGFUELCUTMAP", 3182, FieldType.INT16); public static final Field IGNITIONTPSTABLE = Field.create("IGNITIONTPSTABLE", 3312, FieldType.INT); public static final Field TCHARGEAIRCOEFMIN = Field.create("TCHARGEAIRCOEFMIN", 3888, FieldType.FLOAT); public static final Field TCHARGEAIRCOEFMAX = Field.create("TCHARGEAIRCOEFMAX", 3892, FieldType.FLOAT); @@ -1916,24 +1917,24 @@ public class Fields { public static final String[] tChargeMode_e = {"RPM+TPS (Default)", "Air Mass Interpolation"}; public static final Field TCHARGEMODE = Field.create("TCHARGEMODE", 3908, FieldType.INT, tChargeMode_e); public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 3976, FieldType.FLOAT); - public static final Field ETB_ITERMMIN = Field.create("ETB_ITERMMIN", 3980, FieldType.INT); - public static final Field ETB_ITERMMAX = Field.create("ETB_ITERMMAX", 3982, FieldType.INT); + public static final Field ETB_ITERMMIN = Field.create("ETB_ITERMMIN", 3980, FieldType.INT16); + public static final Field ETB_ITERMMAX = Field.create("ETB_ITERMMAX", 3982, FieldType.INT16); public static final Field ETBDEADBAND = Field.create("ETBDEADBAND", 3984, FieldType.FLOAT); - public static final Field ETB2_DIRECTIONPIN1 = Field.create("ETB2_DIRECTIONPIN1", 3988, FieldType.INT, brain_pin_e); - public static final Field ETB2_DIRECTIONPIN2 = Field.create("ETB2_DIRECTIONPIN2", 3989, FieldType.INT, brain_pin_e); - public static final Field ETB2_CONTROLPIN1 = Field.create("ETB2_CONTROLPIN1", 3990, FieldType.INT, brain_pin_e); - public static final Field ETB2_CONTROLPIN2 = Field.create("ETB2_CONTROLPIN2", 3991, FieldType.INT, brain_pin_e); + public static final Field ETB2_DIRECTIONPIN1 = Field.create("ETB2_DIRECTIONPIN1", 3988, FieldType.INT8, brain_pin_e); + public static final Field ETB2_DIRECTIONPIN2 = Field.create("ETB2_DIRECTIONPIN2", 3989, FieldType.INT8, brain_pin_e); + public static final Field ETB2_CONTROLPIN1 = Field.create("ETB2_CONTROLPIN1", 3990, FieldType.INT8, brain_pin_e); + public static final Field ETB2_CONTROLPIN2 = Field.create("ETB2_CONTROLPIN2", 3991, FieldType.INT8, brain_pin_e); public static final Field IDLETIMINGPID_PFACTOR = Field.create("IDLETIMINGPID_PFACTOR", 3992, FieldType.FLOAT); public static final Field IDLETIMINGPID_IFACTOR = Field.create("IDLETIMINGPID_IFACTOR", 3996, FieldType.FLOAT); public static final Field IDLETIMINGPID_DFACTOR = Field.create("IDLETIMINGPID_DFACTOR", 4000, FieldType.FLOAT); - public static final Field IDLETIMINGPID_OFFSET = Field.create("IDLETIMINGPID_OFFSET", 4004, FieldType.INT); - public static final Field IDLETIMINGPID_PERIODMS = Field.create("IDLETIMINGPID_PERIODMS", 4006, FieldType.INT); - public static final Field IDLETIMINGPID_MINVALUE = Field.create("IDLETIMINGPID_MINVALUE", 4008, FieldType.INT); - public static final Field IDLETIMINGPID_MAXVALUE = Field.create("IDLETIMINGPID_MAXVALUE", 4010, FieldType.INT); - public static final Field IDLETIMINGPIDWORKZONE = Field.create("IDLETIMINGPIDWORKZONE", 4012, FieldType.INT); - public static final Field IDLETIMINGPIDDEADZONE = Field.create("IDLETIMINGPIDDEADZONE", 4014, FieldType.INT); - public static final Field IDLEPIDFALLOFFDELTARPM = Field.create("IDLEPIDFALLOFFDELTARPM", 4016, FieldType.INT); - public static final Field TPSACCELFRACTIONPERIOD = Field.create("TPSACCELFRACTIONPERIOD", 4018, FieldType.INT); + public static final Field IDLETIMINGPID_OFFSET = Field.create("IDLETIMINGPID_OFFSET", 4004, FieldType.INT16); + public static final Field IDLETIMINGPID_PERIODMS = Field.create("IDLETIMINGPID_PERIODMS", 4006, FieldType.INT16); + public static final Field IDLETIMINGPID_MINVALUE = Field.create("IDLETIMINGPID_MINVALUE", 4008, FieldType.INT16); + public static final Field IDLETIMINGPID_MAXVALUE = Field.create("IDLETIMINGPID_MAXVALUE", 4010, FieldType.INT16); + public static final Field IDLETIMINGPIDWORKZONE = Field.create("IDLETIMINGPIDWORKZONE", 4012, FieldType.INT16); + public static final Field IDLETIMINGPIDDEADZONE = Field.create("IDLETIMINGPIDDEADZONE", 4014, FieldType.INT16); + public static final Field IDLEPIDFALLOFFDELTARPM = Field.create("IDLEPIDFALLOFFDELTARPM", 4016, FieldType.INT16); + public static final Field TPSACCELFRACTIONPERIOD = Field.create("TPSACCELFRACTIONPERIOD", 4018, FieldType.INT16); public static final Field TPSACCELFRACTIONDIVISOR = Field.create("TPSACCELFRACTIONDIVISOR", 4020, FieldType.FLOAT); public static final Field TLE8888SPIDEVICE = Field.create("TLE8888SPIDEVICE", 4024, FieldType.INT); public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 676f274a5c..7bb05f1354 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190302; + public static final int CONSOLE_VERSION = 20190407; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/SettingsTab.java b/java_console/ui/src/com/rusefi/ui/SettingsTab.java index d9e1f74b1f..3411045589 100644 --- a/java_console/ui/src/com/rusefi/ui/SettingsTab.java +++ b/java_console/ui/src/com/rusefi/ui/SettingsTab.java @@ -13,6 +13,9 @@ import java.util.ArrayList; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +/** + * @see EnumConfigField + */ public class SettingsTab { public static final String WRITECONFIG = "writeconfig"; private final JPanel content = new JPanel(new BorderLayout()); @@ -48,12 +51,7 @@ public class SettingsTab { menu.setLayout(new GridLayout(dialogs.keySet().size() / 2 + 1, 2)); for (final String name : dialogs.keySet()) { JMenuItem item = new JMenuItem(name); - item.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - selectDialog(name); - } - }); + item.addActionListener(e1 -> selectDialog(name)); menu.add(item); } menu.show(c, -1, c.getHeight()); diff --git a/java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java b/java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java index e8888440c5..72a9ece02d 100644 --- a/java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java +++ b/java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java @@ -16,7 +16,7 @@ import java.nio.ByteOrder; public abstract class BaseConfigField { protected final JLabel status = new JLabel("P"); - protected final JPanel panel = new JPanel(new BorderLayout()); + private final JPanel panel = new JPanel(new BorderLayout()); protected final Field field; public BaseConfigField(final Field field) { @@ -36,11 +36,6 @@ public abstract class BaseConfigField { if (ci == null) return; loadValue(ci); - -// CommandQueue.getInstance().write(field.getCommand(), -// CommandQueue.DEFAULT_TIMEOUT, -// InvocationConfirmationListener.VOID, -// false); } protected abstract void loadValue(ConfigurationImage ci); @@ -72,7 +67,7 @@ public abstract class BaseConfigField { panel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(Color.black), BorderFactory.createEmptyBorder(2, 2, 2, 2))); - panel.add(new JLabel(topLabel), BorderLayout.NORTH); + panel.add(new JLabel(topLabel), BorderLayout.WEST); panel.add(center, BorderLayout.CENTER); } diff --git a/java_console/ui/src/com/rusefi/ui/config/BitConfigField.java b/java_console/ui/src/com/rusefi/ui/config/BitConfigField.java index 661d529f64..ec4ac92c36 100644 --- a/java_console/ui/src/com/rusefi/ui/config/BitConfigField.java +++ b/java_console/ui/src/com/rusefi/ui/config/BitConfigField.java @@ -2,6 +2,7 @@ package com.rusefi.ui.config; import com.opensr5.ConfigurationImage; import com.rusefi.config.Field; +import com.rusefi.config.Fields; import com.rusefi.core.MessagesCentral; import javax.swing.*; @@ -21,7 +22,8 @@ public class BitConfigField extends BaseConfigField { @Override public void onMessage(Class clazz, String message) { if (Field.isBitValueMessage(message)) { - String expectedPrefix = "bit @" + field.getOffset() + "/" + field.getBitOffset() + " is "; + String expectedPrefix = "bit" + + Fields.CONSOLE_DATA_PROTOCOL_TAG + field.getOffset() + "/" + field.getBitOffset() + " is "; if (message.startsWith(expectedPrefix) && message.length() == expectedPrefix.length() + 1) { message = message.substring(expectedPrefix.length()); Boolean value = message.equals("1"); diff --git a/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java b/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java index 3310c03853..399855e347 100644 --- a/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java +++ b/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java @@ -2,6 +2,7 @@ package com.rusefi.ui.config; import com.opensr5.ConfigurationImage; import com.rusefi.config.Field; +import com.rusefi.config.FieldType; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Pair; @@ -76,7 +77,14 @@ public class EnumConfigField extends BaseConfigField { @Override protected void loadValue(ConfigurationImage ci) { - int ordinal = getByteBuffer(ci).getInt(); + int ordinal; + if (field.getType() == FieldType.INT8) { + ordinal = getByteBuffer(ci).get(); + } else if (field.getType() == FieldType.INT16) { + ordinal = getByteBuffer(ci).getShort(); + } else { + ordinal = getByteBuffer(ci).getInt(); + } setValue(ordinal); } } \ No newline at end of file diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 18c97639b90dcd3d5b4be7692968b3bfee4f9e4d..3467a6a720de4466dcdfacd54737daabb3bddd46 100644 GIT binary patch delta 7681 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 MJfhsj{QJNE0V}K-kpKVy delta 7551 zcmeI%*FPH!-^X!+wzeW#`>MTHQ&C%LR&2FLYwxXQ602r4H1;YnuTrD5R*kko1r>W! z^Fk3sZE;`E*>nE`_mSV>_vCl{etnj3fLI)W)=-y>oQj0x4hacqZfrWO5E)5sY=fK@ z3*BGHSpArMK{jeS5|T>}R4R)U!Yi5#0A+^6iVw8JF~_7*YEBpTWa)?%bG#wcbAMLN zV&>$~anBcU&p+y1J$gFl-7zaL$d>YT8mjjg@y2O_)K34^Ka$B zln$FdT^4^Ou-ndwaa^{DT}8`C!aD7*o&ngG7_ww@5xerxPb&h^wdoOHY)5e~xZmYN zFZjYOZAutUmhsD)xz2pPrbWa5j=+i;<^{$(87$;;ufd+N2?3@mO-=UA91@V^>(V>O zXZB^0ux4JW4XxJ3J>ZiE`kKu1$AG)veu3Rx`l{fxY4*j$U;RJ=qm�#G8H5a?=DZ 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 Gz5f7%)5Ny` diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java index a8e1690564..a67a692ac2 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java @@ -239,7 +239,13 @@ public class ConfigField { } writeJavaFieldName(javaFieldsWriter, nameWithPrefix, tsPosition); - javaFieldsWriter.write("FieldType.INT"); + if (elementSize == 1) { + javaFieldsWriter.write("FieldType.INT8"); + } else if (elementSize == 2) { + javaFieldsWriter.write("FieldType.INT16"); + } else { + javaFieldsWriter.write("FieldType.INT"); + } if (enumOptions != null) { javaFieldsWriter.write(", " + type); }