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

auto-sync

This commit is contained in:
rusEfi 2017-01-19 15:03:17 -05:00
parent a0dbe8345f
commit 6f31723df5
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,9 @@ typedef struct {
typedef struct {
// primary instrument cluster gauges
int rpm; // size 4, offset 0
/**
* This value is in Celcius - UI would convert into F if needed
*/
float coolantTemperature; // size 4, offset 4
float intakeAirTemperature; // size 4, offset 8
float throttlePositon; // size 4, offset 12
@ -40,7 +43,7 @@ typedef struct {
/**
* This is the raw value we take from the fuel map or base fuel algorithm, before the corrections
*/
float baseFuel; // 48
float fuelBase; // 48
float tCharge; // 52
float ignitionAdvance; // 56
float sparkDwell; // 60
@ -82,7 +85,10 @@ typedef struct {
egt_values_s egtValues;
float rpmAcceleration;
float massAirFlow;
float veValue; // current volumetric efficiency, offset 112
/**
* Current volumetric efficiency
*/
float veValue; // offset 112
/**
* TPS value delta within specified number of cycles
* See tpsAccelFuel
@ -102,17 +108,25 @@ typedef struct {
float knockLevel; // 152
int totalTriggerErrorCounter; // 156
float wallFuelAmount; // 160
/**
* multiplier, 1 means no correction, 1.20 means 20% extra
*/
float iatCorrection; // 164
floatms_t wallFuelCorrection; // 168
float idlePosition; // 172
float currentTargetAfr; // 176
float chargeAirMass; // 180
/**
* multiplier, 1 means no correction, 1.20 means 20% extra
*/
float cltCorrection; // 184
/**
* Total fuel with CLT, IAT and TPS acceleration without injector lag corrections per cycle,
* as squirt duration.
*
* @see actualLastInjection
* without injector lag, see engine.h for details
*/
float runningFuel; // 188
float fuelRunning; // 188
int debugIntField1; // 192
float injectorLagMs; // 196
float debugFloatField2; // 200
@ -126,6 +140,9 @@ typedef struct {
float speedToRpmRatio; // 232
int warningCounter; // 236
int lastErrorCode; // 240
/**
* Microcontroller own internal temperature, C
*/
float internalMcuTemperature; // 244
float vvtPosition; // 248
int engineMode; // 252

8
firmware/console/status_loop.cpp
View File

@ -239,8 +239,8 @@ static void printSensors(Logging *log, bool fileFormat) {
}
if (fileFormat) {
floatms_t baseFuel = getBaseFuel(rpm PASS_ENGINE_PARAMETER);
reportSensorF(log, fileFormat, "f: base", "ms", baseFuel, 2);
floatms_t fuelBase = getBaseFuel(rpm PASS_ENGINE_PARAMETER);
reportSensorF(log, fileFormat, "f: base", "ms", fuelBase, 2);
reportSensorF(log, fileFormat, "f: actual", "ms", ENGINE(actualLastInjection), 2);
reportSensorF(log, fileFormat, "f: lag", "ms", engine->engineState.injectorLag, 2);
reportSensorF(log, fileFormat, "f: running", "ms", ENGINE(engineState.runningFuel), 2);
@ -688,9 +688,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER);
tsOutputChannels->runningFuel = ENGINE(engineState.runningFuel);
tsOutputChannels->fuelRunning = ENGINE(engineState.runningFuel);
tsOutputChannels->injectorLagMs = ENGINE(engineState.injectorLag);
tsOutputChannels->baseFuel = engine->engineState.baseFuel;
tsOutputChannels->fuelBase = engine->engineState.baseFuel;
tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection);
efitimesec_t now = getTimeNowSeconds();

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

@ -153,7 +153,7 @@ public:
*/
floatms_t baseTableFuel;
/**
* fuel injection duration regardless of fuel logic mode
* Raw fuel injection duration produced by current fuel algorithm, without any correction
*/
floatms_t baseFuel;

4
firmware/tunerstudio/rusefi.input
View File

@ -1283,8 +1283,8 @@ fileVersion = { 20161225 }
entry = debugIntField3, "debug i3",int,"%d"
entry = engineMode, "mode",int,"%d"
entry = warningCounter, "warn",int,"%d"
entry = lastErrorCode, "error",int,"%d"
entry = warningCounter, "err: count",int,"%d"
entry = lastErrorCode, "err: last",int,"%d"
entry = internalMcuTemperature, "int temp",float,"%.2f"
entry = tCharge, "tCharge",float,"%.3f"