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

#490

This commit is contained in:
rusefi 2017-11-27 21:10:49 -05:00
parent 86e59d9af3
commit aaeca16a81
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/console/status_loop.cpp
View File

@ -758,6 +758,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugIntField1 = tsState.textCommandCounter * _10_6 + tsState.totalCounter; tsOutputChannels->debugIntField1 = tsState.textCommandCounter * _10_6 + tsState.totalCounter;
tsOutputChannels->debugIntField2 = tsState.outputChannelsCommandCounter * _10_6 + tsState.writeValueCommandCounter; tsOutputChannels->debugIntField2 = tsState.outputChannelsCommandCounter * _10_6 + tsState.writeValueCommandCounter;
tsOutputChannels->debugIntField3 = tsState.readPageCommandsCounter * _10_6 + tsState.burnCommandCounter; 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) { if (engineConfiguration->debugMode == DBG_TRIGGER_INPUT) {

2
firmware/controllers/algo/rusefi_enums.h
View File

@ -721,7 +721,7 @@ typedef enum {
DBG_ELECTRONIC_THROTTLE = 17, DBG_ELECTRONIC_THROTTLE = 17,
DBG_EXECUTOR = 18, DBG_EXECUTOR = 18,
DBG_BENCH_TEST = 19, DBG_BENCH_TEST = 19,
DBG__20 = 20, DBG__AUX_VALVES = 20,
DBG__21 = 21, DBG__21 = 21,
DBG__22 = 22, DBG__22 = 22,

14
firmware/controllers/engine_controller.cpp
View File

@ -491,31 +491,31 @@ static void setMockVoltage(int hwChannel, float voltage) {
engine->engineState.mockAdcState.setMockVoltage(hwChannel, voltage); engine->engineState.mockAdcState.setMockVoltage(hwChannel, voltage);
} }
void setCltVoltage(float voltage) { void setMockCltVoltage(float voltage) {
setMockVoltage(engineConfiguration->clt.adcChannel, voltage); setMockVoltage(engineConfiguration->clt.adcChannel, voltage);
} }
void setIatVoltage(float voltage) { void setMockIatVoltage(float voltage) {
setMockVoltage(engineConfiguration->iat.adcChannel, voltage); setMockVoltage(engineConfiguration->iat.adcChannel, voltage);
} }
void setMafVoltage(float voltage) { void setMockMafVoltage(float voltage) {
setMockVoltage(engineConfiguration->mafAdcChannel, voltage); setMockVoltage(engineConfiguration->mafAdcChannel, voltage);
} }
void setAfrVoltage(float voltage) { void setMockAfrVoltage(float voltage) {
setMockVoltage(engineConfiguration->afr.hwChannel, voltage); setMockVoltage(engineConfiguration->afr.hwChannel, voltage);
} }
void setTpsVoltage(float voltage) { void setMockTpsVoltage(float voltage) {
setMockVoltage(engineConfiguration->tpsAdcChannel, voltage); setMockVoltage(engineConfiguration->tpsAdcChannel, voltage);
} }
void setMapVoltage(float voltage) { void setMockMapVoltage(float voltage) {
setMockVoltage(engineConfiguration->map.sensor.hwChannel, voltage); setMockVoltage(engineConfiguration->map.sensor.hwChannel, voltage);
} }
void setVBattVoltage(float voltage) { void setMockVBattVoltage(float voltage) {
setMockVoltage(engineConfiguration->vbattAdcChannel, voltage); setMockVoltage(engineConfiguration->vbattAdcChannel, voltage);
} }

12
firmware/controllers/engine_controller.h
View File

@ -27,12 +27,12 @@ void initPeriodicEvents(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX); void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
void commonInitEngineController(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 setMapVoltage(float voltage);
void setTpsVoltage(float voltage); void setMockTpsVoltage(float voltage);
void setAfrVoltage(float voltage); void setMockAfrVoltage(float voltage);
void setMafVoltage(float voltage); void setMockMafVoltage(float voltage);
void setIatVoltage(float voltage); void setMockIatVoltage(float voltage);
void setCltVoltage(float voltage); void setMockCltVoltage(float voltage);
#endif /* ENGINE_STATUS_H_ */ #endif /* ENGINE_STATUS_H_ */

12
firmware/controllers/settings.cpp
View File

@ -1107,14 +1107,14 @@ typedef struct {
VoidFloat callback; VoidFloat callback;
} command_f_s; } command_f_s;
command_f_s commandsF[] = {{"mock_iat_voltage", setIatVoltage}, command_f_s commandsF[] = {{"mock_iat_voltage", setMockIatVoltage},
{"mock_pedal_position", setMockPedalPosition}, {"mock_pedal_position", setMockPedalPosition},
{"mock_maf_voltage", setMafVoltage}, {"mock_maf_voltage", setMockMafVoltage},
{"mock_afr_voltage", setAfrVoltage}, {"mock_afr_voltage", setMockAfrVoltage},
{"mock_tps_voltage", setTpsVoltage}, {"mock_tps_voltage", setMockTpsVoltage},
{"mock_map_voltage", setMapVoltage}, {"mock_map_voltage", setMapVoltage},
{"mock_vbatt_voltage", setVBattVoltage}, {"mock_vbatt_voltage", setMockVBattVoltage},
{"mock_clt_voltage", setCltVoltage}, {"mock_clt_voltage", setMockCltVoltage},
{"ignition_offset", setIgnitionOffset}, {"ignition_offset", setIgnitionOffset},
{"injection_offset", setInjectionOffset}, {"injection_offset", setInjectionOffset},
{"global_trigger_offset_angle", setGlobalTriggerAngleOffset}, {"global_trigger_offset_angle", setGlobalTriggerAngleOffset},