From 00b3372929d7af57e4755bf401715b2aca87deb3 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 17 Apr 2022 17:09:58 -0400 Subject: [PATCH] progress --- .../rusefi/config/generated/TsOutputs.java | 437 +++++++++++++++++- .../main/java/com/rusefi/output/TsOutput.java | 10 +- .../java/com/rusefi/test/OutputsTest.java | 4 +- 3 files changed, 447 insertions(+), 4 deletions(-) diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index b00aa5efd0..eb98006393 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,22 +1,64 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Apr 17 17:51:27 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary\output_channels.txt Sun Apr 17 17:01:39 EDT 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TsOutputs { + public static final int accelerationRoll_offset = 310; + public static final int accelerationX_offset = 212; + public static final int accelerationY_offset = 214; + public static final int accelerationYaw_offset = 312; + public static final int accelerationZ_offset = 308; + public static final int accPedalSplit_offset = 332; + public static final int acState_offset = 0; + public static final int acSwitchState_offset = 0; + public static final int actualLastInjection_offset = 54; public static final int ADC_CHANNEL_NONE = 0; + public static final int afrTableYAxis_offset = 106; + public static final int AFRValue2_offset = 288; + public static final int AFRValue_offset = 282; public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; + public static final int alternatorOnOff_offset = 0; + public static final int alternatorStatus_dTerm_offset = 518; + public static final int alternatorStatus_error_offset = 522; + public static final int alternatorStatus_iTerm_offset = 516; + public static final int alternatorStatus_offset = 516; + public static final int alternatorStatus_output_offset = 520; + public static final int alternatorStatus_resetCounter_offset = 524; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; + public static final int auxLinear1_offset = 404; + public static final int auxLinear2_offset = 406; + public static final int auxSpeed1_offset = 564; + public static final int auxSpeed2_offset = 566; + public static final int auxTemp1_offset = 16; + public static final int auxTemp2_offset = 18; public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; + public static final int baroCorrection_offset = 68; + public static final int baroPressure_offset = 32; + public static final int baseFuel_offset = 50; public static final int BLOCKING_FACTOR = 256; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; + public static final int boostControllerClosedLoopPart_offset = 442; + public static final int boostControllerOpenLoopPart_offset = 415; + public static final int boostControllerOutput_offset = 414; + public static final int boostControlTarget_offset = 336; + public static final int boostStatus_dTerm_offset = 554; + public static final int boostStatus_error_offset = 558; + public static final int boostStatus_iTerm_offset = 552; + public static final int boostStatus_offset = 552; + public static final int boostStatus_output_offset = 556; + public static final int boostStatus_resetCounter_offset = 560; + public static final int brakePedalState_offset = 0; + public static final int calibrationMode_offset = 132; + public static final int calibrationValue2_offset = 372; + public static final int calibrationValue_offset = 128; public static final int CAM_INPUTS_COUNT = 4; public static final int CAM_INPUTS_COUNT_padding = 0; public static final int CAMS_PER_BANK = 2; @@ -25,10 +67,18 @@ public class TsOutputs { public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; public static final String CAN_RX_PREFIX = "CAN_rx"; + public static final int canReadCounter_offset = 80; + public static final int canWriteNotOk_offset = 462; + public static final int canWriteOk_offset = 460; + public static final int chargeAirMass_offset = 44; + public static final int checkEngine_offset = 0; public static final int CLT_CRANKING_CURVE_SIZE = 8; public static final int CLT_CURVE_SIZE = 16; public static final int CLT_LIMITER_CURVE_SIZE = 4; public static final int CLT_TIMING_CURVE_SIZE = 8; + public static final int cltCorrection_offset = 66; + public static final int clutchDownState_offset = 0; + public static final int clutchUpState_offset = 0; public static final String CMD_AC_RELAY_BENCH = "acrelaybench"; public static final String CMD_ALTERNATOR_PIN = "set_alternator_pin"; public static final String CMD_BOOST_PIN = "set_boost_pin"; @@ -74,18 +124,47 @@ public class TsOutputs { public static final int CMD_TS_X31 = 49; public static final String CMD_VSS_PIN = "vss_pin"; public static final String CMD_WRITECONFIG = "writeconfig"; + public static final int coilDutyCycle_offset = 88; public static final int COMPOSITE_DATA_LENGTH = 2500; public static final int COMPOSITE_DATA_LENGTH_HALF = 1250; public static final int COMPOSITE_PACKET_COUNT = 500; public static final int COMPOSITE_PACKET_SIZE = 5; public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; + public static final int coolant_offset = 12; public static final int CRANKING_ADVANCE_CURVE_SIZE = 4; public static final int CRANKING_CLT_IDLE_CURVE_SIZE = 8; public static final int CRANKING_CURVE_SIZE = 8; + public static final int crankingFuelMs_offset = 46; public static final String CRITICAL_PREFIX = "CRITICAL"; + public static final int currentEnginePhase_offset = 70; + public static final int currentTargetAfr_offset = 48; public static final int DC_PER_STEPPER = 2; + public static final int debugFloatField1_offset = 168; + public static final int debugFloatField2_offset = 172; + public static final int debugFloatField3_offset = 176; + public static final int debugFloatField4_offset = 180; + public static final int debugFloatField5_offset = 184; + public static final int debugFloatField6_offset = 188; + public static final int debugFloatField7_offset = 192; + public static final int debugIntField1_offset = 196; + public static final int debugIntField2_offset = 200; + public static final int debugIntField3_offset = 204; + public static final int debugIntField4_offset = 208; + public static final int debugIntField5_offset = 210; + public static final int deltaTps_offset = 78; + public static final int detectedGear_offset = 443; + public static final int dfcoActive_offset = 408; + public static final int di_nextStart_offset = 360; public static final int DIGIPOT_COUNT = 4; public static final int DWELL_CURVE_SIZE = 8; + public static final int egt1_offset = 216; + public static final int egt2_offset = 218; + public static final int egt3_offset = 220; + public static final int egt4_offset = 222; + public static final int egt5_offset = 224; + public static final int egt6_offset = 226; + public static final int egt7_offset = 228; + public static final int egt8_offset = 230; public static final int EGT_CHANNEL_COUNT = 8; public static final String ENGINE_MAKE_BMW = "BMW"; public static final String ENGINE_MAKE_GM = "GM"; @@ -100,16 +179,43 @@ public class TsOutputs { public static final String ENGINE_MAKE_VAG = "VAG"; public static final int ENGINE_NOISE_CURVE_SIZE = 8; public static final int ENGINE_SNIFFER_UNIT_US = 10; + public static final int engineMakeCodeNameCrc16_offset = 138; + public static final int engineMode_offset = 116; public static final int ENUM_16_BITS = 60000; public static final int ENUM_32_BITS = 2000000000; public static final int ERROR_BUFFER_SIZE = 120; + public static final int etb1DutyCycle_offset = 94; + public static final int etb1Error_offset = 96; public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int ETB_HW_MAX_FREQUENCY = 3000; + public static final int etbCurrentTarget_offset = 512; + public static final int etbFeedForward_offset = 504; + public static final int etbIntegralError_offset = 508; + public static final int etbStatus_dTerm_offset = 542; + public static final int etbStatus_error_offset = 546; + public static final int etbStatus_iTerm_offset = 540; + public static final int etbStatus_offset = 540; + public static final int etbStatus_output_offset = 544; + public static final int etbStatus_resetCounter_offset = 548; + public static final int etbTarget_offset = 92; + public static final int fallbackMap_offset = 440; + public static final int firmwareVersion_offset = 120; public static final int FLASH_DATA_VERSION = 10009; + public static final int flexPercent_offset = 263; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; + public static final int fuel_requested_percent_offset = 340; + public static final int fuel_requested_percent_pi_offset = 344; public static final int FUEL_RPM_COUNT = 16; + public static final int fuelClosedLoopBinIdx_offset = 246; + public static final int fuelCutReason_offset = 339; + public static final int fuelFlowRate_offset = 102; + public static final int fuelingLoad_offset = 134; + public static final int fuelPidCorrection1_offset = 296; + public static final int fuelPidCorrection2_offset = 298; + public static final int fuelRunning_offset = 52; + public static final int fuelTankLevel_offset = 98; public static final int GAP_TRACKING_LENGTH = 18; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final String GAUGE_NAME_ACCEL_ROLL = "Acceleration: Roll"; @@ -244,6 +350,8 @@ public class TsOutputs { public static final int GPPWM_LOAD_COUNT = 8; public static final int GPPWM_NOTE_SIZE = 16; public static final int GPPWM_RPM_COUNT = 8; + public static final int hasCriticalError_offset = 0; + public static final int highFuelPressure_offset = 278; public static final int HPFP_COMPENSATION_SIZE = 10; public static final int HPFP_DEADTIME_SIZE = 8; public static final int HPFP_LOBE_PROFILE_SIZE = 16; @@ -251,30 +359,115 @@ public class TsOutputs { public static final int HW_MAX_ADC_INDEX = 17; public static final int IAC_PID_MULT_SIZE = 8; public static final int IAT_CURVE_SIZE = 16; + public static final int iatCorrection_offset = 64; public static final int IDLE_ADVANCE_CURVE_SIZE = 8; public static final int IDLE_VE_SIZE = 4; + public static final int idleAirValvePosition_offset = 90; + public static final int idleCurrentPosition_offset = 37; + public static final int idlePositionSensor_offset = 270; + public static final int idleState_offset = 492; + public static final int idleStatus_dTerm_offset = 530; + public static final int idleStatus_error_offset = 534; + public static final int idleStatus_iTerm_offset = 528; + public static final int idleStatus_offset = 528; + public static final int idleStatus_output_offset = 532; + public static final int idleStatus_resetCounter_offset = 536; + public static final int idleTargetPosition_offset = 133; public static final int IGN_LOAD_COUNT = 16; public static final int IGN_RPM_COUNT = 16; + public static final int ignitionAdvance_offset = 84; + public static final int ignitionLoad_offset = 136; public static final String INDICATOR_NAME_AC_SWITCH = "AC switch"; public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; + public static final int injectionOffset_offset = 58; + public static final int injectorDutyCycle_offset = 56; + public static final int injectorFlowPressureDelta_offset = 500; + public static final int injectorFlowPressureRatio_offset = 496; + public static final int injectorLagMs_offset = 62; + public static final int instantMAPValue_offset = 450; + public static final int instantRpm_offset = 358; + public static final int intake_offset = 14; + public static final int internalMcuTemperature_offset = 11; + public static final int isCltError_offset = 0; + public static final int isFan2On_offset = 0; + public static final int isFanOn_offset = 0; + public static final int isFuelPumpOn_offset = 0; + public static final int isIatError_offset = 0; + public static final int isIdleClosedLoop_offset = 0; + public static final int isIdleCoasting_offset = 0; + public static final int isIgnitionEnabledIndicator_offset = 0; + public static final int isInjectionEnabledIndicator_offset = 0; + public static final int isKnockChipOk_offset = 0; + public static final int isMainRelayOn_offset = 376; + public static final int isMapError_offset = 0; + public static final int isO2HeaterOn_offset = 0; + public static final int isPedalError_offset = 0; + public static final int isTps2Error_offset = 0; + public static final int isTpsError_offset = 0; + public static final int isTriggerError_offset = 0; + public static final int isUsbConnected_offset = 376; + public static final int isWarnNow_offset = 0; + public static final int knock10_offset = 259; + public static final int knock11_offset = 260; + public static final int knock12_offset = 261; + public static final int knock1_offset = 250; + public static final int knock2_offset = 251; + public static final int knock3_offset = 252; + public static final int knock4_offset = 253; + public static final int knock5_offset = 254; + public static final int knock6_offset = 255; + public static final int knock7_offset = 256; + public static final int knock8_offset = 257; + public static final int knock9_offset = 258; + public static final int knockCount_offset = 306; + public static final int knockLevel_offset = 108; + public static final int knockRetard_offset = 36; + public static final int lambdaValue2_offset = 286; + public static final int lambdaValue_offset = 34; + public static final int lastErrorCode_offset = 150; + public static final int launchActivatePinState_offset = 408; + public static final int launchActivateSwitchCondition_offset = 408; + public static final int launchCombinedConditions_offset = 408; + public static final int launchIsLaunchCondition_offset = 408; + public static final int launchRpmCondition_offset = 408; + public static final int launchSpeedCondition_offset = 408; + public static final int launchTpsCondition_offset = 408; + public static final int launchTriggered_offset = 0; public static final int LE_COMMAND_LENGTH = 200; public static final String LOG_DELIMITER = "`"; public static final int LOGIC_ANALYZER_CHANNEL_COUNT = 4; + public static final int lowFuelPressure_offset = 276; public static final int LUA_ANALOG_INPUT_COUNT = 8; public static final int LUA_PWM_COUNT = 8; public static final int LUA_SCRIPT_SIZE = 8000; + public static final int luaInvocationCounter_offset = 380; + public static final int luaLastCycleDuration_offset = 384; + public static final int m_I_sum_percent_offset = 348; + public static final int m_pressureTarget_kPa_offset = 352; + public static final int m_requested_pump_offset = 334; public static final int MAF_DECODING_COUNT = 256; + public static final int mafEstimate_offset = 356; + public static final int mafMeasured_offset = 28; public static final String MAIN_HELP_URL = "http://www.rusefi.com/"; public static final int MAP_ANGLE_SIZE = 8; public static final int MAP_WINDOW_SIZE = 8; + public static final int MAPValue_offset = 30; public static final int MAX_CYLINDER_COUNT = 12; + public static final int maxLockedDuration_offset = 456; + public static final int maxTriggerReentrant_offset = 458; public static final int MLQ_FIELD_HEADER_SIZE = 55; public static final int MLQ_HEADER_SIZE = 22; public static final String MOCK_PPS_POSITION_COMMAND = "mock_pps_position"; public static final String MOCK_PPS_VOLTAGE_COMMAND = "mock_pps_voltage"; + public static final int mostRecentTimeBetweenIgnitionEvents_offset = 454; + public static final int mostRecentTimeBetweenSparkEvents_offset = 452; + public static final int multiSparkCounter_offset = 491; public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8; + public static final int needBurn_offset = 0; + public static final int oilPressure_offset = 40; + public static final int orderingErrorCounter_offset = 144; public static final int PACK_ADD_TEMPERATURE = 40; public static final int PACK_MULT_AFR = 1000; public static final int PACK_MULT_AFR_CFG = 10; @@ -318,25 +511,89 @@ public class TsOutputs { public static final String PROTOCOL_WA_CHANNEL_2 = "input2"; public static final String PROTOCOL_WA_CHANNEL_3 = "input3"; public static final String PROTOCOL_WA_CHANNEL_4 = "input4"; + public static final int rawAfr_offset = 368; + public static final int rawClt_offset = 238; + public static final int rawHighFuelPressure_offset = 274; + public static final int rawIat_offset = 240; + public static final int rawIdlePositionSensor_offset = 264; + public static final int rawLowFuelPressure_offset = 272; + public static final int rawMaf_offset = 26; + public static final int rawMap_offset = 366; + public static final int rawOilPressure_offset = 242; + public static final int rawPpsPrimary_offset = 236; + public static final int rawPpsSecondary_offset = 248; + public static final int rawTps1Primary_offset = 234; + public static final int rawTps1Secondary_offset = 300; + public static final int rawTps2Primary_offset = 302; + public static final int rawTps2Secondary_offset = 304; + public static final int rawWastegatePosition_offset = 266; + public static final int recentErrorCode1_offset = 152; + public static final int recentErrorCode2_offset = 154; + public static final int recentErrorCode3_offset = 156; + public static final int recentErrorCode4_offset = 158; + public static final int recentErrorCode5_offset = 160; + public static final int recentErrorCode6_offset = 162; + public static final int recentErrorCode7_offset = 164; + public static final int recentErrorCode8_offset = 166; + public static final int revolutionCounterSinceStart_offset = 76; public static final int RPM_1_BYTE_PACKING_MULT = 50; + public static final int rpmAcceleration_offset = 6; + public static final int RPMValue_offset = 4; public static final int SCRIPT_CURVE_16 = 16; public static final int SCRIPT_CURVE_8 = 8; public static final int SCRIPT_CURVE_COUNT = 6; public static final int SCRIPT_SETTING_COUNT = 8; public static final int SCRIPT_TABLE_8 = 8; public static final int SCRIPT_TABLE_COUNT = 4; + public static final int sd_logging_internal_offset = 0; + public static final int sd_msd_offset = 0; + public static final int sd_present_offset = 0; + public static final int seconds_offset = 112; public static final int SERVO_COUNT = 8; + public static final int sparkCutReason_offset = 338; + public static final int sparkDwellValue_offset = 86; + public static final int speedToRpmRatio_offset = 8; + public static final int starterRelayDisable_offset = 490; + public static final int starterState_offset = 489; + public static final int startStopStateToggleCounter_offset = 488; public static final int STFT_BANK_COUNT = 2; public static final int STFT_CELL_COUNT = 4; + public static final int systemEventReuse_offset = 364; + public static final int targetLambda_offset = 280; + public static final int tCharge_offset = 60; public static final int TCU_GEAR_COUNT = 10; public static final int TCU_SOLENOID_COUNT = 6; + public static final int tcuCurrentGear_offset = 247; + public static final int tcuDesiredGear_offset = 262; + public static final int TEMPLOG_MAP_AT_CYCLE_COUNT_offset = 412; + public static final int TEMPLOG_MAP_AT_DIFF_offset = 420; + public static final int TEMPLOG_MAP_AT_SPECIAL_POINT_offset = 416; + public static final int TEMPLOG_map_peak_offset = 413; + public static final int testBenchIter_offset = 388; + public static final int throttlePedalPosition_offset = 22; + public static final int timingCltCorrection_offset = 444; + public static final int timingIatCorrection_offset = 446; + public static final int timingPidCorrection_offset = 448; public static final int TOOTH_DATA_LENGTH = 2000; public static final int TOOTH_PACKET_COUNT = 1000; public static final int TOOTH_PACKET_SIZE = 2; + public static final int toothLogReady_offset = 0; public static final String TOP_DEAD_CENTER_MESSAGE = "r"; public static final int TORQUE_CURVE_SIZE = 6; + public static final int totalFuelConsumption_offset = 100; + public static final int totalTriggerErrorCounter_offset = 140; + public static final int tps12Split_offset = 330; + public static final int tps1Split_offset = 326; + public static final int tps2Split_offset = 328; + public static final int TPS2Value_offset = 232; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int TPS_TPS_ACCEL_TABLE = 8; + public static final int tpsAccelActive_offset = 408; + public static final int tpsAccelFrom_offset = 370; + public static final int tpsAccelFuel_offset = 82; + public static final int tpsAccelTo_offset = 371; + public static final int tpsADC_offset = 24; + public static final int TPSValue_offset = 20; public static final String TRIGGER_COMMENT = "#"; public static final String TRIGGER_HARDCODED_OPERATION_MODE = "knownOperationMode"; public static final String TRIGGER_HAS_SECOND_CHANNEL = "hasSecondChannel"; @@ -344,7 +601,15 @@ public class TsOutputs { public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int triggerPrimaryFall_offset = 464; + public static final int triggerPrimaryRise_offset = 468; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; + public static final int triggerSecondaryFall_offset = 472; + public static final int triggerSecondaryRise_offset = 476; + public static final int triggerStateIndex_offset = 436; + public static final int triggerSyncGapRatio_offset = 432; + public static final int triggerVvtFall_offset = 480; + public static final int triggerVvtRise_offset = 484; public static final int TRIM_SIZE = 4; public static final char TS_BURN_COMMAND = 'B'; public static final char TS_CHUNK_WRITE_COMMAND = 'C'; @@ -382,10 +647,180 @@ public class TsOutputs { public static final char TS_SET_LOGGER_SWITCH = 'l'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; + public static final int tsConfigVersion_offset = 124; + public static final int tuneCrc16_offset = 244; + public static final int turboSpeed_offset = 318; + public static final int unusedAtTheEnd10_offset = 577; + public static final int unusedAtTheEnd11_offset = 578; + public static final int unusedAtTheEnd12_offset = 579; + public static final int unusedAtTheEnd13_offset = 580; + public static final int unusedAtTheEnd14_offset = 581; + public static final int unusedAtTheEnd15_offset = 582; + public static final int unusedAtTheEnd16_offset = 583; + public static final int unusedAtTheEnd17_offset = 584; + public static final int unusedAtTheEnd18_offset = 585; + public static final int unusedAtTheEnd19_offset = 586; + public static final int unusedAtTheEnd1_offset = 568; + public static final int unusedAtTheEnd20_offset = 587; + public static final int unusedAtTheEnd21_offset = 588; + public static final int unusedAtTheEnd22_offset = 589; + public static final int unusedAtTheEnd23_offset = 590; + public static final int unusedAtTheEnd24_offset = 591; + public static final int unusedAtTheEnd25_offset = 592; + public static final int unusedAtTheEnd26_offset = 593; + public static final int unusedAtTheEnd27_offset = 594; + public static final int unusedAtTheEnd28_offset = 595; + public static final int unusedAtTheEnd29_offset = 596; + public static final int unusedAtTheEnd2_offset = 569; + public static final int unusedAtTheEnd30_offset = 597; + public static final int unusedAtTheEnd31_offset = 598; + public static final int unusedAtTheEnd32_offset = 599; + public static final int unusedAtTheEnd33_offset = 600; + public static final int unusedAtTheEnd34_offset = 601; + public static final int unusedAtTheEnd35_offset = 602; + public static final int unusedAtTheEnd36_offset = 603; + public static final int unusedAtTheEnd37_offset = 604; + public static final int unusedAtTheEnd38_offset = 605; + public static final int unusedAtTheEnd39_offset = 606; + public static final int unusedAtTheEnd3_offset = 570; + public static final int unusedAtTheEnd40_offset = 607; + public static final int unusedAtTheEnd41_offset = 608; + public static final int unusedAtTheEnd42_offset = 609; + public static final int unusedAtTheEnd43_offset = 610; + public static final int unusedAtTheEnd44_offset = 611; + public static final int unusedAtTheEnd45_offset = 612; + public static final int unusedAtTheEnd46_offset = 613; + public static final int unusedAtTheEnd47_offset = 614; + public static final int unusedAtTheEnd48_offset = 615; + public static final int unusedAtTheEnd49_offset = 616; + public static final int unusedAtTheEnd4_offset = 571; + public static final int unusedAtTheEnd50_offset = 617; + public static final int unusedAtTheEnd51_offset = 618; + public static final int unusedAtTheEnd52_offset = 619; + public static final int unusedAtTheEnd53_offset = 620; + public static final int unusedAtTheEnd54_offset = 621; + public static final int unusedAtTheEnd55_offset = 622; + public static final int unusedAtTheEnd56_offset = 623; + public static final int unusedAtTheEnd57_offset = 624; + public static final int unusedAtTheEnd58_offset = 625; + public static final int unusedAtTheEnd59_offset = 626; + public static final int unusedAtTheEnd5_offset = 572; + public static final int unusedAtTheEnd60_offset = 627; + public static final int unusedAtTheEnd61_offset = 628; + public static final int unusedAtTheEnd62_offset = 629; + public static final int unusedAtTheEnd63_offset = 630; + public static final int unusedAtTheEnd64_offset = 631; + public static final int unusedAtTheEnd65_offset = 632; + public static final int unusedAtTheEnd66_offset = 633; + public static final int unusedAtTheEnd67_offset = 634; + public static final int unusedAtTheEnd68_offset = 635; + public static final int unusedAtTheEnd69_offset = 636; + public static final int unusedAtTheEnd6_offset = 573; + public static final int unusedAtTheEnd70_offset = 637; + public static final int unusedAtTheEnd71_offset = 638; + public static final int unusedAtTheEnd72_offset = 639; + public static final int unusedAtTheEnd7_offset = 574; + public static final int unusedAtTheEnd8_offset = 575; + public static final int unusedAtTheEnd9_offset = 576; + public static final int unusedb4_offset = 0; + public static final int unusedBit_182_10_offset = 376; + public static final int unusedBit_182_11_offset = 376; + public static final int unusedBit_182_12_offset = 376; + public static final int unusedBit_182_13_offset = 376; + public static final int unusedBit_182_14_offset = 376; + public static final int unusedBit_182_15_offset = 376; + public static final int unusedBit_182_16_offset = 376; + public static final int unusedBit_182_17_offset = 376; + public static final int unusedBit_182_18_offset = 376; + public static final int unusedBit_182_19_offset = 376; + public static final int unusedBit_182_20_offset = 376; + public static final int unusedBit_182_21_offset = 376; + public static final int unusedBit_182_22_offset = 376; + public static final int unusedBit_182_23_offset = 376; + public static final int unusedBit_182_24_offset = 376; + public static final int unusedBit_182_25_offset = 376; + public static final int unusedBit_182_26_offset = 376; + public static final int unusedBit_182_27_offset = 376; + public static final int unusedBit_182_28_offset = 376; + public static final int unusedBit_182_29_offset = 376; + public static final int unusedBit_182_2_offset = 376; + public static final int unusedBit_182_30_offset = 376; + public static final int unusedBit_182_31_offset = 376; + public static final int unusedBit_182_3_offset = 376; + public static final int unusedBit_182_4_offset = 376; + public static final int unusedBit_182_5_offset = 376; + public static final int unusedBit_182_6_offset = 376; + public static final int unusedBit_182_7_offset = 376; + public static final int unusedBit_182_8_offset = 376; + public static final int unusedBit_182_9_offset = 376; + public static final int unusedBit_227_10_offset = 408; + public static final int unusedBit_227_11_offset = 408; + public static final int unusedBit_227_12_offset = 408; + public static final int unusedBit_227_13_offset = 408; + public static final int unusedBit_227_14_offset = 408; + public static final int unusedBit_227_15_offset = 408; + public static final int unusedBit_227_16_offset = 408; + public static final int unusedBit_227_17_offset = 408; + public static final int unusedBit_227_18_offset = 408; + public static final int unusedBit_227_19_offset = 408; + public static final int unusedBit_227_20_offset = 408; + public static final int unusedBit_227_21_offset = 408; + public static final int unusedBit_227_22_offset = 408; + public static final int unusedBit_227_23_offset = 408; + public static final int unusedBit_227_24_offset = 408; + public static final int unusedBit_227_25_offset = 408; + public static final int unusedBit_227_26_offset = 408; + public static final int unusedBit_227_27_offset = 408; + public static final int unusedBit_227_28_offset = 408; + public static final int unusedBit_227_29_offset = 408; + public static final int unusedBit_227_30_offset = 408; + public static final int unusedBit_227_31_offset = 408; + public static final int unusedBit_227_9_offset = 408; + public static final int unusedInTheMiddle10_offset = 398; + public static final int unusedInTheMiddle11_offset = 399; + public static final int unusedInTheMiddle12_offset = 400; + public static final int unusedInTheMiddle13_offset = 401; + public static final int unusedInTheMiddle14_offset = 402; + public static final int unusedInTheMiddle15_offset = 403; + public static final int unusedInTheMiddle1_offset = 389; + public static final int unusedInTheMiddle2_offset = 390; + public static final int unusedInTheMiddle3_offset = 391; + public static final int unusedInTheMiddle4_offset = 392; + public static final int unusedInTheMiddle5_offset = 393; + public static final int unusedInTheMiddle6_offset = 394; + public static final int unusedInTheMiddle7_offset = 395; + public static final int unusedInTheMiddle8_offset = 396; + public static final int unusedInTheMiddle9_offset = 397; public static final int VBAT_INJECTOR_CURVE_SIZE = 8; + public static final int VBatt_offset = 38; public static final int VEHICLE_INFO_SIZE = 32; + public static final int vehicleSpeedKph_offset = 10; + public static final int veTableYAxis_offset = 104; + public static final int veValue_offset = 57; public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; + public static final int VssAcceleration_offset = 284; + public static final int vvtCounter_offset = 437; + public static final int vvtCurrentPosition_offset = 428; + public static final int vvtPositionB1E_offset = 290; + public static final int vvtPositionB1I_offset = 42; + public static final int vvtPositionB2E_offset = 294; + public static final int vvtPositionB2I_offset = 292; + public static final int vvtStateIndex_offset = 439; + public static final int vvtSyncCounter_offset = 438; + public static final int vvtSyncGapRatio_offset = 424; + public static final int vvtTargets1_offset = 314; + public static final int vvtTargets2_offset = 315; + public static final int vvtTargets3_offset = 316; + public static final int vvtTargets4_offset = 317; + public static final int wallFuelAmount_offset = 72; + public static final int wallFuelCorrection_offset = 74; + public static final int warningCounter_offset = 148; + public static final int wastegatePositionSensor_offset = 268; + public static final int wbHeaterDuty1_offset = 324; + public static final int wbHeaterDuty2_offset = 325; + public static final int wbTemperature1_offset = 320; + public static final int wbTemperature2_offset = 322; public static final int WWAE_TABLE_SIZE = 8; public static final Field SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0); public static final Field ISIGNITIONENABLEDINDICATOR = Field.create("ISIGNITIONENABLEDINDICATOR", 0, FieldType.BIT, 1); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java index 73a382990c..4bb8143eaa 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java @@ -8,6 +8,7 @@ import com.rusefi.TypesHelper; import java.io.IOException; import static com.rusefi.ToolUtil.EOL; +import static com.rusefi.output.JavaSensorsConsumer.quote; /** * Same code is used to generate [Constants] and [OutputChannels] bodies, with just one flag controlling the minor @@ -81,8 +82,6 @@ public class TsOutput { if (!configField.getName().equals(next.getName())) tsPosition += configField.getState().tsCustomSize.get(configField.getType()); - } else if (configField.getTsInfo() == null) { - throw new IllegalArgumentException("Need TS info for " + configField.getName() + " at " + prefix); } else if (configField.getArraySizes().length == 0) { tsHeader.append(nameWithPrefix + " = scalar, "); tsHeader.append(TypesHelper.convertToTs(configField.getType()) + ","); @@ -125,6 +124,13 @@ public class TsOutput { } private String handleTsInfo(String tsInfo, int multiplierIndex) { + if (tsInfo == null) { + if (isConstantsSection) { + throw new IllegalStateException("todo: implement default tsInfo for long form"); + } + // default units and scale + return quote("") + ", 1, 0"; + } try { String[] fields = tsInfo.split(","); if (fields.length > multiplierIndex) { diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java index a6f1af4ced..461489d5e6 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java @@ -17,6 +17,7 @@ public class OutputsTest { "uint8_t afr_typet;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + "bit isForcedInduction;Does the vehicle have a turbo or supercharger?\n" + "bit enableFan1WithAc;+Turn on this fan when AC is on.\n" + + "angle_t m_requested_pump;Computed requested pump duration in degrees (not including deadtime)\n" + "end_struct\n"; ReaderState state = new ReaderState(); @@ -59,7 +60,8 @@ public class OutputsTest { "unusedBit_4_30 = bits, U32, 5, [30:30]\n" + "unusedBit_4_31 = bits, U32, 5, [31:31]\n" + "alignmentFill_at_9 = array, U08, 9, [3], \"units\", 1, 0\n" + - "; total TS size = 12\n", tsProjectConsumer.getContent()); + "m_requested_pump = scalar, F32, 12, \"\", 1, 0\n" + + "; total TS size = 16\n", tsProjectConsumer.getContent()); }