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

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusEfi 2019-09-22 07:58:23 -04:00
parent 9b98446846 77cca16cd5
commit a20ff91abf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_configuration.h
View File

@ -89,7 +89,7 @@ typedef struct {
unsigned int isKnockChipOk : 1; // bit 9 unsigned int isKnockChipOk : 1; // bit 9
int tsConfigVersion; // 84 int tsConfigVersion; // 84
egt_values_s egtValues; // 88 egt_values_s egtValues; // 88
float unusedOffset104; // 104 float rpmAcceleration; // 104
float massAirFlow; // 108 float massAirFlow; // 108
/** /**
* Current volumetric efficiency * Current volumetric efficiency

3
firmware/console/status_loop.cpp
View File

@ -740,6 +740,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection); tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection);
// 104
tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration();
// offset 108 // offset 108
// For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor! // For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor!
tsOutputChannels->massAirFlow = getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE); tsOutputChannels->massAirFlow = getAirFlowGauge(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -932,7 +934,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugFloatField1 = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING); tsOutputChannels->debugFloatField1 = engine->triggerCentral.getHwEventCounter((int)SHAFT_PRIMARY_RISING);
tsOutputChannels->debugFloatField2 = engine->triggerCentral.getHwEventCounter((int)SHAFT_SECONDARY_RISING); tsOutputChannels->debugFloatField2 = engine->triggerCentral.getHwEventCounter((int)SHAFT_SECONDARY_RISING);
tsOutputChannels->debugFloatField3 = engine->triggerCentral.getHwEventCounter((int)SHAFT_3RD_RISING); tsOutputChannels->debugFloatField3 = engine->triggerCentral.getHwEventCounter((int)SHAFT_3RD_RISING);
tsOutputChannels->debugFloatField4 = engine->rpmCalculator.getRpmAcceleration();
break; break;
case DBG_FSIO_ADC: case DBG_FSIO_ADC:
// todo: implement a proper loop // todo: implement a proper loop