diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index d9bccf7219..5897a3c423 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -76,9 +76,6 @@ uint16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2 int16_t injectionOffset;@@GAUGE_NAME_FUEL_INJECTION_TIMING@@;"deg", 1, 0, 0, 0, 0 ! Corrections -! todo: inline this further to injectorModel deadTime - uint16_t autoscale injectorLagMs;@@GAUGE_NAME_INJECTOR_LAG@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3 - ! we want a hash of engineMake+engineCode+vehicleName in the log file in order to match TS logs to rusEFI Online tune uint16_t engineMakeCodeNameCrc16;@@GAUGE_NAME_ENGINE_CRC16@@;"crc16",1, 0, 0, 0, 0 ! Wall model AE diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index d726e02b0d..5aea1cb512 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -508,9 +508,6 @@ static void updateFuelCorrections() { engine->outputChannels.fuelPidCorrection[0] = 100.0f * (engine->stftCorrection[0] - 1.0f); engine->outputChannels.fuelPidCorrection[1] = 100.0f * (engine->stftCorrection[1] - 1.0f); engine->outputChannels.Gego = 100.0f * engine->stftCorrection[0]; - -// get rid of this, have gauges use injector model info directly - engine->outputChannels.injectorLagMs = engine->module()->getDeadtime(); } static void updateFuelResults() { diff --git a/firmware/controllers/algo/fuel/injector_model.txt b/firmware/controllers/algo/fuel/injector_model.txt index 3db23ddc22..c6a4d92729 100644 --- a/firmware/controllers/algo/fuel/injector_model.txt +++ b/firmware/controllers/algo/fuel/injector_model.txt @@ -1,7 +1,7 @@ struct_no_prefix injector_model_s -float m_deadtime;injectorLag(VBatt)\nthis value depends on a slow-changing VBatt value, so\nwe update it once in a while +float m_deadtime;@@GAUGE_NAME_INJECTOR_LAG@@;"ms",1, 0, 0, 0, 3 -float pressureDelta;fuel: injector pressureDelta;"kPa", 1, 0, -10000, 10000, 1 -float pressureRatio;fuel: injector pressureRatio;"", 1, 0, -10000, 10000, 3 +float pressureDelta;fuel: Injector pressure delta;"kPa", 1, 0, -1000, 1000, 1 +float pressureRatio;fuel: Injector pressure ratio;"", 1, 0, 0, 100, 3 end_struct diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index 3a03ded80c..27478e891d 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -50,6 +50,9 @@ Usages: - name: injector_model java: InjectorModel.java folder: controllers/algo/fuel + prepend: integration/rusefi_config_shared.txt + constexpr: "___engine.module()" + isPtr: true - name: launch_control_state java: LaunchControl.java