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

auto-sync

This commit is contained in:
rusEfi 2016-10-09 17:01:51 -04:00
parent dc50d5e12d
commit 34d2576511
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -38,7 +38,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20161002;
public static final int CONSOLE_VERSION = 20161009;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

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

@ -103,13 +103,13 @@ public class FormulasPane {
double rpm = SensorCentral.getInstance().getValue(Sensor.RPM);
double maf = SensorCentral.getInstance().getValue(Sensor.MAF);
String baseFuelStr = oneDecimal(Sensor.FUEL_BASE);
String baseFuelStr = twoDecimals(Sensor.FUEL_BASE);
String baseFuel = "$Base_Fuel (ms) = lookup (" +
"(RPM = " + rpm + ", " +
"MAF = " + maf + ") = " +
baseFuelStr + "ms";
String actualLastInjection = oneDecimal(Sensor.actualLastInjection);
String actualLastInjection = twoDecimals(Sensor.actualLastInjection);
String injTime = "$Fuel (ms) = " + baseFuel + getInjecctorLag() +
" = " + actualLastInjection + "ms_per_injection$";
@ -134,8 +134,8 @@ public class FormulasPane {
@NotNull
private String getAccelerationVariables(ConfigurationImage ci) {
String tpsDelta = oneDecimal(Sensor.deltaTps);
String elDelta = oneDecimal(Sensor.engineLoadAccelDelta);
String tpsDelta = twoDecimals(Sensor.deltaTps);
String elDelta = twoDecimals(Sensor.engineLoadAccelDelta);
int tpsEnrichLength = ConfigField.getIntValue(ci, Fields.TPSACCELLENGTH);
int elEnrichLength = ConfigField.getIntValue(ci, Fields.ENGINELOADACCELLENGTH);
@ -145,7 +145,7 @@ public class FormulasPane {
double tpsAccelThreshold = ConfigField.getFloatValue(ci, Fields.TPSACCELENRICHMENTTHRESHOLD);
String tpsAccelMult = "fixme";//ConfigField.getFloatValue(ci, Fields.TPSACCELENRICHMENTMULTIPLIER);
String tpsAccelValue = oneDecimal(Sensor.tpsAccelFuel);
String tpsAccelValue = twoDecimals(Sensor.tpsAccelFuel);
double tpsDecelThreshold = ConfigField.getFloatValue(ci, Fields.TPSDECELENLEANMENTTHRESHOLD);
double tpsDecelMult = ConfigField.getFloatValue(ci, Fields.TPSDECELENLEANMENTMULTIPLIER);
@ -170,8 +170,8 @@ public class FormulasPane {
double rpm = SensorCentral.getInstance().getValue(Sensor.RPM);
String RPM = "" + (int) rpm;
String VE = oneDecimal(Sensor.CURRENT_VE);
String TARGET_AFR = oneDecimal(Sensor.TARGET_AFR);
String VE = twoDecimals(Sensor.CURRENT_VE);
String TARGET_AFR = twoDecimals(Sensor.TARGET_AFR);
String tpsStr = oneDecimal(Sensor.TPS);
String chargeAirMass = String.format("%.3fgm", SensorCentral.getInstance().getValue(Sensor.CHARGE_AIR_MASS));
@ -192,7 +192,7 @@ public class FormulasPane {
chargeAirMass +
"$";
String baseFuelStr = oneDecimal(Sensor.FUEL_BASE);
String baseFuelStr = twoDecimals(Sensor.FUEL_BASE);
String baseFuel = "$Base_Fuel (ms) = \\frac{" +
"($Airmass = " + chargeAirMass + ")" +
"}{" +
@ -200,13 +200,13 @@ public class FormulasPane {
" * (injectorFlow = " + injectorFlow + " cc/min)" +
"} = " + baseFuelStr + "ms$";
String IATcorr = oneDecimal(Sensor.iatCorrection);
String CLTcorr = oneDecimal(Sensor.cltCorrection);
String tpsAccel = oneDecimal(Sensor.tpsAccelFuel);
String IATcorr = twoDecimals(Sensor.iatCorrection);
String CLTcorr = twoDecimals(Sensor.cltCorrection);
String tpsAccel = twoDecimals(Sensor.tpsAccelFuel);
String tempCorrections = " * cltCorr(" + CLTcorr + ") * iatCorr(" + IATcorr + ")";
String actualLastInjection = oneDecimal(Sensor.actualLastInjection);
String actualLastInjection = twoDecimals(Sensor.actualLastInjection);
String injTime = "$Fuel (ms) = " +
"(Base_Fuel (" + baseFuelStr + "ms) + Tps_Accel_Corr = (" + tpsAccel + "ms))" +
tempCorrections + getInjecctorLag() +
@ -221,18 +221,26 @@ public class FormulasPane {
@NotNull
private String getInjecctorLag() {
String vBatt = oneDecimal(Sensor.VBATT);
return "+ ( injectorLag(VBatt = " + vBatt + ") = " + oneDecimal(Sensor.injectorLagMs) + ")";
String vBatt = twoDecimals(Sensor.VBATT);
return "+ ( injectorLag(VBatt = " + vBatt + ") = " + twoDecimals(Sensor.injectorLagMs) + ")";
}
private String oneDecimal(Sensor sensor) {
return oneDecimal(SensorCentral.getInstance().getValue(sensor));
}
private String twoDecimals(Sensor sensor) {
return twoDecimals(SensorCentral.getInstance().getValue(sensor));
}
private String oneDecimal(double ve) {
return String.format("%.1f", ve);
}
private String twoDecimals(double ve) {
return String.format("%.2f", ve);
}
public JPanel getContent() {
return content;
}