2022-04-13 14:29:44 -07:00
|
|
|
#
|
2024-09-27 07:25:34 -07:00
|
|
|
# see live_data.cpp - you would have to add a method manually!
|
|
|
|
#
|
2022-04-23 06:29:58 -07:00
|
|
|
# Here we facilitate monitoring by exposing model/transfer object of each individual controller. While some entries are only
|
|
|
|
# useful for monitoring the big idea is to bring calculation and monitoring as close to each other as possible by exposing
|
|
|
|
# many calculation fields directly
|
|
|
|
#
|
2022-04-13 14:29:44 -07:00
|
|
|
# here we have LiveData configuration file
|
2022-04-23 06:29:58 -07:00
|
|
|
# entry format, where 'key' is a unique ID:
|
2022-04-22 19:48:07 -07:00
|
|
|
# key: [NameOfJavaToGenerate.java, folder_where_key.txt_is located, (optional advanced options)]
|
|
|
|
# Naming convention: top level struct in .txt file should be called key_s
|
|
|
|
#
|
2024-11-02 21:00:44 -07:00
|
|
|
# see docs_enums.mk where all the .txt files should be mentioned!
|
2022-04-13 14:29:44 -07:00
|
|
|
#
|
2019-08-31 19:54:45 -07:00
|
|
|
Usages:
|
2023-01-15 03:26:22 -08:00
|
|
|
# output_channels always goes first at least because it has protocol version at well-known offset
|
|
|
|
- name: output_channels
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: status_loop
|
2023-01-15 03:26:22 -08:00
|
|
|
java: TsOutputs.java
|
|
|
|
folder: console/binary
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-01-15 03:26:22 -08:00
|
|
|
constexpr: "engine->outputChannels"
|
|
|
|
|
2023-01-14 20:00:28 -08:00
|
|
|
- name: fuel_computer
|
|
|
|
java: FuelComputer.java
|
|
|
|
folder: controllers/algo/fuel
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-01-14 20:00:28 -08:00
|
|
|
constexpr: "engine->fuelComputer"
|
2023-05-24 15:23:10 -07:00
|
|
|
conditional_compilation: "EFI_ENGINE_CONTROL"
|
2023-01-14 20:00:28 -08:00
|
|
|
|
2023-01-15 05:26:08 -08:00
|
|
|
- name: ignition_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: advance_map
|
2023-01-15 05:26:08 -08:00
|
|
|
java: IgnitionState.java
|
2023-01-14 20:00:28 -08:00
|
|
|
folder: controllers/algo
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-01-15 05:26:08 -08:00
|
|
|
constexpr: "engine->ignitionState"
|
2023-01-14 20:00:28 -08:00
|
|
|
|
2022-06-02 22:02:16 -07:00
|
|
|
- name: knock_controller
|
|
|
|
java: KnockController.java
|
|
|
|
folder: controllers/engine_cycle
|
2023-09-25 13:20:58 -07:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: knock
|
2023-09-25 21:54:45 -07:00
|
|
|
constexpr: "___engine.module<KnockController>()"
|
|
|
|
isPtr: true
|
2022-06-02 22:02:16 -07:00
|
|
|
|
2024-01-02 18:49:28 -08:00
|
|
|
- name: tcu_controller
|
|
|
|
java: TcuController.java
|
|
|
|
folder: controllers/tcu
|
|
|
|
prepend: integration/rusefi_config_shared.txt
|
|
|
|
conditional_compilation: "EFI_TCU"
|
|
|
|
|
2023-03-14 20:12:35 -07:00
|
|
|
- name: throttle_model
|
|
|
|
java: ThrottleModel.java
|
|
|
|
folder: controllers/math
|
|
|
|
output_name: throttle_model
|
|
|
|
|
2022-06-02 22:02:16 -07:00
|
|
|
- name: high_pressure_fuel_pump
|
|
|
|
java: HighPressureFuelPump.java
|
|
|
|
folder: controllers/engine_cycle
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: hpfp
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: injector_model
|
|
|
|
java: InjectorModel.java
|
|
|
|
folder: controllers/algo/fuel
|
2023-07-03 09:26:47 -07:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2024-02-25 21:12:09 -08:00
|
|
|
constexpr: "___engine.module<InjectorModelPrimary>()"
|
|
|
|
isPtr: true
|
|
|
|
# working around unmock() in simulator
|
|
|
|
conditional_compilation: "EFI_PROD_CODE && EFI_IDLE_CONTROL"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: launch_control_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: launch_control
|
2022-06-02 22:02:16 -07:00
|
|
|
java: LaunchControl.java
|
|
|
|
folder: controllers/algo
|
2024-02-25 21:13:31 -08:00
|
|
|
constexpr: "engine->launchController"
|
|
|
|
conditional_compilation: "EFI_LAUNCH_CONTROL"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
2024-09-27 10:16:13 -07:00
|
|
|
- name: shift_torque_reduction_state
|
|
|
|
cppFileName: shift_torque_reduction_controller
|
|
|
|
java: ShiftTorqueReductionController.java
|
|
|
|
folder: controllers/algo
|
|
|
|
constexpr: "engine->shiftTorqueReductionController"
|
|
|
|
conditional_compilation: "EFI_LAUNCH_CONTROL"
|
|
|
|
|
2022-12-16 15:48:59 -08:00
|
|
|
- name: antilag_system_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: antilag_system
|
2022-12-16 15:48:59 -08:00
|
|
|
java: AntilagSystem.java
|
|
|
|
folder: controllers/algo
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-12-16 15:48:59 -08:00
|
|
|
output_name: als
|
|
|
|
|
2022-06-02 22:02:16 -07:00
|
|
|
- name: boost_control
|
|
|
|
java: BoostControl.java
|
|
|
|
folder: controllers/actuators
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: boost
|
2023-09-26 10:39:43 -07:00
|
|
|
constexpr: "___engine.module<BoostController>()"
|
|
|
|
isPtr: true
|
2023-01-16 13:39:08 -08:00
|
|
|
conditional_compilation: "EFI_BOOST_CONTROL"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: ac_control
|
|
|
|
java: AcControl.java
|
|
|
|
folder: controllers/actuators
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: ac
|
2023-06-11 19:24:51 -07:00
|
|
|
engineModule: AcController
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: fan_control
|
|
|
|
java: FanControl.java
|
|
|
|
folder: controllers/actuators
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: [ "fan1", "fan2" ]
|
2023-09-26 04:12:11 -07:00
|
|
|
constexpr: "___engine.module<FanControl1>()"
|
|
|
|
isPtr: true
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: fuel_pump_control
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: fuel_pump
|
2022-06-02 22:02:16 -07:00
|
|
|
java: FuelPump.java
|
|
|
|
folder: controllers/actuators
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: fuelPump
|
2023-06-10 18:00:25 -07:00
|
|
|
engineModule: FuelPumpController
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: main_relay
|
|
|
|
java: MainRelay.java
|
|
|
|
folder: controllers/actuators
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: mainRelay
|
2022-06-02 22:02:16 -07:00
|
|
|
|
2022-01-06 12:20:58 -08:00
|
|
|
#todo: handle ETB pid and Idle pid which point at same pid_state.txt
|
2022-06-02 22:02:16 -07:00
|
|
|
# - name: pid_state
|
|
|
|
# java: PidState.java
|
|
|
|
# folder: util/math
|
|
|
|
|
|
|
|
- name: engine_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: engine
|
2022-06-02 22:02:16 -07:00
|
|
|
java: EngineState.java
|
|
|
|
folder: controllers/algo
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-10-26 19:07:24 -07:00
|
|
|
constexpr: "engine->engineState"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: tps_accel_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: accel_enrichment
|
2022-06-02 22:02:16 -07:00
|
|
|
java: TpsAccelState.java
|
|
|
|
folder: controllers/algo
|
2023-05-05 02:34:48 -07:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: trigger_central
|
|
|
|
java: TriggerCentral.java
|
|
|
|
folder: controllers/trigger
|
|
|
|
withCDefines: true
|
2023-03-28 17:35:32 -07:00
|
|
|
# something special about 'error: "ts_show_vbatt" redefined'' why is trigger.h special?
|
|
|
|
# prepend: integration/rusefi_config.txt
|
2022-10-28 07:28:38 -07:00
|
|
|
constexpr: "engine->triggerCentral"
|
2023-05-23 20:48:40 -07:00
|
|
|
conditional_compilation: "EFI_SHAFT_POSITION_INPUT"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: trigger_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: trigger_decoder
|
2022-06-02 22:02:16 -07:00
|
|
|
java: TriggerState.java
|
|
|
|
folder: controllers/trigger
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-02 22:02:16 -07:00
|
|
|
output_name: [ "trg", "vvt1i", "vvt1e", "vvt2i", "vvt2e" ]
|
|
|
|
|
2022-08-24 15:11:05 -07:00
|
|
|
- name: trigger_state_primary
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: trigger_decoder
|
2022-08-24 15:11:05 -07:00
|
|
|
java: TriggerStatePrimary.java
|
|
|
|
folder: controllers/trigger
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-08-24 15:11:05 -07:00
|
|
|
|
2022-06-02 22:02:16 -07:00
|
|
|
- name: wall_fuel_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: wall_fuel
|
2022-06-02 22:02:16 -07:00
|
|
|
java: WallFuelState.java
|
|
|
|
folder: controllers/algo
|
|
|
|
|
|
|
|
- name: idle_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: idle_thread
|
2022-06-02 22:02:16 -07:00
|
|
|
java: IdleState.java
|
|
|
|
folder: controllers/actuators
|
2023-09-26 09:36:58 -07:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-11-26 10:10:08 -08:00
|
|
|
constexpr: "___engine.module<IdleController>().unmock()"
|
2022-06-02 22:02:16 -07:00
|
|
|
output_name: idle
|
2023-11-26 10:52:06 -08:00
|
|
|
# working around unmock() in simulator
|
2023-11-26 19:44:15 -08:00
|
|
|
conditional_compilation: "EFI_PROD_CODE && EFI_IDLE_CONTROL"
|
2022-06-02 22:02:16 -07:00
|
|
|
|
|
|
|
- name: electronic_throttle
|
|
|
|
java: ElectronicThrottle.java
|
|
|
|
folder: controllers/actuators
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2022-06-19 06:52:23 -07:00
|
|
|
output_name: [ "etb1", "etb2" ]
|
2022-06-23 17:04:26 -07:00
|
|
|
|
|
|
|
- name: wideband_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: AemXSeriesLambda
|
2022-06-23 17:04:26 -07:00
|
|
|
java: WidebandController.java
|
|
|
|
folder: controllers/sensors/
|
|
|
|
output_name: [ "wb1", "wb2" ]
|
2023-02-13 15:01:54 -08:00
|
|
|
|
|
|
|
- name: dc_motors
|
|
|
|
java: DcMotors.java
|
|
|
|
folder: controllers/actuators
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-02-14 16:54:22 -08:00
|
|
|
constexpr: "engine->dc_motors"
|
|
|
|
|
|
|
|
- name: sent_state
|
2023-07-03 08:45:20 -07:00
|
|
|
cppFileName: sent
|
2023-02-14 16:54:22 -08:00
|
|
|
java: SentState.java
|
2023-07-03 09:12:03 -07:00
|
|
|
folder: controllers/sensors
|
2023-03-02 11:52:36 -08:00
|
|
|
prepend: integration/rusefi_config_shared.txt
|
2023-07-03 09:12:03 -07:00
|
|
|
|
|
|
|
- name: vvt
|
|
|
|
java: VvtState.java
|
|
|
|
folder: controllers/actuators
|
2023-07-19 22:16:29 -07:00
|
|
|
constexpr: "___engine.module<VvtController1>()"
|
|
|
|
isPtr: true
|
|
|
|
conditional_compilation: "EFI_VVT_PID"
|
2023-07-26 05:58:08 -07:00
|
|
|
|
|
|
|
- name: lambda_monitor
|
|
|
|
java: LambdaMonitor.java
|
|
|
|
folder: controllers/math
|
|
|
|
constexpr: "___engine.lambdaMonitor"
|
2023-12-12 19:05:29 -08:00
|
|
|
conditional_compilation: "EFI_SHAFT_POSITION_INPUT"
|