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

random progress

This commit is contained in:
rusefi 2019-03-14 13:28:51 -04:00
parent 47950dcf5e
commit 7c1020b17c
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ typedef struct {
*/ */
float injectorDutyCycle; // 140 float injectorDutyCycle; // 140
int knockCount; // 144 int knockCount; // 144
float fuelTankGauge; // 148 float fuelTankLevel; // 148
float knockLevel; // 152 float knockLevel; // 152
int totalTriggerErrorCounter; // 156 int totalTriggerErrorCounter; // 156
float wallFuelAmount; // 160 float wallFuelAmount; // 160

2
firmware/console/status_loop.cpp
View File

@ -732,7 +732,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->pedalPosition = hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE) ? getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE) : 0; tsOutputChannels->pedalPosition = hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE) ? getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
tsOutputChannels->knockCount = engine->knockCount; tsOutputChannels->knockCount = engine->knockCount;
tsOutputChannels->knockLevel = engine->knockVolts; tsOutputChannels->knockLevel = engine->knockVolts;
tsOutputChannels->fuelTankGauge = engine->sensors.fuelTankGauge; tsOutputChannels->fuelTankLevel = engine->sensors.fuelTankLevel;
tsOutputChannels->hasFatalError = hasFirmwareError(); tsOutputChannels->hasFatalError = hasFirmwareError();
tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter; tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;

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

@ -137,7 +137,7 @@ void Engine::updateSlowSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// todo: move this logic somewhere to sensors folder? // todo: move this logic somewhere to sensors folder?
if (CONFIG(fuelLevelSensor) != EFI_ADC_NONE) { if (CONFIG(fuelLevelSensor) != EFI_ADC_NONE) {
float fuelLevelVoltage = getVoltageDivided("fuel", engineConfiguration->fuelLevelSensor); float fuelLevelVoltage = getVoltageDivided("fuel", engineConfiguration->fuelLevelSensor);
sensors.fuelTankGauge = interpolateMsg("fgauge", CONFIGB(fuelLevelEmptyTankVoltage), 0, sensors.fuelTankLevel = interpolateMsg("fgauge", CONFIGB(fuelLevelEmptyTankVoltage), 0,
CONFIGB(fuelLevelFullTankVoltage), 100, CONFIGB(fuelLevelFullTankVoltage), 100,
fuelLevelVoltage); fuelLevelVoltage);
} }

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

@ -110,7 +110,7 @@ public:
/** /**
* that's fuel in tank - just a gauge * that's fuel in tank - just a gauge
*/ */
percent_t fuelTankGauge = 0; percent_t fuelTankLevel = 0;
}; };
class FuelConsumptionState { class FuelConsumptionState {

5
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 12 22:04:36 EDT 2019 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 14 13:13:57 EDT 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1113,7 +1113,7 @@ fileVersion = { 20171101 }
pedalPosition = scalar, F32, 136, "%", 1, 0 pedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0 injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0 knockCount = scalar, U32, 144, "counter", 1, 0
; fuelLevel 148 fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0 knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156 ; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0 wallFuelAmount = scalar, F32, 160, "ms", 1, 0
@ -1625,6 +1625,7 @@ fileVersion = { 20171101 }
baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1
knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1 knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1
knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2 knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2
fuelTankLevelGauge = =fuelTankLevel,"Fuel", "x", 0, 7, 10, 10, 100, 100, 1, 2
triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0

3
firmware/tunerstudio/rusefi.input
View File

@ -225,7 +225,7 @@ fileVersion = { 20171101 }
pedalPosition = scalar, F32, 136, "%", 1, 0 pedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0 injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0 knockCount = scalar, U32, 144, "counter", 1, 0
; fuelLevel 148 fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0 knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156 ; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0 wallFuelAmount = scalar, F32, 160, "ms", 1, 0
@ -737,6 +737,7 @@ fileVersion = { 20171101 }
baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1 baroCorrectionGauge = baroCorrection,"BaroCorr", "%", 0, 120, 10, 10, 100, 100, 1, 1
knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1 knockCountGauge = knockCount,"Knock count", "count", 0, 120, 10, 10, 100, 100, 1, 1
knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2 knockLevelGauge = knockLevel,"Knock level", "volts", 0, 7, 10, 10, 100, 100, 1, 2
fuelTankLevelGauge = =fuelTankLevel,"Fuel", "x", 0, 7, 10, 10, 100, 100, 1, 2
triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0