FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all generated files in one dir (#348) 

* delete existing generated source files

* ignore new generated dir

* move all the generated files

* cleanup

* jars

* makefile

* bootloader

* simulator+tests
This commit is contained in:
Matthew Kennedy 2024-01-17 14:25:00 -08:00 committed by GitHub
parent 96a9aba28e
commit f3b335fe8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 26 additions and 10903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/Makefile
View File

@ -16,6 +16,7 @@ include rusefi_rules.mk
# Define project name here
PROJECT = fome
PROJECT_DIR = .
GENERATED_DIR = $(PROJECT_DIR)/generated
# Configure precompiled header
PCH_DIR = $(PROJECT_DIR)/pch
@ -274,6 +275,7 @@ INCDIR = \
$(CHIBIOS)/os/various \
$(RUSEFI_LIB_INC) \
$(CONFDIR) \
$(GENERATED_DIR) \
ext/FatFS \
$(PROJECT_DIR)/hw_layer/mass_storage \
$(HW_INC) \

3
firmware/bootloader/Makefile
View File

@ -118,6 +118,7 @@ endif
# Define project name here
PROJECT = fome_bl
PROJECT_DIR = ..
GENERATED_DIR = $(PROJECT_DIR)/generated
# Configure precompiled header
PCH_DIR = $(PROJECT_DIR)/pch
@ -234,6 +235,7 @@ INCDIR = $(ALLINC) \
$(CONFDIR) \
$(PROJECT_DIR)/ext \
$(PROJECT_DIR)/ext_algo \
$(GENERATED_DIR) \
$(UTIL_INC) \
$(PROJECT_DIR)/console_util \
$(PROJECT_DIR)/console \
@ -251,7 +253,6 @@ INCDIR = $(ALLINC) \
$(PROJECT_DIR)/controllers/sensors/core \
$(PROJECT_DIR)/hw_layer/mass_storage \
$(PROJECT_DIR)/hw_layer/ports \
$(PROJECT_DIR)/console/binary/generated \
$(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER) \
$(HW_INC) \
$(HW_LAYER_DRIVERS_INC) \

2
firmware/common.mk
View File

@ -43,5 +43,3 @@ ALLINC += \
$(UTIL_INC) \
$(CONTROLLERS_SENSORS_INC) \
$(CONTROLLERS_INC) \
$(PROJECT_DIR)/console/binary/generated \

35
firmware/console/binary/generated/live_data_fragments.h
View File

@ -1,35 +0,0 @@
// generated by gen_live_documentation.sh / LiveDataProcessor.java
decl_frag<output_channels_s>{},
decl_frag<fuel_computer_s>{},
decl_frag<ignition_state_s>{},
decl_frag<knock_controller_s>{},
decl_frag<high_pressure_fuel_pump_s>{},
decl_frag<injector_model_s>{},
decl_frag<launch_control_state_s>{},
decl_frag<antilag_system_state_s>{},
decl_frag<boost_control_s>{},
decl_frag<ac_control_s>{},
decl_frag<fan_control_s, 0>{}, // fan1
// decl_frag<fan_control_s, 1>{}, // fan2
decl_frag<fuel_pump_control_s>{},
decl_frag<main_relay_s>{},
decl_frag<engine_state_s>{},
decl_frag<tps_accel_state_s>{},
decl_frag<trigger_central_s>{},
decl_frag<trigger_state_s, 0>{}, // trg
// decl_frag<trigger_state_s, 1>{}, // vvt1i
// decl_frag<trigger_state_s, 2>{}, // vvt1e
// decl_frag<trigger_state_s, 3>{}, // vvt2i
// decl_frag<trigger_state_s, 4>{}, // vvt2e
decl_frag<trigger_state_primary_s>{},
decl_frag<wall_fuel_state_s>{},
decl_frag<idle_state_s>{},
decl_frag<electronic_throttle_s, 0>{}, // etb1
// decl_frag<electronic_throttle_s, 1>{}, // etb2
decl_frag<wideband_state_s, 0>{}, // wb1
// decl_frag<wideband_state_s, 1>{}, // wb2
decl_frag<dc_motors_s>{},
decl_frag<sent_state_s>{},
decl_frag<throttle_model_s>{},
decl_frag<vvt_s>{},
decl_frag<lambda_monitor_s>{},

59
firmware/console/binary/generated/live_data_ids.h
View File

@ -1,59 +0,0 @@
// generated by gen_live_documentation.sh / LiveDataProcessor.java
#pragma once
typedef enum {
LDS_output_channels,
LDS_fuel_computer,
LDS_ignition_state,
LDS_knock_controller,
LDS_high_pressure_fuel_pump,
LDS_injector_model,
LDS_launch_control_state,
LDS_antilag_system_state,
LDS_boost_control,
LDS_ac_control,
LDS_fan_control,
LDS_fuel_pump_control,
LDS_main_relay,
LDS_engine_state,
LDS_tps_accel_state,
LDS_trigger_central,
LDS_trigger_state,
LDS_trigger_state_primary,
LDS_wall_fuel_state,
LDS_idle_state,
LDS_electronic_throttle,
LDS_wideband_state,
LDS_dc_motors,
LDS_sent_state,
LDS_throttle_model,
LDS_vvt,
LDS_lambda_monitor,
} live_data_e;
#define OUTPUT_CHANNELS_BASE_ADDRESS 0
#define FUEL_COMPUTER_BASE_ADDRESS 800
#define IGNITION_STATE_BASE_ADDRESS 844
#define KNOCK_CONTROLLER_BASE_ADDRESS 876
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 908
#define INJECTOR_MODEL_BASE_ADDRESS 932
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 944
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 952
#define BOOST_CONTROL_BASE_ADDRESS 964
#define AC_CONTROL_BASE_ADDRESS 988
#define FAN_CONTROL_BASE_ADDRESS 1000
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1004
#define MAIN_RELAY_BASE_ADDRESS 1008
#define ENGINE_STATE_BASE_ADDRESS 1012
#define TPS_ACCEL_STATE_BASE_ADDRESS 1096
#define TRIGGER_CENTRAL_BASE_ADDRESS 1144
#define TRIGGER_STATE_BASE_ADDRESS 1196
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1212
#define WALL_FUEL_STATE_BASE_ADDRESS 1220
#define IDLE_STATE_BASE_ADDRESS 1228
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1276
#define WIDEBAND_STATE_BASE_ADDRESS 1328
#define DC_MOTORS_BASE_ADDRESS 1340
#define SENT_STATE_BASE_ADDRESS 1352
#define THROTTLE_MODEL_BASE_ADDRESS 1360
#define VVT_BASE_ADDRESS 1372
#define LAMBDA_MONITOR_BASE_ADDRESS 1376

3
firmware/console/binary/generated/readme.md
View File

@ -1,3 +0,0 @@
At the moment gen_output_channels.sh generates the content here based on output_channels.txt
Things are a bit easier to troubleshoot without complete integration.

2
firmware/console/binary/generated/total_live_data_generated.h
View File

@ -1,2 +0,0 @@
// generated by gen_live_documentation.sh / LiveDataProcessor.java
#define TS_TOTAL_OUTPUT_SIZE 1384

2
firmware/console/binary/tunerstudio.mk
View File

@ -2,7 +2,7 @@
TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/binary/tunerstudio_io.cpp \
$(PROJECT_DIR)/console/binary/tunerstudio_io_serial.cpp \
$(PROJECT_DIR)/console/binary/tunerstudio_io_serial_ports.cpp \
$(PROJECT_DIR)/console/binary/generated/live_data.cpp \
$(GENERATED_DIR)/live_data.cpp \
$(PROJECT_DIR)/console/binary/ts_can_channel.cpp \
$(PROJECT_DIR)/console/binary/serial_can.cpp \
$(PROJECT_DIR)/console/binary/tunerstudio.cpp \

366
firmware/console/binary_log/log_fields_generated.h
View File

@ -1,366 +0,0 @@
static constexpr LogField fields[] = {
{packedTime, GAUGE_NAME_TIME, "sec", 0},
{engine->outputChannels.RPMValue, "RPM", "RPM", 0},
{engine->outputChannels.rpmAcceleration, "dRPM", "RPM acceleration", 2},
{engine->outputChannels.speedToRpmRatio, "Gearbox Ratio", "value", 2},
{engine->outputChannels.vehicleSpeedKph, "Vehicle Speed", "kph", 1},
{engine->outputChannels.internalMcuTemperature, "ECU temperature", "deg C", 0},
{engine->outputChannels.coolant, "CLT", "deg C", 1},
{engine->outputChannels.intake, "IAT", "deg C", 1},
{engine->outputChannels.auxTemp1, "auxTemp1", "deg C", 1},
{engine->outputChannels.auxTemp2, "auxTemp2", "deg C", 1},
{engine->outputChannels.TPSValue, "TPS", "%", 2},
{engine->outputChannels.throttlePedalPosition, "Throttle pedal position", "%", 2},
{engine->outputChannels.tpsADC, "tpsADC", "ADC", 0},
{engine->outputChannels.rawMaf, "rawMaf", "V", 3},
{engine->outputChannels.mafMeasured, "MAF", "kg/h", 1},
{engine->outputChannels.MAPValue, "MAP", "kPa", 1},
{engine->outputChannels.baroPressure, "baroPressure", "kPa", 1},
{engine->outputChannels.lambdaValue, "Lambda", "", 3},
{engine->outputChannels.VBatt, "VBatt", "V", 2},
{engine->outputChannels.oilPressure, "Oil Pressure", "kPa", 0},
{engine->outputChannels.vvtPositionB1I, "VVT: bank 1 intake", "deg", 1},
{engine->outputChannels.actualLastInjection, "Fuel: Last inj pulse width", "ms", 3},
{engine->outputChannels.injectorDutyCycle, "Fuel: injector duty cycle", "%", 0},
{engine->outputChannels.veValue, "Fuel: VE", "ratio", 1},
{engine->outputChannels.injectionOffset, "Fuel: Injection timing SOI", "deg", 0},
{engine->outputChannels.engineMakeCodeNameCrc16, "Engine CRC16", "crc16", 0},
{engine->outputChannels.wallFuelAmount, "Fuel: wall amount", "mg", 3},
{engine->outputChannels.wallFuelCorrectionValue, "Fuel: wall correction", "mg", 3},
{engine->outputChannels.revolutionCounterSinceStart, "revolutionCounterSinceStart", "", 0},
{engine->outputChannels.canReadCounter, "CAN: Rx", "", 0},
{engine->outputChannels.tpsAccelFuel, "Fuel: TPS AE add fuel ms", "ms", 3},
{engine->outputChannels.ignitionAdvance, "Ign: Timing Base", "deg", 1},
{engine->outputChannels.currentIgnitionMode, "Ign: Mode", "", 0},
{engine->outputChannels.currentInjectionMode, "Fuel: Injection mode", "", 0},
{engine->outputChannels.coilDutyCycle, "Ign: Coil duty cycle", "%", 0},
{engine->outputChannels.etbTarget, "ETB Target", "%", 2},
{engine->outputChannels.etb1DutyCycle, "ETB: Duty", "%", 1},
{engine->outputChannels.fuelTankLevel, "Fuel level", "%", 0},
{engine->outputChannels.totalFuelConsumption, "Fuel: Total consumed", "grams", 1},
{engine->outputChannels.fuelFlowRate, "Fuel: Flow rate", "gram/s", 3},
{engine->outputChannels.TPS2Value, "TPS2", "%", 2},
{engine->outputChannels.tuneCrc16, "Tune CRC16", "crc16", 0},
{engine->outputChannels.seconds, "Uptime", "sec", 0},
{engine->outputChannels.engineMode, "Engine Mode", "em", 0},
{engine->outputChannels.firmwareVersion, "firmware", "version_f", 0},
{engine->outputChannels.rawWastegatePosition, "rawWastegatePosition", "V", 3},
{engine->outputChannels.accelerationLat, "Accel: Lateral", "G", 0},
{engine->outputChannels.accelerationLon, "Accel: Longitudinal", "G", 0},
{engine->outputChannels.detectedGear, "Detected Gear", "", 0},
{engine->outputChannels.maxTriggerReentrant, "maxTriggerReentrant", "", 0},
{engine->outputChannels.rawLowFuelPressure, "rawLowFuelPressure", "V", 3},
{engine->outputChannels.rawHighFuelPressure, "rawHighFuelPressure", "V", 3},
{engine->outputChannels.lowFuelPressure, "Fuel pressure (low)", "kpa", 0},
{engine->outputChannels.highFuelPressure, "Fuel pressure (high)", "bar", 0},
{engine->outputChannels.rawPpsSecondary, "rawPpsSecondary", "V", 3},
{engine->outputChannels.tcuDesiredGear, "TCU: Desired Gear", "gear", 0},
{engine->outputChannels.flexPercent, "Flex Ethanol %", "%", 1},
{engine->outputChannels.wastegatePositionSensor, "Wastegate position sensor", "%", 2},
{engine->outputChannels.calibrationValue, "calibrationValue", "", 0},
{engine->outputChannels.calibrationMode, "calibrationMode", "", 0},
{engine->outputChannels.idleStepperTargetPosition, "Idle: Stepper target position", "", 0},
{engine->outputChannels.tsConfigVersion, "tsConfigVersion", "", 0},
{engine->outputChannels.totalTriggerErrorCounter, "Trigger Error Counter", "counter", 0},
{engine->outputChannels.orderingErrorCounter, "orderingErrorCounter", "", 0},
{engine->outputChannels.warningCounter, "Warning: counter", "count", 0},
{engine->outputChannels.lastErrorCode, "Warning: last", "error", 0},
{engine->outputChannels.recentErrorCode[0], "recentErrorCode 1", "error", 0},
{engine->outputChannels.recentErrorCode[1], "recentErrorCode 2", "error", 0},
{engine->outputChannels.recentErrorCode[2], "recentErrorCode 3", "error", 0},
{engine->outputChannels.recentErrorCode[3], "recentErrorCode 4", "error", 0},
{engine->outputChannels.recentErrorCode[4], "recentErrorCode 5", "error", 0},
{engine->outputChannels.recentErrorCode[5], "recentErrorCode 6", "error", 0},
{engine->outputChannels.recentErrorCode[6], "recentErrorCode 7", "error", 0},
{engine->outputChannels.recentErrorCode[7], "recentErrorCode 8", "error", 0},
{engine->outputChannels.debugFloatField1, "debugFloatField1", "val", 3},
{engine->outputChannels.debugFloatField2, "debugFloatField2", "val", 3},
{engine->outputChannels.debugFloatField3, "debugFloatField3", "val", 3},
{engine->outputChannels.debugFloatField4, "debugFloatField4", "val", 3},
{engine->outputChannels.debugFloatField5, "debugFloatField5", "val", 3},
{engine->outputChannels.debugFloatField6, "debugFloatField6", "val", 3},
{engine->outputChannels.debugFloatField7, "debugFloatField7", "val", 3},
{engine->outputChannels.debugIntField1, "debugIntField1", "val", 0},
{engine->outputChannels.debugIntField2, "debugIntField2", "val", 0},
{engine->outputChannels.debugIntField3, "debugIntField3", "val", 0},
{engine->outputChannels.debugIntField4, "debugIntField4", "val", 0},
{engine->outputChannels.debugIntField5, "debugIntField5", "val", 0},
{engine->outputChannels.egt[0], "EGT 1", "deg C", 0},
{engine->outputChannels.egt[1], "EGT 2", "deg C", 0},
{engine->outputChannels.egt[2], "EGT 3", "deg C", 0},
{engine->outputChannels.egt[3], "EGT 4", "deg C", 0},
{engine->outputChannels.egt[4], "EGT 5", "deg C", 0},
{engine->outputChannels.egt[5], "EGT 6", "deg C", 0},
{engine->outputChannels.egt[6], "EGT 7", "deg C", 0},
{engine->outputChannels.egt[7], "EGT 8", "deg C", 0},
{engine->outputChannels.rawTps1Primary, "rawTps1Primary", "V", 3},
{engine->outputChannels.rawPpsPrimary, "rawPpsPrimary", "V", 3},
{engine->outputChannels.rawClt, "rawClt", "V", 3},
{engine->outputChannels.rawIat, "rawIat", "V", 3},
{engine->outputChannels.rawOilPressure, "rawOilPressure", "V", 3},
{engine->outputChannels.fuelClosedLoopBinIdx, "fuelClosedLoopBinIdx", "", 0},
{engine->outputChannels.tcuCurrentGear, "Current Gear", "gear", 0},
{engine->outputChannels.AFRValue, "Air/Fuel Ratio", "AFR", 2},
{engine->outputChannels.VssAcceleration, "Vss Accel", "m/s2", 2},
{engine->outputChannels.lambdaValue2, "Lambda 2", "", 3},
{engine->outputChannels.AFRValue2, "Air/Fuel Ratio 2", "AFR", 2},
{engine->outputChannels.vvtPositionB1E, "VVT: bank 1 exhaust", "deg", 1},
{engine->outputChannels.vvtPositionB2I, "VVT: bank 2 intake", "deg", 1},
{engine->outputChannels.vvtPositionB2E, "VVT: bank 2 exhaust", "deg", 1},
{engine->outputChannels.fuelPidCorrection[0], "Fuel: Trim bank 1", "%", 2},
{engine->outputChannels.fuelPidCorrection[1], "Fuel: Trim bank 2", "%", 2},
{engine->outputChannels.rawTps1Secondary, "rawTps1Secondary", "V", 3},
{engine->outputChannels.rawTps2Primary, "rawTps2Primary", "V", 3},
{engine->outputChannels.rawTps2Secondary, "rawTps2Secondary", "V", 3},
{engine->outputChannels.accelerationVert, "Accel: Vertical", "G", 0},
{engine->outputChannels.gyroYaw, "Gyro: Yaw rate", "deg/sec", 0},
{engine->outputChannels.vvtTargets[0], "vvtTargets 1", "deg", 0},
{engine->outputChannels.vvtTargets[1], "vvtTargets 2", "deg", 0},
{engine->outputChannels.vvtTargets[2], "vvtTargets 3", "deg", 0},
{engine->outputChannels.vvtTargets[3], "vvtTargets 4", "deg", 0},
{engine->outputChannels.turboSpeed, "Turbocharger Speed", "hz", 0},
{engine->outputChannels.ignitionAdvanceCyl[0], "Ign: Timing Cyl 1", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[1], "Ign: Timing Cyl 2", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[2], "Ign: Timing Cyl 3", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[3], "Ign: Timing Cyl 4", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[4], "Ign: Timing Cyl 5", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[5], "Ign: Timing Cyl 6", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[6], "Ign: Timing Cyl 7", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[7], "Ign: Timing Cyl 8", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[8], "Ign: Timing Cyl 9", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[9], "Ign: Timing Cyl 10", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[10], "Ign: Timing Cyl 11", "deg", 1},
{engine->outputChannels.ignitionAdvanceCyl[11], "Ign: Timing Cyl 12", "deg", 1},
{engine->outputChannels.tps1Split, "tps1Split", "%", 2},
{engine->outputChannels.tps2Split, "tps2Split", "%", 2},
{engine->outputChannels.tps12Split, "tps12Split", "%", 2},
{engine->outputChannels.accPedalSplit, "accPedalSplit", "%", 2},
{engine->outputChannels.sparkCutReason, "Ign: Cut Code", "code", 0},
{engine->outputChannels.fuelCutReason, "Fuel: Cut Code", "code", 0},
{engine->outputChannels.mafEstimate, "Air: Flow estimate", "kg/h", 0},
{engine->outputChannels.instantRpm, "instantRpm", "rpm", 0},
{engine->outputChannels.rawMap, "rawMap", "V", 3},
{engine->outputChannels.rawAfr, "rawAfr", "V", 3},
{engine->outputChannels.calibrationValue2, "calibrationValue2", "", 0},
{engine->outputChannels.luaInvocationCounter, "Lua: Tick counter", "count", 0},
{engine->outputChannels.luaLastCycleDuration, "Lua: Last tick duration", "nt", 0},
{engine->outputChannels.tcu_currentRange, "TCU: Current Range", "", 0},
{engine->outputChannels.tcRatio, "TCU: Torque Converter Ratio", "value", 0},
{engine->outputChannels.lastShiftTime, "lastShiftTime", "", 0},
{engine->outputChannels.vssEdgeCounter, "vssEdgeCounter", "", 0},
{engine->outputChannels.issEdgeCounter, "issEdgeCounter", "", 0},
{engine->outputChannels.auxLinear1, "Aux linear #1", "", 2},
{engine->outputChannels.auxLinear2, "Aux linear #2", "", 2},
{engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1},
{engine->outputChannels.instantMAPValue, "Instant MAP", "kPa", 2},
{engine->outputChannels.maxLockedDuration, "maxLockedDuration", "us", 0},
{engine->outputChannels.canWriteOk, "CAN: Tx OK", "", 3},
{engine->outputChannels.canWriteNotOk, "CAN: Tx err", "", 3},
{engine->outputChannels.triggerPrimaryFall, "triggerPrimaryFall", "", 3},
{engine->outputChannels.triggerPrimaryRise, "triggerPrimaryRise", "", 3},
{engine->outputChannels.triggerSecondaryFall, "triggerSecondaryFall", "", 3},
{engine->outputChannels.triggerSecondaryRise, "triggerSecondaryRise", "", 3},
{engine->outputChannels.triggerVvtFall, "triggerVvtFall", "", 3},
{engine->outputChannels.triggerVvtRise, "triggerVvtRise", "", 3},
{engine->outputChannels.starterState, "starterState", "", 3},
{engine->outputChannels.starterRelayDisable, "starterRelayDisable", "", 3},
{engine->outputChannels.multiSparkCounter, "Ign: Multispark count", "", 3},
{engine->outputChannels.extiOverflowCount, "extiOverflowCount", "", 0},
{engine->outputChannels.alternatorStatus.pTerm, "alternatorStatus.pTerm", "", 2},
{engine->outputChannels.alternatorStatus.iTerm, "alternatorStatus.iTerm", "", 2},
{engine->outputChannels.alternatorStatus.dTerm, "alternatorStatus.dTerm", "", 2},
{engine->outputChannels.alternatorStatus.output, "alternatorStatus.output", "", 2},
{engine->outputChannels.alternatorStatus.error, "alternatorStatus.error", "", 2},
{engine->outputChannels.alternatorStatus.resetCounter, "alternatorStatus.resetCounter", "", 0},
{engine->outputChannels.idleStatus.pTerm, "idleStatus.pTerm", "", 2},
{engine->outputChannels.idleStatus.iTerm, "idleStatus.iTerm", "", 2},
{engine->outputChannels.idleStatus.dTerm, "idleStatus.dTerm", "", 2},
{engine->outputChannels.idleStatus.output, "idleStatus.output", "", 2},
{engine->outputChannels.idleStatus.error, "idleStatus.error", "", 2},
{engine->outputChannels.idleStatus.resetCounter, "idleStatus.resetCounter", "", 0},
{engine->outputChannels.etbStatus.pTerm, "etbStatus.pTerm", "", 2},
{engine->outputChannels.etbStatus.iTerm, "etbStatus.iTerm", "", 2},
{engine->outputChannels.etbStatus.dTerm, "etbStatus.dTerm", "", 2},
{engine->outputChannels.etbStatus.output, "etbStatus.output", "", 2},
{engine->outputChannels.etbStatus.error, "etbStatus.error", "", 2},
{engine->outputChannels.etbStatus.resetCounter, "etbStatus.resetCounter", "", 0},
{engine->outputChannels.boostStatus.pTerm, "boostStatus.pTerm", "", 2},
{engine->outputChannels.boostStatus.iTerm, "boostStatus.iTerm", "", 2},
{engine->outputChannels.boostStatus.dTerm, "boostStatus.dTerm", "", 2},
{engine->outputChannels.boostStatus.output, "boostStatus.output", "", 2},
{engine->outputChannels.boostStatus.error, "boostStatus.error", "", 2},
{engine->outputChannels.boostStatus.resetCounter, "boostStatus.resetCounter", "", 0},
{engine->outputChannels.wastegateDcStatus.pTerm, "wastegateDcStatus.pTerm", "", 2},
{engine->outputChannels.wastegateDcStatus.iTerm, "wastegateDcStatus.iTerm", "", 2},
{engine->outputChannels.wastegateDcStatus.dTerm, "wastegateDcStatus.dTerm", "", 2},
{engine->outputChannels.wastegateDcStatus.output, "wastegateDcStatus.output", "", 2},
{engine->outputChannels.wastegateDcStatus.error, "wastegateDcStatus.error", "", 2},
{engine->outputChannels.wastegateDcStatus.resetCounter, "wastegateDcStatus.resetCounter", "", 0},
{engine->outputChannels.auxSpeed1, "Aux speed 1", "s", 0},
{engine->outputChannels.auxSpeed2, "Aux speed 2", "s", 0},
{engine->outputChannels.ISSValue, "TCU: Input Shaft Speed", "RPM", 0},
{engine->outputChannels.rawAnalogInput[0], "rawAnalogInput 1", "V", 3},
{engine->outputChannels.rawAnalogInput[1], "rawAnalogInput 2", "V", 3},
{engine->outputChannels.rawAnalogInput[2], "rawAnalogInput 3", "V", 3},
{engine->outputChannels.rawAnalogInput[3], "rawAnalogInput 4", "V", 3},
{engine->outputChannels.rawAnalogInput[4], "rawAnalogInput 5", "V", 3},
{engine->outputChannels.rawAnalogInput[5], "rawAnalogInput 6", "V", 3},
{engine->outputChannels.rawAnalogInput[6], "rawAnalogInput 7", "V", 3},
{engine->outputChannels.rawAnalogInput[7], "rawAnalogInput 8", "V", 3},
{engine->outputChannels.gppwmOutput[0], "GPPWM Output 1", "%", 2},
{engine->outputChannels.gppwmOutput[1], "GPPWM Output 2", "%", 2},
{engine->outputChannels.gppwmOutput[2], "GPPWM Output 3", "%", 2},
{engine->outputChannels.gppwmOutput[3], "GPPWM Output 4", "%", 2},
{engine->outputChannels.gppwmXAxis[0], "gppwmXAxis 1", "", 0},
{engine->outputChannels.gppwmXAxis[1], "gppwmXAxis 2", "", 0},
{engine->outputChannels.gppwmXAxis[2], "gppwmXAxis 3", "", 0},
{engine->outputChannels.gppwmXAxis[3], "gppwmXAxis 4", "", 0},
{engine->outputChannels.gppwmYAxis[0], "gppwmYAxis 1", "", 1},
{engine->outputChannels.gppwmYAxis[1], "gppwmYAxis 2", "", 1},
{engine->outputChannels.gppwmYAxis[2], "gppwmYAxis 3", "", 1},
{engine->outputChannels.gppwmYAxis[3], "gppwmYAxis 4", "", 1},
{engine->outputChannels.rawBattery, "rawBattery", "V", 3},
{engine->outputChannels.ignBlendParameter[0], "ignBlendParameter 1", "", 1},
{engine->outputChannels.ignBlendParameter[1], "ignBlendParameter 2", "", 1},
{engine->outputChannels.ignBlendParameter[2], "ignBlendParameter 3", "", 1},
{engine->outputChannels.ignBlendParameter[3], "ignBlendParameter 4", "", 1},
{engine->outputChannels.ignBlendBias[0], "ignBlendBias 1", "%", 1},
{engine->outputChannels.ignBlendBias[1], "ignBlendBias 2", "%", 1},
{engine->outputChannels.ignBlendBias[2], "ignBlendBias 3", "%", 1},
{engine->outputChannels.ignBlendBias[3], "ignBlendBias 4", "%", 1},
{engine->outputChannels.ignBlendOutput[0], "ignBlendOutput 1", "deg", 2},
{engine->outputChannels.ignBlendOutput[1], "ignBlendOutput 2", "deg", 2},
{engine->outputChannels.ignBlendOutput[2], "ignBlendOutput 3", "deg", 2},
{engine->outputChannels.ignBlendOutput[3], "ignBlendOutput 4", "deg", 2},
{engine->outputChannels.veBlendParameter[0], "veBlendParameter 1", "", 1},
{engine->outputChannels.veBlendParameter[1], "veBlendParameter 2", "", 1},
{engine->outputChannels.veBlendParameter[2], "veBlendParameter 3", "", 1},
{engine->outputChannels.veBlendParameter[3], "veBlendParameter 4", "", 1},
{engine->outputChannels.veBlendBias[0], "veBlendBias 1", "%", 1},
{engine->outputChannels.veBlendBias[1], "veBlendBias 2", "%", 1},
{engine->outputChannels.veBlendBias[2], "veBlendBias 3", "%", 1},
{engine->outputChannels.veBlendBias[3], "veBlendBias 4", "%", 1},
{engine->outputChannels.veBlendOutput[0], "veBlendOutput 1", "%", 2},
{engine->outputChannels.veBlendOutput[1], "veBlendOutput 2", "%", 2},
{engine->outputChannels.veBlendOutput[2], "veBlendOutput 3", "%", 2},
{engine->outputChannels.veBlendOutput[3], "veBlendOutput 4", "%", 2},
{engine->outputChannels.boostOpenLoopBlendParameter[0], "boostOpenLoopBlendParameter 1", "", 1},
{engine->outputChannels.boostOpenLoopBlendParameter[1], "boostOpenLoopBlendParameter 2", "", 1},
{engine->outputChannels.boostOpenLoopBlendBias[0], "boostOpenLoopBlendBias 1", "%", 1},
{engine->outputChannels.boostOpenLoopBlendBias[1], "boostOpenLoopBlendBias 2", "%", 1},
{engine->outputChannels.boostOpenLoopBlendOutput[0], "boostOpenLoopBlendOutput 1", "%", 0},
{engine->outputChannels.boostOpenLoopBlendOutput[1], "boostOpenLoopBlendOutput 2", "%", 0},
{engine->outputChannels.boostClosedLoopBlendParameter[0], "boostClosedLoopBlendParameter 1", "", 1},
{engine->outputChannels.boostClosedLoopBlendParameter[1], "boostClosedLoopBlendParameter 2", "", 1},
{engine->outputChannels.boostClosedLoopBlendBias[0], "boostClosedLoopBlendBias 1", "%", 1},
{engine->outputChannels.boostClosedLoopBlendBias[1], "boostClosedLoopBlendBias 2", "%", 1},
{engine->outputChannels.boostClosedLoopBlendOutput[0], "boostClosedLoopBlendOutput 1", "%", 1},
{engine->outputChannels.boostClosedLoopBlendOutput[1], "boostClosedLoopBlendOutput 2", "%", 1},
{engine->outputChannels.outputRequestPeriod, "outputRequestPeriod", "", 0},
{engine->outputChannels.mapFast, "mapFast", "", 0},
{engine->outputChannels.luaGauges[0], "Lua: Gauge 1", "value", 3},
{engine->outputChannels.luaGauges[1], "Lua: Gauge 2", "value", 3},
{engine->outputChannels.rawMaf2, "rawMaf2", "V", 3},
{engine->outputChannels.mafMeasured2, "MAF #2", "kg/h", 1},
{engine->outputChannels.schedulingUsedCount, "schedulingUsedCount", "", 0},
{engine->outputChannels.Gego, "Gego", "%", 2},
{engine->outputChannels.testBenchIter, "testBenchIter", "count", 0},
{engine->outputChannels.oilTemp, "oilTemp", "deg C", 1},
{engine->outputChannels.fuelTemp, "fuelTemp", "deg C", 1},
{engine->outputChannels.ambientTemp, "ambientTemp", "deg C", 1},
{engine->outputChannels.compressorDischargeTemp, "compressorDischargeTemp", "deg C", 1},
{engine->outputChannels.compressorDischargePressure, "compressorDischargePressure", "kPa", 1},
{engine->outputChannels.throttleInletPressure, "throttleInletPressure", "kPa", 1},
{engine->outputChannels.ignitionOnTime, "ignitionOnTime", "sec", 1},
{engine->outputChannels.engineRunTime, "engineRunTime", "sec", 1},
{engine->outputChannels.distanceTraveled, "distanceTraveled", "km", 1},
{engine->outputChannels.afrGasolineScale, "Air/Fuel Ratio (Gas Scale)", "AFR", 2},
{engine->outputChannels.afr2GasolineScale, "Air/Fuel Ratio 2 (Gas Scale)", "AFR", 2},
{engine->outputChannels.actualLastInjectionStage2, "Fuel: Last inj pulse width stg 2", "ms", 3},
{engine->outputChannels.injectorDutyCycleStage2, "Fuel: injector duty cycle stage 2", "%", 0},
{engine->fuelComputer.totalFuelCorrection, "Fuel: Total correction", "mult", 2},
{engine->fuelComputer.running.postCrankingFuelCorrection, "Fuel: Post cranking mult", "", 0},
{engine->fuelComputer.running.intakeTemperatureCoefficient, "Fuel: IAT correction", "", 0},
{engine->fuelComputer.running.coolantTemperatureCoefficient, "Fuel: CLT correction", "", 0},
{engine->fuelComputer.running.timeSinceCrankingInSecs, "running.timeSinceCrankingInSecs", "secs", 0},
{engine->fuelComputer.running.baseFuel, "Fuel: base cycle mass", "mg", 3},
{engine->fuelComputer.running.fuel, "Fuel: running", "mg", 3},
{engine->fuelComputer.afrTableYAxis, "afrTableYAxis", "%", 0},
{engine->fuelComputer.targetLambda, "Fuel: target lambda", "", 2},
{engine->fuelComputer.targetAFR, "Fuel: target AFR", "ratio", 2},
{engine->fuelComputer.stoichiometricRatio, "Fuel: Stoich ratio", "ratio", 2},
{engine->fuelComputer.sdTcharge_coff, "sdTcharge_coff", "", 0},
{engine->fuelComputer.sdAirMassInOneCylinder, "Air: Cylinder airmass", "g", 3},
{engine->fuelComputer.normalizedCylinderFilling, "Air: Normalized cyl filling", "%", 1},
{engine->ignitionState.baseDwell, "baseDwell", "ms", 1},
{engine->ignitionState.sparkDwell, "Ign: Dwell", "ms", 1},
{engine->ignitionState.dwellAngle, "ignition dwell duration", "deg", 1},
{engine->ignitionState.cltTimingCorrection, "Ign: CLT correction", "deg", 2},
{engine->ignitionState.timingIatCorrection, "Ign: IAT correction", "deg", 2},
{engine->ignitionState.timingPidCorrection, "Idle: Timing adjustment", "deg", 2},
{engine->ignitionState.dwellVoltageCorrection, "Ign: Dwell voltage correction", "", 0},
{engine->ignitionState.luaTimingAdd, "Ign: Lua timing add", "deg", 2},
{engine->ignitionState.luaTimingMult, "Ign: Lua timing mult", "deg", 2},
{___engine.module<KnockController>()->m_knockLevel, "Knock: Current level", "Volts", 2},
{___engine.module<KnockController>()->m_knockCyl[0], "Knock: Cyl 1", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[1], "Knock: Cyl 2", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[2], "Knock: Cyl 3", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[3], "Knock: Cyl 4", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[4], "Knock: Cyl 5", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[5], "Knock: Cyl 6", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[6], "Knock: Cyl 7", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[7], "Knock: Cyl 8", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[8], "Knock: Cyl 9", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[9], "Knock: Cyl 10", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[10], "Knock: Cyl 11", "dBv", 0},
{___engine.module<KnockController>()->m_knockCyl[11], "Knock: Cyl 12", "dBv", 0},
{___engine.module<KnockController>()->m_knockRetard, "Knock: Retard", "deg", 1},
{___engine.module<KnockController>()->m_knockThreshold, "Knock: Threshold", "", 0},
{___engine.module<KnockController>()->m_knockCount, "Knock: Count", "", 0},
{___engine.module<KnockController>()->m_maximumRetard, "Knock: Max retard", "", 0},
{___engine.module<BoostController>()->luaTargetAdd, "Boost: Lua target add", "v", 1},
{___engine.module<BoostController>()->boostOutput, "Boost: Output", "percent", 2},
{___engine.module<BoostController>()->luaTargetMult, "Boost: Lua target mult", "v", 1},
{___engine.module<BoostController>()->openLoopPart, "Boost: Open loop", "v", 1},
{___engine.module<BoostController>()->luaOpenLoopAdd, "Boost: Lua open loop add", "v", 1},
{___engine.module<BoostController>()->boostControllerClosedLoopPart, "Boost: Closed loop", "%", 1},
{___engine.module<BoostController>()->boostControlTarget, "Boost: Target", "kPa", 1},
{engine->engineState.lua.fuelAdd, "Lua: Fuel add", "g", 3},
{engine->engineState.lua.fuelMult, "Lua: Fuel mult", "", 0},
{engine->engineState.sd.tCharge, "Air: Charge temperature estimate", "deg C", 1},
{engine->engineState.sd.tChargeK, "Air: Charge temperature estimate K", "", 0},
{engine->engineState.crankingFuel.coolantTemperatureCoefficient, "Fuel: cranking CLT mult", "", 0},
{engine->engineState.crankingFuel.tpsCoefficient, "Fuel: cranking TPS mult", "", 0},
{engine->engineState.crankingFuel.durationCoefficient, "Fuel: cranking duration mult", "", 0},
{engine->engineState.crankingFuel.fuel, "Fuel: Cranking cycle mass", "mg", 2},
{engine->engineState.baroCorrection, "Fuel: Barometric pressure mult", "", 0},
{engine->engineState.hellenBoardId, "Detected Board ID", "id", 0},
{engine->engineState.startStopStateToggleCounter, "startStopStateToggleCounter", "", 0},
{engine->engineState.egtValue1, "egtValue1", "", 0},
{engine->engineState.egtValue2, "egtValue2", "", 0},
{engine->engineState.desiredRpmLimit, "User-defined RPM hard limit", "rpm", 0},
{engine->engineState.fuelInjectionCounter, "Fuel: Injection counter", "", 0},
{engine->engineState.sparkCounter, "Ign: Spark counter", "", 0},
{engine->engineState.fuelingLoad, "Fuel: Load", "", 0},
{engine->engineState.ignitionLoad, "Ign: Load", "", 0},
{engine->engineState.veTableYAxis, "veTableYAxis", "%", 0},
{engine->triggerCentral.hwEventCounters[0], "Hardware events since boot 1", "", 0},
{engine->triggerCentral.hwEventCounters[1], "Hardware events since boot 2", "", 0},
{engine->triggerCentral.hwEventCounters[2], "Hardware events since boot 3", "", 0},
{engine->triggerCentral.hwEventCounters[3], "Hardware events since boot 4", "", 0},
{engine->triggerCentral.hwEventCounters[4], "Hardware events since boot 5", "", 0},
{engine->triggerCentral.hwEventCounters[5], "Hardware events since boot 6", "", 0},
{engine->triggerCentral.vvtCamCounter, "vvtCamCounter", "", 0},
{engine->triggerCentral.mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", "", 3},
{engine->triggerCentral.mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", "", 3},
{engine->triggerCentral.mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", "", 3},
{engine->triggerCentral.mapVvt_map_peak, "mapVvt_map_peak", "", 3},
{engine->triggerCentral.currentEngineDecodedPhase, "Engine Phase", "deg", 0},
{engine->triggerCentral.triggerToothAngleError, "triggerToothAngleError", "deg", 2},
{engine->triggerCentral.triggerIgnoredToothCount, "triggerIgnoredToothCount", "", 0},
{engine->dc_motors.dcOutput0, "DC: output0", "per", 2},
{engine->dc_motors.isEnabled0_int, "DC: en0", "per", 2},
{___engine.module<VvtController1>()->vvtTarget, "vvtTarget", "deg", 1},
{___engine.module<VvtController1>()->vvtOutput, "vvtOutput", "%", 1},
{___engine.lambdaMonitor.lambdaTimeSinceGood, "lambdaTimeSinceGood", "sec", 2},
};

1
firmware/controllers/controllers.mk
View File

@ -81,7 +81,6 @@ CONTROLLERS_INC=\
$(CONTROLLERS_DIR)/core \
$(CONTROLLERS_DIR)/gauges \
$(CONTROLLERS_DIR)/math \
$(CONTROLLERS_DIR)/generated \
$(CONTROLLERS_DIR)/actuators \
$(CONTROLLERS_DIR)/actuators/gppwm \
$(CONTROLLERS_DIR)/serial \

2905
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

File diff suppressed because it is too large Load Diff

7
firmware/controllers/generated/readme.md
View File

@ -1,7 +0,0 @@
# Generated Code
All the code here was generated by tools.
See gen_config.bat
See gen_config2.bat
See java_console\models\src\com\rusefi\config\generated

1357
firmware/controllers/generated/rusefi_generated.h
View File

File diff suppressed because it is too large Load Diff

2
firmware/controllers/generated/signature_48way.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 3033175398
#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.25.48way.3033175398"

2
firmware/controllers/generated/signature_alphax-2chan.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2395479334
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.alphax-2chan.2395479334"

2
firmware/controllers/generated/signature_alphax-4chan.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 67116871
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.alphax-4chan.67116871"

2
firmware/controllers/generated/signature_alphax-8chan.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2092636606
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.alphax-8chan.2092636606"

2
firmware/controllers/generated/signature_atlas.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 3076386758
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.atlas.3076386758"

2
firmware/controllers/generated/signature_core48.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 385782074
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.core48.385782074"

2
firmware/controllers/generated/signature_core8.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2477791063
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.core8.2477791063"

2
firmware/controllers/generated/signature_f407-discovery.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 4155893268
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.f407-discovery.4155893268"

2
firmware/controllers/generated/signature_f429-discovery.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2878806753
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.f429-discovery.2878806753"

2
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2311453227
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.frankenso_na6.2311453227"

6
firmware/controllers/generated/signature_haba208.h
View File

@ -1,6 +0,0 @@
//
// was NOT generated automatically
//
#define SIGNATURE_HASH 1047060009
#define TS_SIGNATURE "rusEFI 2022.10.14.f407-discovery.1047060009"

2
firmware/controllers/generated/signature_harley81.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 570565275
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.harley81.570565275"

2
firmware/controllers/generated/signature_hellen-gm-e67.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 3271439410
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen-gm-e67.3271439410"

2
firmware/controllers/generated/signature_hellen-honda-k.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1500510835
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen-honda-k.1500510835"

2
firmware/controllers/generated/signature_hellen-nb1.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1555041117
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen-nb1.1555041117"

2
firmware/controllers/generated/signature_hellen121nissan.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 745252631
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen121nissan.745252631"

2
firmware/controllers/generated/signature_hellen121vag.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2154342596
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen121vag.2154342596"

2
firmware/controllers/generated/signature_hellen128.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 721779526
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen128.721779526"

2
firmware/controllers/generated/signature_hellen154hyundai.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 3220331431
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen154hyundai.3220331431"

2
firmware/controllers/generated/signature_hellen72.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1512276822
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen72.1512276822"

2
firmware/controllers/generated/signature_hellen81.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 4138334676
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen81.4138334676"

2
firmware/controllers/generated/signature_hellen88bmw.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 4036095719
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellen88bmw.4036095719"

2
firmware/controllers/generated/signature_hellenNA6.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 3089587046
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellenNA6.3089587046"

2
firmware/controllers/generated/signature_hellenNA8_96.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 75705558
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.hellenNA8_96.75705558"

2
firmware/controllers/generated/signature_mre_f4.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1276739417
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.mre_f4.1276739417"

2
firmware/controllers/generated/signature_mre_f7.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1276739417
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.mre_f7.1276739417"

2
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2600720241
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.prometheus_405.2600720241"

2
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 2600720241
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.prometheus_469.2600720241"

2
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 984209674
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.proteus_f4.984209674"

2
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 984209674
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.proteus_f7.984209674"

2
firmware/controllers/generated/signature_proteus_h7.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 984209674
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.proteus_h7.984209674"

2
firmware/controllers/generated/signature_small-can-board.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 1140526463
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.small-can-board.1140526463"

2
firmware/controllers/generated/signature_subaru_eg33_f7.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 784075886
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.subaru_eg33_f7.784075886"

2
firmware/controllers/generated/signature_tdg-pdm8.h
View File

@ -1,2 +0,0 @@
#define SIGNATURE_HASH 557397699
#define TS_SIGNATURE "rusEFI (FOME) master.2024.01.17.tdg-pdm8.557397699"

726
firmware/controllers/lua/generated/output_lookup_generated.cpp
View File

@ -1,726 +0,0 @@
#if !EFI_UNIT_TEST
#include "pch.h"
#include "value_lookup.h"
float getOutputValueByName(const char *name) {
int hash = djb2lowerCase(name);
switch(hash) {
case -230533156:
return engine->outputChannels.sd_present;
case 708639006:
return engine->outputChannels.sd_logging_internal;
case -770506808:
return engine->outputChannels.triggerScopeReady;
case 1155330306:
return engine->outputChannels.antilagTriggered;
case -1441751117:
return engine->outputChannels.isFanOn;
case 438683128:
return engine->outputChannels.isO2HeaterOn;
case -1790051911:
return engine->outputChannels.checkEngine;
case 1368986296:
return engine->outputChannels.needBurn;
case 459787871:
return engine->outputChannels.sd_msd;
case -333212891:
return engine->outputChannels.isFan2On;
case -1548941801:
return engine->outputChannels.acrActive;
case -1662199734:
return engine->outputChannels.toothLogReady;
case 14587330:
return engine->outputChannels.isTpsError;
case 518760558:
return engine->outputChannels.isCltError;
case 23640681:
return engine->outputChannels.isMapError;
case 1505102185:
return engine->outputChannels.isIatError;
case -1746157889:
return engine->outputChannels.isTriggerError;
case -2015383594:
return engine->outputChannels.hasCriticalError;
case -1919072851:
return engine->outputChannels.isWarnNow;
case -2035612655:
return engine->outputChannels.isPedalError;
case -52473827:
return engine->outputChannels.launchTriggered;
case -1529936844:
return engine->outputChannels.isTps2Error;
case 1608791711:
return engine->outputChannels.injectorFault;
case -1158382750:
return engine->outputChannels.ignitionFault;
case -822552576:
return engine->outputChannels.isMainRelayOn;
case 1836976702:
return engine->outputChannels.isUsbConnected;
case -622949795:
return engine->outputChannels.dfcoActive;
case 1699696209:
return engine->outputChannels.RPMValue;
case -968092482:
return engine->outputChannels.rpmAcceleration;
case -685727673:
return engine->outputChannels.speedToRpmRatio;
case -1925174695:
return engine->outputChannels.vehicleSpeedKph;
case -871891659:
return engine->outputChannels.internalMcuTemperature;
case -746111499:
return engine->outputChannels.coolant;
case 81034497:
return engine->outputChannels.intake;
case 1331305978:
return engine->outputChannels.auxTemp1;
case 1331305979:
return engine->outputChannels.auxTemp2;
case 1272048601:
return engine->outputChannels.TPSValue;
case -84435626:
return engine->outputChannels.throttlePedalPosition;
case 513859492:
return engine->outputChannels.tpsADC;
case 417956611:
return engine->outputChannels.rawMaf;
case -2032003569:
return engine->outputChannels.mafMeasured;
case 1281101952:
return engine->outputChannels.MAPValue;
case -2066867294:
return engine->outputChannels.baroPressure;
case -1119268893:
return engine->outputChannels.lambdaValue;
case 277722310:
return engine->outputChannels.VBatt;
case 598268994:
return engine->outputChannels.oilPressure;
case 1384666006:
return engine->outputChannels.vvtPositionB1I;
case 681043126:
return engine->outputChannels.actualLastInjection;
case -354325031:
return engine->outputChannels.injectorDutyCycle;
case 1933507837:
return engine->outputChannels.veValue;
case -243031057:
return engine->outputChannels.injectionOffset;
case 1726931380:
return engine->outputChannels.engineMakeCodeNameCrc16;
case 115540725:
return engine->outputChannels.wallFuelAmount;
case -1511514122:
return engine->outputChannels.wallFuelCorrectionValue;
case -1555114948:
return engine->outputChannels.revolutionCounterSinceStart;
case 1247316691:
return engine->outputChannels.canReadCounter;
case -384925312:
return engine->outputChannels.tpsAccelFuel;
case -802608648:
return engine->outputChannels.ignitionAdvance;
case -3603666:
return engine->outputChannels.currentIgnitionMode;
case -921867120:
return engine->outputChannels.currentInjectionMode;
case 1029096098:
return engine->outputChannels.coilDutyCycle;
case -2105094009:
return engine->outputChannels.etbTarget;
case 1021133095:
return engine->outputChannels.etb1DutyCycle;
case 543832183:
return engine->outputChannels.fuelTankLevel;
case 1417905588:
return engine->outputChannels.totalFuelConsumption;
case 822501973:
return engine->outputChannels.fuelFlowRate;
case 686191307:
return engine->outputChannels.TPS2Value;
case -1158359776:
return engine->outputChannels.tuneCrc16;
case -1962923820:
return engine->outputChannels.seconds;
case -2073424832:
return engine->outputChannels.engineMode;
case 799075048:
return engine->outputChannels.firmwareVersion;
case 2039421097:
return engine->outputChannels.rawWastegatePosition;
case -2133047664:
return engine->outputChannels.accelerationLat;
case -2133047208:
return engine->outputChannels.accelerationLon;
case 283558758:
return engine->outputChannels.detectedGear;
case -1595441102:
return engine->outputChannels.maxTriggerReentrant;
case -148455898:
return engine->outputChannels.rawLowFuelPressure;
case 990714516:
return engine->outputChannels.rawHighFuelPressure;
case -628741220:
return engine->outputChannels.lowFuelPressure;
case -1973799222:
return engine->outputChannels.highFuelPressure;
case -1798336054:
return engine->outputChannels.rawPpsSecondary;
case 471298448:
return engine->outputChannels.tcuDesiredGear;
case 404628421:
return engine->outputChannels.flexPercent;
case 53406649:
return engine->outputChannels.wastegatePositionSensor;
case -1560670902:
return engine->outputChannels.calibrationValue;
case 1774505810:
return engine->outputChannels.calibrationMode;
case 356548450:
return engine->outputChannels.idleStepperTargetPosition;
case 1299611400:
return engine->outputChannels.tsConfigVersion;
case 2018173863:
return engine->outputChannels.totalTriggerErrorCounter;
case -1326404407:
return engine->outputChannels.orderingErrorCounter;
case 1492724763:
return engine->outputChannels.warningCounter;
case -1346040258:
return engine->outputChannels.lastErrorCode;
case 1240443767:
return engine->outputChannels.debugFloatField1;
case 1240443768:
return engine->outputChannels.debugFloatField2;
case 1240443769:
return engine->outputChannels.debugFloatField3;
case 1240443770:
return engine->outputChannels.debugFloatField4;
case 1240443771:
return engine->outputChannels.debugFloatField5;
case 1240443772:
return engine->outputChannels.debugFloatField6;
case 1240443773:
return engine->outputChannels.debugFloatField7;
case -183564276:
return engine->outputChannels.debugIntField1;
case -183564275:
return engine->outputChannels.debugIntField2;
case -183564274:
return engine->outputChannels.debugIntField3;
case -183564273:
return engine->outputChannels.debugIntField4;
case -183564272:
return engine->outputChannels.debugIntField5;
case -1051397637:
return engine->outputChannels.rawTps1Primary;
case -347083354:
return engine->outputChannels.rawPpsPrimary;
case 417946098:
return engine->outputChannels.rawClt;
case 417952269:
return engine->outputChannels.rawIat;
case 2070002124:
return engine->outputChannels.rawOilPressure;
case 1342844099:
return engine->outputChannels.fuelClosedLoopBinIdx;
case -559761101:
return engine->outputChannels.tcuCurrentGear;
case -1093429509:
return engine->outputChannels.AFRValue;
case -513494613:
return engine->outputChannels.VssAcceleration;
case 1718832245:
return engine->outputChannels.lambdaValue2;
case -1723435379:
return engine->outputChannels.AFRValue2;
case 1384666002:
return engine->outputChannels.vvtPositionB1E;
case 1384666039:
return engine->outputChannels.vvtPositionB2I;
case 1384666035:
return engine->outputChannels.vvtPositionB2E;
case 2555743:
return engine->outputChannels.rawTps1Secondary;
case -1382627620:
return engine->outputChannels.rawTps2Primary;
case 70357120:
return engine->outputChannels.rawTps2Secondary;
case -1670732400:
return engine->outputChannels.accelerationVert;
case 519838295:
return engine->outputChannels.gyroYaw;
case -4187390:
return engine->outputChannels.turboSpeed;
case 644036825:
return engine->outputChannels.tps1Split;
case 683172218:
return engine->outputChannels.tps2Split;
case 1533250027:
return engine->outputChannels.tps12Split;
case 864210494:
return engine->outputChannels.accPedalSplit;
case -56739846:
return engine->outputChannels.sparkCutReason;
case -1225000603:
return engine->outputChannels.fuelCutReason;
case -2045040875:
return engine->outputChannels.mafEstimate;
case -658597643:
return engine->outputChannels.instantRpm;
case 417956621:
return engine->outputChannels.rawMap;
case 417943720:
return engine->outputChannels.rawAfr;
case 37467836:
return engine->outputChannels.calibrationValue2;
case 1766132801:
return engine->outputChannels.luaInvocationCounter;
case 823476017:
return engine->outputChannels.luaLastCycleDuration;
case -518694176:
return engine->outputChannels.tcu_currentRange;
case -732434245:
return engine->outputChannels.tcRatio;
case 174310950:
return engine->outputChannels.lastShiftTime;
case 385418550:
return engine->outputChannels.vssEdgeCounter;
case 347478025:
return engine->outputChannels.issEdgeCounter;
case 803810399:
return engine->outputChannels.auxLinear1;
case 803810400:
return engine->outputChannels.auxLinear2;
case -940825965:
return engine->outputChannels.fallbackMap;
case -1162308767:
return engine->outputChannels.instantMAPValue;
case -558968637:
return engine->outputChannels.maxLockedDuration;
case 1193280444:
return engine->outputChannels.canWriteOk;
case 1964920685:
return engine->outputChannels.canWriteNotOk;
case 248437820:
return engine->outputChannels.triggerPrimaryFall;
case 248878000:
return engine->outputChannels.triggerPrimaryRise;
case 1016089632:
return engine->outputChannels.triggerSecondaryFall;
case 1016529812:
return engine->outputChannels.triggerSecondaryRise;
case 1537196344:
return engine->outputChannels.triggerVvtFall;
case 1537636524:
return engine->outputChannels.triggerVvtRise;
case -1438648277:
return engine->outputChannels.starterState;
case 1286045659:
return engine->outputChannels.starterRelayDisable;
case 680091441:
return engine->outputChannels.multiSparkCounter;
case 1630166812:
return engine->outputChannels.extiOverflowCount;
case -1097329029:
return engine->outputChannels.alternatorStatus.pTerm;
case -1105630476:
return engine->outputChannels.alternatorStatus.iTerm;
case -1111560081:
return engine->outputChannels.alternatorStatus.dTerm;
case -1889531804:
return engine->outputChannels.alternatorStatus.output;
case -1110431971:
return engine->outputChannels.alternatorStatus.error;
case -1254008074:
return engine->outputChannels.alternatorStatus.resetCounter;
case -1798819555:
return engine->outputChannels.idleStatus.pTerm;
case -1807121002:
return engine->outputChannels.idleStatus.iTerm;
case -1813050607:
return engine->outputChannels.idleStatus.dTerm;
case 731084614:
return engine->outputChannels.idleStatus.output;
case -1811922497:
return engine->outputChannels.idleStatus.error;
case -424088744:
return engine->outputChannels.idleStatus.resetCounter;
case -41846406:
return engine->outputChannels.etbStatus.pTerm;
case -50147853:
return engine->outputChannels.etbStatus.iTerm;
case -56077458:
return engine->outputChannels.etbStatus.dTerm;
case -1418343613:
return engine->outputChannels.etbStatus.output;
case -54949348:
return engine->outputChannels.etbStatus.error;
case 2098956565:
return engine->outputChannels.etbStatus.resetCounter;
case 407130790:
return engine->outputChannels.boostStatus.pTerm;
case 398829343:
return engine->outputChannels.boostStatus.iTerm;
case 392899738:
return engine->outputChannels.boostStatus.dTerm;
case 513001967:
return engine->outputChannels.boostStatus.output;
case 394027848:
return engine->outputChannels.boostStatus.error;
case 308336833:
return engine->outputChannels.boostStatus.resetCounter;
case 1569192907:
return engine->outputChannels.wastegateDcStatus.pTerm;
case 1560891460:
return engine->outputChannels.wastegateDcStatus.iTerm;
case 1554961855:
return engine->outputChannels.wastegateDcStatus.dTerm;
case 206346164:
return engine->outputChannels.wastegateDcStatus.output;
case 1556089965:
return engine->outputChannels.wastegateDcStatus.error;
case 156247622:
return engine->outputChannels.wastegateDcStatus.resetCounter;
case 957036309:
return engine->outputChannels.auxSpeed1;
case 957036310:
return engine->outputChannels.auxSpeed2;
case 200047729:
return engine->outputChannels.ISSValue;
case 1520918538:
return engine->outputChannels.rawBattery;
case -1124698530:
return engine->outputChannels.coilState1;
case -1124698529:
return engine->outputChannels.coilState2;
case -1124698528:
return engine->outputChannels.coilState3;
case -1124698527:
return engine->outputChannels.coilState4;
case -1124698526:
return engine->outputChannels.coilState5;
case -1124698525:
return engine->outputChannels.coilState6;
case -1124698524:
return engine->outputChannels.coilState7;
case -1124698523:
return engine->outputChannels.coilState8;
case -1124698522:
return engine->outputChannels.coilState9;
case 1539654222:
return engine->outputChannels.coilState10;
case 1539654223:
return engine->outputChannels.coilState11;
case 1539654224:
return engine->outputChannels.coilState12;
case 2081101045:
return engine->outputChannels.injectorState1;
case 2081101046:
return engine->outputChannels.injectorState2;
case 2081101047:
return engine->outputChannels.injectorState3;
case 2081101048:
return engine->outputChannels.injectorState4;
case 2081101049:
return engine->outputChannels.injectorState5;
case 2081101050:
return engine->outputChannels.injectorState6;
case 2081101051:
return engine->outputChannels.injectorState7;
case 2081101052:
return engine->outputChannels.injectorState8;
case 2081101053:
return engine->outputChannels.injectorState9;
case -43142203:
return engine->outputChannels.injectorState10;
case -43142202:
return engine->outputChannels.injectorState11;
case -43142201:
return engine->outputChannels.injectorState12;
case 1894184322:
return engine->outputChannels.outputRequestPeriod;
case -1263258735:
return engine->outputChannels.mapFast;
case 907666325:
return engine->outputChannels.rawMaf2;
case 1663359009:
return engine->outputChannels.mafMeasured2;
case 967311941:
return engine->outputChannels.schedulingUsedCount;
case 2090288615:
return engine->outputChannels.Gego;
case 1092959609:
return engine->outputChannels.testBenchIter;
case 1628523935:
return engine->outputChannels.oilTemp;
case -1077373465:
return engine->outputChannels.fuelTemp;
case 309572379:
return engine->outputChannels.ambientTemp;
case 553570450:
return engine->outputChannels.compressorDischargeTemp;
case 1404346549:
return engine->outputChannels.compressorDischargePressure;
case 769340240:
return engine->outputChannels.throttleInletPressure;
case 795671090:
return engine->outputChannels.ignitionOnTime;
case -1165835361:
return engine->outputChannels.engineRunTime;
case -1357387481:
return engine->outputChannels.distanceTraveled;
case 111403416:
return engine->outputChannels.afrGasolineScale;
case 2029444810:
return engine->outputChannels.afr2GasolineScale;
case -1434098660:
return engine->outputChannels.actualLastInjectionStage2;
case -1337459841:
return engine->outputChannels.injectorDutyCycleStage2;
case -1779658835:
return engine->fuelComputer.totalFuelCorrection;
case -1288205717:
return engine->fuelComputer.running.postCrankingFuelCorrection;
case 197173469:
return engine->fuelComputer.running.intakeTemperatureCoefficient;
case 1822238385:
return engine->fuelComputer.running.coolantTemperatureCoefficient;
case 526786951:
return engine->fuelComputer.running.timeSinceCrankingInSecs;
case -42886021:
return engine->fuelComputer.running.baseFuel;
case -794283008:
return engine->fuelComputer.running.fuel;
case 995190836:
return engine->fuelComputer.afrTableYAxis;
case -734904659:
return engine->fuelComputer.targetLambda;
case 2122891301:
return engine->fuelComputer.targetAFR;
case 341978922:
return engine->fuelComputer.stoichiometricRatio;
case 1417236183:
return engine->fuelComputer.sdTcharge_coff;
case 1650433343:
return engine->fuelComputer.sdAirMassInOneCylinder;
case 1599780729:
return engine->fuelComputer.normalizedCylinderFilling;
case -1777838088:
return engine->ignitionState.baseDwell;
case -903101570:
return engine->ignitionState.sparkDwell;
case -1573373756:
return engine->ignitionState.dwellAngle;
case 256951528:
return engine->ignitionState.cltTimingCorrection;
case -1886479485:
return engine->ignitionState.timingIatCorrection;
case -319326974:
return engine->ignitionState.timingPidCorrection;
case -80612537:
return engine->ignitionState.dwellVoltageCorrection;
case -309610760:
return engine->ignitionState.luaTimingAdd;
case -1626770351:
return engine->ignitionState.luaTimingMult;
case -1571781441:
return ___engine.module<KnockController>()->m_knockLevel;
case -94443575:
return ___engine.module<KnockController>()->m_knockRetard;
case -504596140:
return ___engine.module<KnockController>()->m_knockThreshold;
case -1582096144:
return ___engine.module<KnockController>()->m_knockCount;
case 164334513:
return ___engine.module<KnockController>()->m_maximumRetard;
#if EFI_BOOST_CONTROL
case -575666209:
return ___engine.module<BoostController>()->isTpsInvalid;
#endif
#if EFI_BOOST_CONTROL
case 1846215200:
return ___engine.module<BoostController>()->m_shouldResetPid;
#endif
#if EFI_BOOST_CONTROL
case 1826317915:
return ___engine.module<BoostController>()->isBelowClosedLoopThreshold;
#endif
#if EFI_BOOST_CONTROL
case -1642402810:
return ___engine.module<BoostController>()->isNotClosedLoop;
#endif
#if EFI_BOOST_CONTROL
case 2111912944:
return ___engine.module<BoostController>()->isZeroRpm;
#endif
#if EFI_BOOST_CONTROL
case -2011570052:
return ___engine.module<BoostController>()->hasInitBoost;
#endif
#if EFI_BOOST_CONTROL
case 193830616:
return ___engine.module<BoostController>()->rpmTooLow;
#endif
#if EFI_BOOST_CONTROL
case -1033638560:
return ___engine.module<BoostController>()->tpsTooLow;
#endif
#if EFI_BOOST_CONTROL
case -734877977:
return ___engine.module<BoostController>()->mapTooLow;
#endif
#if EFI_BOOST_CONTROL
case 119157463:
return ___engine.module<BoostController>()->luaTargetAdd;
#endif
#if EFI_BOOST_CONTROL
case 1239062717:
return ___engine.module<BoostController>()->boostOutput;
#endif
#if EFI_BOOST_CONTROL
case -362320880:
return ___engine.module<BoostController>()->luaTargetMult;
#endif
#if EFI_BOOST_CONTROL
case -1481117304:
return ___engine.module<BoostController>()->openLoopPart;
#endif
#if EFI_BOOST_CONTROL
case 1944984220:
return ___engine.module<BoostController>()->luaOpenLoopAdd;
#endif
#if EFI_BOOST_CONTROL
case -707712709:
return ___engine.module<BoostController>()->boostControllerClosedLoopPart;
#endif
#if EFI_BOOST_CONTROL
case -1712045196:
return ___engine.module<BoostController>()->boostControlTarget;
#endif
case 182391090:
return ___engine.module<FanControl1>()->cranking;
case -496961865:
return ___engine.module<FanControl1>()->notRunning;
case 142778571:
return ___engine.module<FanControl1>()->disabledWhileEngineStopped;
case 545954889:
return ___engine.module<FanControl1>()->brokenClt;
case 291043035:
return ___engine.module<FanControl1>()->enabledForAc;
case 193494032:
return ___engine.module<FanControl1>()->hot;
case 2090155911:
return ___engine.module<FanControl1>()->cold;
case 1649801578:
return engine->engineState.lua.fuelAdd;
case -1390672637:
return engine->engineState.lua.fuelMult;
case -427776066:
return engine->engineState.lua.clutchUpState;
case -1296201087:
return engine->engineState.lua.brakePedalState;
case 1517904291:
return engine->engineState.lua.acRequestState;
case 2055342630:
return engine->engineState.lua.luaDisableEtb;
case -802271455:
return engine->engineState.lua.luaIgnCut;
case -893334680:
return engine->engineState.sd.tCharge;
case 584726739:
return engine->engineState.sd.tChargeK;
case -1206067863:
return engine->engineState.crankingFuel.coolantTemperatureCoefficient;
case 20251202:
return engine->engineState.crankingFuel.tpsCoefficient;
case 1541006353:
return engine->engineState.crankingFuel.durationCoefficient;
case -180401224:
return engine->engineState.crankingFuel.fuel;
case -281693247:
return engine->engineState.baroCorrection;
case -295556270:
return engine->engineState.hellenBoardId;
case -797965330:
return engine->engineState.clutchUpState;
case 724244513:
return engine->engineState.clutchDownState;
case -705383759:
return engine->engineState.brakePedalState;
case 897099930:
return engine->engineState.startStopState;
case -960645892:
return engine->engineState.startStopStateToggleCounter;
case -244414221:
return engine->engineState.egtValue1;
case -244414220:
return engine->engineState.egtValue2;
case -505351565:
return engine->engineState.desiredRpmLimit;
case -1839290700:
return engine->engineState.fuelInjectionCounter;
case -1515591290:
return engine->engineState.sparkCounter;
case 583799407:
return engine->engineState.fuelingLoad;
case 1136482406:
return engine->engineState.ignitionLoad;
case 1568071542:
return engine->engineState.veTableYAxis;
#if EFI_SHAFT_POSITION_INPUT
case 477303734:
return engine->triggerCentral.vvtCamCounter;
#endif
#if EFI_SHAFT_POSITION_INPUT
case -1727829859:
return engine->triggerCentral.mapVvt_MAP_AT_SPECIAL_POINT;
#endif
#if EFI_SHAFT_POSITION_INPUT
case -1585778708:
return engine->triggerCentral.mapVvt_MAP_AT_DIFF;
#endif
#if EFI_SHAFT_POSITION_INPUT
case 1637661099:
return engine->triggerCentral.mapVvt_MAP_AT_CYCLE_COUNT;
#endif
#if EFI_SHAFT_POSITION_INPUT
case 845799744:
return engine->triggerCentral.mapVvt_map_peak;
#endif
#if EFI_SHAFT_POSITION_INPUT
case 162105111:
return engine->triggerCentral.currentEngineDecodedPhase;
#endif
#if EFI_SHAFT_POSITION_INPUT
case -280624712:
return engine->triggerCentral.triggerToothAngleError;
#endif
#if EFI_SHAFT_POSITION_INPUT
case 989545496:
return engine->triggerCentral.triggerIgnoredToothCount;
#endif
case 1242329357:
return engine->dc_motors.dcOutput0;
case -1236599226:
return engine->dc_motors.isEnabled0_int;
case 1691876092:
return engine->dc_motors.isEnabled0;
#if EFI_VVT_PID
case -2132393748:
return ___engine.module<VvtController1>()->vvtTarget;
#endif
#if EFI_VVT_PID
case 1990697206:
return ___engine.module<VvtController1>()->vvtOutput;
#endif
case 350535927:
return ___engine.lambdaMonitor.lambdaCurrentlyGood;
case 1849938842:
return ___engine.lambdaMonitor.lambdaMonitorCut;
case 481450608:
return ___engine.lambdaMonitor.lambdaTimeSinceGood;
}
return EFI_ERROR_CODE;
}
#endif

3751
firmware/controllers/lua/generated/value_lookup_generated.cpp
View File

File diff suppressed because it is too large Load Diff

1602
firmware/controllers/lua/generated/value_lookup_generated.md
View File

File diff suppressed because it is too large Load Diff

4
firmware/controllers/lua/lua.mk
View File

@ -6,8 +6,8 @@ ALLCPPSRC += $(LUA_DIR)/lua.cpp \
$(LUA_DIR)/can_filter.cpp \
$(LUA_DIR)/lua_hooks_util.cpp \
$(LUA_DIR)/script_impl.cpp \
$(LUA_DIR)/generated/output_lookup_generated.cpp \
$(LUA_DIR)/generated/value_lookup_generated.cpp \
$(GENERATED_DIR)/output_lookup_generated.cpp \
$(GENERATED_DIR)/value_lookup_generated.cpp \
$(LUA_DIR)/lua_can_rx.cpp \
ALLINC += $(LUA_DIR) $(LUA_DIR)/luaaa $(LUA_EXT)

4
firmware/gen_config_board.sh
View File

@ -45,8 +45,8 @@ java \
$COMMON_GEN_CONFIG_PREFIX \
$COMMON_GEN_CONFIG \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
-c_defines controllers/generated/rusefi_generated.h \
-c_destination controllers/generated/engine_configuration_generated_structures.h
-c_defines generated/rusefi_generated.h \
-c_destination generated/engine_configuration_generated_structures.h
[ $? -eq 0 ] || { echo "ERROR generating TunerStudio config for ${BOARD_DIR}"; exit 1; }

6
firmware/gen_config_common.sh
View File

@ -13,12 +13,12 @@ COMMON_GEN_CONFIG="
-firing_order controllers/algo/firing_order.h \
-triggerInputFolder ../unit_tests \
-with_c_defines false \
-field_lookup_file controllers/lua/generated/value_lookup_generated.cpp controllers/lua/generated/value_lookup_generated.md \
-field_lookup_file generated/value_lookup_generated.cpp generated/value_lookup_generated.md \
-java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
-initialize_to_zero false \
-prepend console/binary/generated/total_live_data_generated.h \
-prepend generated/total_live_data_generated.h \
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-signature_destination generated/signature_${SHORT_BOARDNAME}.h \
-ts_output_name generated/${INI} \
-prepend integration/rusefi_config_shared.txt \
-prepend ${BOARD_DIR}/prepend.txt \

2
firmware/gen_live_documentation.sh
View File

@ -7,7 +7,7 @@ java -DSystemOut.name=logs/gen_live_documentation \
com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
[ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
# live_data_ids.h is generated above, so order of operations is important here!

4
firmware/generated/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

10
java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
View File

@ -27,7 +27,7 @@ public class LiveDataProcessor {
private final static String header = "// generated by gen_live_documentation.sh / LiveDataProcessor.java\n";
private final static String enumContentFileName = "console/binary/generated/live_data_ids.h";
private final static String enumContentFileName = "generated/live_data_ids.h";
private final static String tsOutputsDestination = "tunerstudio/generated/temp/";
@ -65,7 +65,7 @@ public class LiveDataProcessor {
liveDataProcessor.writeFiles();
log.info("TS_TOTAL_OUTPUT_SIZE=" + sensorTsPosition);
try (FileWriter fw = new FileWriter("console/binary/generated/total_live_data_generated.h")) {
try (FileWriter fw = new FileWriter("generated/total_live_data_generated.h")) {
fw.write(header);
fw.write("#define TS_TOTAL_OUTPUT_SIZE " + sensorTsPosition);
}
@ -90,7 +90,7 @@ public class LiveDataProcessor {
SdCardFieldsContent sdCardFieldsConsumer = new SdCardFieldsContent();
GetOutputValueConsumer outputValueConsumer = new GetOutputValueConsumer("controllers/lua/generated/output_lookup_generated.cpp");
GetOutputValueConsumer outputValueConsumer = new GetOutputValueConsumer("generated/output_lookup_generated.cpp");
// OutputChannelWriter outputChannelWriter = new OutputChannelWriter(
// tsOutputsDestination + File.separator + "/output_channels.ini",
@ -237,7 +237,7 @@ public class LiveDataProcessor {
}
enumContent.append("} live_data_e;\n");
LazyFile lazyFile = new LazyFile("console/binary_log/log_fields_generated.h");
LazyFile lazyFile = new LazyFile("generated/log_fields_generated.h");
SdCardFieldsConsumer.wrapContent(lazyFile, sdCardFieldsConsumer.getBody());
lazyFile.close();
@ -254,7 +254,7 @@ public class LiveDataProcessor {
fw.write(baseAddressCHeader.toString());
}
try (FileWriter fw = new FileWriter("console/binary/generated/live_data_fragments.h")) {
try (FileWriter fw = new FileWriter("generated/live_data_fragments.h")) {
fw.write(fragmentsContent.toString());
}

BIN
java_tools/enum2string.jar
View File

Binary file not shown.

2
simulator/Makefile
View File

@ -19,6 +19,7 @@ RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC
RULESFILE = $(RULESPATH)/rules.mk
PROJECT_CPU=simulator
GENERATED_DIR = $(PROJECT_DIR)/generated
include ../firmware/rusefi.mk
include ../firmware/rusefi_rules.mk
@ -189,6 +190,7 @@ INCDIR = . \
$(PROJECT_DIR)/hw_layer/drivers/can \
${CHIBIOS}/os/various \
$(CHIBIOS)/os/hal/lib/streams \
$(GENERATED_DIR) \
$(RUSEFI_LIB_INC) \
simulator/system \
simulator/can \

2
unit_tests/Makefile
View File

@ -5,6 +5,7 @@
PROJECT_DIR = ../firmware
UNIT_TESTS_DIR=$(PROJECT_DIR)/../unit_tests
GENERATED_DIR = $(PROJECT_DIR)/generated
# Imported source files and paths
include $(PROJECT_DIR)/console/console.mk
@ -47,6 +48,7 @@ INCDIR += \
$(PCH_DIR) \
$(UNIT_TESTS_DIR) \
$(ALLINC) \
$(GENERATED_DIR) \
$(PROJECT_DIR)/config/boards/hellen \
$(UNIT_TESTS_DIR)/test_data_structures \
$(UNIT_TESTS_DIR)/chibios-mock \