mirror of https://github.com/FOME-Tech/fome-fw.git
auto-sync
This commit is contained in:
parent
7d0649a164
commit
a5d5c49dd5
|
@ -110,7 +110,8 @@ typedef struct {
|
||||||
float cltCorrection; // 184
|
float cltCorrection; // 184
|
||||||
float runningFuel; // 188
|
float runningFuel; // 188
|
||||||
int debugIntField; // 192
|
int debugIntField; // 192
|
||||||
int unused3[20];
|
float injectorLagMs; // 196
|
||||||
|
int unused3[19];
|
||||||
} TunerStudioOutputChannels;
|
} TunerStudioOutputChannels;
|
||||||
|
|
||||||
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */
|
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */
|
||||||
|
|
|
@ -606,6 +606,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
||||||
|
|
||||||
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER);
|
tsOutputChannels->injectorDutyCycle = getInjectorDutyCycle(rpm PASS_ENGINE_PARAMETER);
|
||||||
tsOutputChannels->runningFuel = ENGINE(engineState.runningFuel);
|
tsOutputChannels->runningFuel = ENGINE(engineState.runningFuel);
|
||||||
|
tsOutputChannels->injectorLagMs = ENGINE(injectorLagMs);
|
||||||
tsOutputChannels->wallFuelAmount = wallFuel.getWallFuel(0);
|
tsOutputChannels->wallFuelAmount = wallFuel.getWallFuel(0);
|
||||||
tsOutputChannels->wallFuelCorrection = engine->wallFuelCorrection;
|
tsOutputChannels->wallFuelCorrection = engine->wallFuelCorrection;
|
||||||
tsOutputChannels->engineLoadAccelDelta = engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap();
|
tsOutputChannels->engineLoadAccelDelta = engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap();
|
||||||
|
|
|
@ -282,6 +282,8 @@ public:
|
||||||
efitick_t lastTriggerEventTimeNt;
|
efitick_t lastTriggerEventTimeNt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Global injector lag + injectorLag(VBatt)
|
||||||
|
*
|
||||||
* this value depends on a slow-changing VBatt value, so
|
* this value depends on a slow-changing VBatt value, so
|
||||||
* we update it once in a while
|
* we update it once in a while
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -102,6 +102,7 @@ public enum Sensor {
|
||||||
CHARGE_AIR_MASS(SensorCategory.OPERATIONS, FieldType.FLOAT, 180, BackgroundColor.MUD),
|
CHARGE_AIR_MASS(SensorCategory.OPERATIONS, FieldType.FLOAT, 180, BackgroundColor.MUD),
|
||||||
cltCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 184, BackgroundColor.MUD, 0, 5),
|
cltCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 184, BackgroundColor.MUD, 0, 5),
|
||||||
runningFuel(SensorCategory.OPERATIONS, FieldType.FLOAT, 188, BackgroundColor.MUD, 0, 15, "ms"),
|
runningFuel(SensorCategory.OPERATIONS, FieldType.FLOAT, 188, BackgroundColor.MUD, 0, 15, "ms"),
|
||||||
|
injectorLagMs(SensorCategory.FUEL, FieldType.FLOAT, 196, BackgroundColor.MUD, 0, 15, "ms"),
|
||||||
|
|
||||||
INJ_1_2_DELTA("inj 1-2 delta", SensorCategory.SNIFFING),
|
INJ_1_2_DELTA("inj 1-2 delta", SensorCategory.SNIFFING),
|
||||||
INJ_3_4_DELTA("inj 3-4 delta", SensorCategory.SNIFFING),
|
INJ_3_4_DELTA("inj 3-4 delta", SensorCategory.SNIFFING),
|
||||||
|
|
|
@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
||||||
* @see EngineSnifferPanel
|
* @see EngineSnifferPanel
|
||||||
*/
|
*/
|
||||||
public class Launcher {
|
public class Launcher {
|
||||||
public static final int CONSOLE_VERSION = 20160109;
|
public static final int CONSOLE_VERSION = 20160122;
|
||||||
public static final boolean SHOW_STIMULATOR = false;
|
public static final boolean SHOW_STIMULATOR = false;
|
||||||
private static final String TAB_INDEX = "main_tab";
|
private static final String TAB_INDEX = "main_tab";
|
||||||
protected static final String PORT_KEY = "port";
|
protected static final String PORT_KEY = "port";
|
||||||
|
|
|
@ -150,6 +150,7 @@ public class FormulasPane {
|
||||||
String TARGET_AFR = oneDecimal(Sensor.TARGET_AFR);
|
String TARGET_AFR = oneDecimal(Sensor.TARGET_AFR);
|
||||||
String tpsStr = oneDecimal(Sensor.TPS);
|
String tpsStr = oneDecimal(Sensor.TPS);
|
||||||
String chargeAirMass = String.format("%.3fgm", SensorCentral.getInstance().getValue(Sensor.CHARGE_AIR_MASS));
|
String chargeAirMass = String.format("%.3fgm", SensorCentral.getInstance().getValue(Sensor.CHARGE_AIR_MASS));
|
||||||
|
String vBatt = oneDecimal(Sensor.VBATT);
|
||||||
|
|
||||||
double displacement = ConfigField.getFloatValue(ci, Fields.DISPLACEMENT);
|
double displacement = ConfigField.getFloatValue(ci, Fields.DISPLACEMENT);
|
||||||
int cylinderCount = ConfigField.getIntValue(ci, Fields.CYLINDERSCOUNT);
|
int cylinderCount = ConfigField.getIntValue(ci, Fields.CYLINDERSCOUNT);
|
||||||
|
@ -184,8 +185,11 @@ public class FormulasPane {
|
||||||
|
|
||||||
String tempCorrections = " * cltCorr(" + CLTcorr + ") * iatCorr(" + IATcorr + ")";
|
String tempCorrections = " * cltCorr(" + CLTcorr + ") * iatCorr(" + IATcorr + ")";
|
||||||
|
|
||||||
|
String injectorLag = "+ ( injectorLag(VBatt = " + vBatt + ") = " + oneDecimal(Sensor.injectorLagMs) + ")";
|
||||||
|
|
||||||
String injTime = "$Fuel (ms) = " +
|
String injTime = "$Fuel (ms) = " +
|
||||||
"(Base_Fuel (" + baseFuelStr + "ms) + Tps_Accel_Corr = (" + tpsAccel + "ms))" + tempCorrections +
|
"(Base_Fuel (" + baseFuelStr + "ms) + Tps_Accel_Corr = (" + tpsAccel + "ms))" +
|
||||||
|
tempCorrections + injectorLag +
|
||||||
" = " + runningFuel + "ms$";
|
" = " + runningFuel + "ms$";
|
||||||
|
|
||||||
return acceleration +
|
return acceleration +
|
||||||
|
|
Loading…
Reference in New Issue