From aaeca16a812c037e314d19b8e6670b69987c920a Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 Nov 2017 21:10:49 -0500 Subject: [PATCH] #490 --- firmware/console/status_loop.cpp | 3 +++ firmware/controllers/algo/rusefi_enums.h | 2 +- firmware/controllers/engine_controller.cpp | 14 +++++++------- firmware/controllers/engine_controller.h | 12 ++++++------ firmware/controllers/settings.cpp | 12 ++++++------ 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 0845d947e5..eab2dee86c 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -758,6 +758,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->debugIntField1 = tsState.textCommandCounter * _10_6 + tsState.totalCounter; tsOutputChannels->debugIntField2 = tsState.outputChannelsCommandCounter * _10_6 + tsState.writeValueCommandCounter; tsOutputChannels->debugIntField3 = tsState.readPageCommandsCounter * _10_6 + tsState.burnCommandCounter; + } else if (engineConfiguration->debugMode == DBG__AUX_VALVES) { + tsOutputChannels->debugFloatField1 = engine->engineState.auxValveStart; + tsOutputChannels->debugFloatField2 = engine->engineState.auxValveEnd; } if (engineConfiguration->debugMode == DBG_TRIGGER_INPUT) { diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 26ed83dda9..208a8709e8 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -721,7 +721,7 @@ typedef enum { DBG_ELECTRONIC_THROTTLE = 17, DBG_EXECUTOR = 18, DBG_BENCH_TEST = 19, - DBG__20 = 20, + DBG__AUX_VALVES = 20, DBG__21 = 21, DBG__22 = 22, diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 8d33beb07d..994dc00ffb 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -491,31 +491,31 @@ static void setMockVoltage(int hwChannel, float voltage) { engine->engineState.mockAdcState.setMockVoltage(hwChannel, voltage); } -void setCltVoltage(float voltage) { +void setMockCltVoltage(float voltage) { setMockVoltage(engineConfiguration->clt.adcChannel, voltage); } -void setIatVoltage(float voltage) { +void setMockIatVoltage(float voltage) { setMockVoltage(engineConfiguration->iat.adcChannel, voltage); } -void setMafVoltage(float voltage) { +void setMockMafVoltage(float voltage) { setMockVoltage(engineConfiguration->mafAdcChannel, voltage); } -void setAfrVoltage(float voltage) { +void setMockAfrVoltage(float voltage) { setMockVoltage(engineConfiguration->afr.hwChannel, voltage); } -void setTpsVoltage(float voltage) { +void setMockTpsVoltage(float voltage) { setMockVoltage(engineConfiguration->tpsAdcChannel, voltage); } -void setMapVoltage(float voltage) { +void setMockMapVoltage(float voltage) { setMockVoltage(engineConfiguration->map.sensor.hwChannel, voltage); } -void setVBattVoltage(float voltage) { +void setMockVBattVoltage(float voltage) { setMockVoltage(engineConfiguration->vbattAdcChannel, voltage); } diff --git a/firmware/controllers/engine_controller.h b/firmware/controllers/engine_controller.h index af68926bf5..abc632a38f 100644 --- a/firmware/controllers/engine_controller.h +++ b/firmware/controllers/engine_controller.h @@ -27,12 +27,12 @@ void initPeriodicEvents(DECLARE_ENGINE_PARAMETER_SIGNATURE); void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); -void setVBattVoltage(float voltage); +void setMockVBattVoltage(float voltage); void setMapVoltage(float voltage); -void setTpsVoltage(float voltage); -void setAfrVoltage(float voltage); -void setMafVoltage(float voltage); -void setIatVoltage(float voltage); -void setCltVoltage(float voltage); +void setMockTpsVoltage(float voltage); +void setMockAfrVoltage(float voltage); +void setMockMafVoltage(float voltage); +void setMockIatVoltage(float voltage); +void setMockCltVoltage(float voltage); #endif /* ENGINE_STATUS_H_ */ diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index ad1279b858..051d825333 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -1107,14 +1107,14 @@ typedef struct { VoidFloat callback; } command_f_s; -command_f_s commandsF[] = {{"mock_iat_voltage", setIatVoltage}, +command_f_s commandsF[] = {{"mock_iat_voltage", setMockIatVoltage}, {"mock_pedal_position", setMockPedalPosition}, - {"mock_maf_voltage", setMafVoltage}, - {"mock_afr_voltage", setAfrVoltage}, - {"mock_tps_voltage", setTpsVoltage}, + {"mock_maf_voltage", setMockMafVoltage}, + {"mock_afr_voltage", setMockAfrVoltage}, + {"mock_tps_voltage", setMockTpsVoltage}, {"mock_map_voltage", setMapVoltage}, - {"mock_vbatt_voltage", setVBattVoltage}, - {"mock_clt_voltage", setCltVoltage}, + {"mock_vbatt_voltage", setMockVBattVoltage}, + {"mock_clt_voltage", setMockCltVoltage}, {"ignition_offset", setIgnitionOffset}, {"injection_offset", setInjectionOffset}, {"global_trigger_offset_angle", setGlobalTriggerAngleOffset},