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 2016-05-23 21:01:32 -04:00
parent 87b9e49ca8
commit 36ebb931af
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ typedef struct {
* this one contains total resulting fuel squirt time, per event
* With all corrections. See also baseFuel
*/
float pulseWidthMs; // 64
float actualLastInjection; // 64
float debugFloatField1; // 68
/**
* Yes, I do not really enjoy packing bits into integers but we simply have too many boolean flags and I cannot

5
firmware/console/status_loop.cpp
View File

@ -622,6 +622,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER);
tsOutputChannels->runningFuel = ENGINE(engineState.runningFuel);
tsOutputChannels->injectorLagMs = ENGINE(engineState.injectorLag);
tsOutputChannels->baseFuel = engine->engineState.baseFuel;
tsOutputChannels->actualLastInjection = ENGINE(actualLastInjection);
tsOutputChannels->timeSeconds = getTimeNowSeconds();
if (engineConfiguration->debugMode == DBG_TPS_ACCEL) {
@ -694,8 +697,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
float timing = engine->engineState.timingAdvance;
tsOutputChannels->ignitionAdvance = timing > 360 ? timing - 720 : timing;
tsOutputChannels->sparkDwell = ENGINE(engineState.sparkDwell);
tsOutputChannels->baseFuel = engine->engineState.baseFuel;
tsOutputChannels->pulseWidthMs = ENGINE(actualLastInjection);
tsOutputChannels->crankingFuelMs = getCrankingFuel(PASS_ENGINE_PARAMETER_F);
tsOutputChannels->chargeAirMass = engine->engineState.airMass;
}

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

@ -174,7 +174,11 @@ public:
floatms_t baseFuel;
/**
* Fuel with CLT, IAT and TPS acceleration corrections, as squirt duration.
* Total fuel with CLT, IAT and TPS acceleration corrections per cycle,
* as squirt duration.
* Without injector lag.
* @see baseFule
* @see actualLastInjection
*/
floatms_t runningFuel;

2
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -323,9 +323,9 @@ public class BinaryProtocol {
offset += requestSize;
}
setController(image);
logger.info("Got configuration from controller.");
ConnectionStatus.INSTANCE.setValue(ConnectionStatus.Value.CONNECTED);
setController(image);
}
/**

1
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -92,6 +92,7 @@ public enum Sensor {
FUEL_BASE(SensorCategory.FUEL, FieldType.FLOAT, 48, BackgroundColor.MUD, 0, 30, "ms"),
T_CHARGE(SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140),
DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10),
actualLastInjection(SensorCategory.FUEL, FieldType.FLOAT, 64, BackgroundColor.MUD, 0, 30, "ms"),
CURRENT_VE(SensorCategory.FUEL, FieldType.FLOAT, 112, BackgroundColor.MUD),
deltaTps(SensorCategory.FUEL, FieldType.FLOAT, 116, BackgroundColor.MUD),

5
java_console/ui/src/com/rusefi/ui/FormulasPane.java
View File

@ -181,16 +181,15 @@ public class FormulasPane {
String CLTcorr = oneDecimal(Sensor.cltCorrection);
String tpsAccel = oneDecimal(Sensor.tpsAccelFuel);
String runningFuel = oneDecimal(Sensor.runningFuel);
String tempCorrections = " * cltCorr(" + CLTcorr + ") * iatCorr(" + IATcorr + ")";
String injectorLag = "+ ( injectorLag(VBatt = " + vBatt + ") = " + oneDecimal(Sensor.injectorLagMs) + ")";
String actualLastInjection = oneDecimal(Sensor.actualLastInjection);
String injTime = "$Fuel (ms) = " +
"(Base_Fuel (" + baseFuelStr + "ms) + Tps_Accel_Corr = (" + tpsAccel + "ms))" +
tempCorrections + injectorLag +
" = " + runningFuel + "ms$";
" = " + actualLastInjection + "ms_per_injection$";
return acceleration +
tCharge + newLine +

3
java_console/ui/src/com/rusefi/ui/config/BaseConfigField.java
View File

@ -33,7 +33,8 @@ public abstract class BaseConfigField {
ConnectionStatus.INSTANCE.addListener(new ConnectionStatus.Listener() {
@Override
public void onConnectionStatus(boolean isConnected) {
processInitialValue(field);
if (ConnectionStatus.INSTANCE.getValue() == ConnectionStatus.Value.CONNECTED)
processInitialValue(field);
}
});
}