auto-sync

firmware/tunerstudio/rusefi.ini

@@ -531,6 +531,25 @@ fileVersion = { 20141008 }
    entry = time,            "Time",        float,  "%.3f"
    entry = rpm,             "RPM",         int,    "%d"
    entry = coolant,         "CLT",         float,  "%.1f"
+   entry = intake,          "IAT",         float,  "%.1f"
+   entry = TPS,             "TPS",         float,  "%d"
+   entry = MAF,             "MAF",         float,  "%.2f"
+   entry = MAP,             "MAP",         float,  "%d"
+   entry = AFR,             "AFR",         float,  "%.2f"
+   entry = VBatt,           "vBatt",       float,  "%.2f"
+   entry = fuelload	        "Fuelload"     float,  "%d"
+;     tpsADC          = U16,    "ADC",
+;     alignmet        = U16,    "al",
+;     atmPres         = F32,    "pres",
+;	  crankingFuel    = F32,    "ms",
+;     tpsAdcValue     = U32,    "adc",
+;     tCharge         = F32,    "T",
+;     inj_adv         = F32,    "MAP",
+;     sparkDwell      = F32,    "MAP",
+;     pulseWidth      = F32,    "ms",
+;     warmUpEnrich    = F32,    "%",
+;     egt0            = S16,    "°C",
+;     egt1            = S16,    "°C",
 
 [Menu]
 

java_console/ui/src/com/irnems/Launcher.java

@@ -19,7 +19,7 @@ import javax.swing.*;
  * @see WavePanel
  */
 public class Launcher extends FrameHelper {
-    public static final int CONSOLE_VERSION = 20141010;
+    public static final int CONSOLE_VERSION = 20141013;
     public static final boolean SHOW_STIMULATOR = true;
     private final String port;
 
@@ -45,7 +45,7 @@ public class Launcher extends FrameHelper {
         tabbedPane.addTab("LE controls", new FlexibleControls().getPanel());
 
 //        tabbedPane.addTab("ADC", new AdcPanel(new BooleanInputsModel()).createAdcPanel());
-        if (SHOW_STIMULATOR) {
+        if (SHOW_STIMULATOR && !SimulatorHelper.RUNNING_SIMULATOR) {
             EcuStimulator stimulator = EcuStimulator.getInstance();
             tabbedPane.add("ECU stimulation", stimulator.getPanel());
         }

java_console/ui/src/com/rusefi/PortLookupFrame.java

@@ -18,9 +18,15 @@ import java.util.List;
 /**
  * This frame is used on startup to select the port we would be using
  *
- * @author Andrey Belomutskiy 2/14/14
+ * @author Andrey Belomutskiy
+ *         <p/>
+ *         2/14/14
  */
 public class PortLookupFrame {
+
+    public static final String RUS_EFI_C_2012_2014 = "rusEfi (c) 2012-2014";
+    public static final String URI = "http://rusefi.com/?java_console";
+
     public static void chooseSerialPort() {
         List<String> ports = new ArrayList<>();
         ports.addAll(Arrays.asList(SerialPortList.getPortNames()));
@@ -52,7 +58,7 @@ public class PortLookupFrame {
 
 
         JPanel lowerPanel = new JPanel(new FlowLayout());
-        lowerPanel.add(new URLLabel("rusEfi (c) 2012-2014", "http://rusefi.com/?java_console"));
+        lowerPanel.add(new URLLabel(RUS_EFI_C_2012_2014, URI));
         content.add(upperPanel, BorderLayout.NORTH);
         content.add(centerPanel, BorderLayout.CENTER);
         content.add(lowerPanel, BorderLayout.SOUTH);

java_console/ui/src/com/rusefi/SimulatorHelper.java

@@ -12,12 +12,14 @@ import java.io.IOException;
 public class SimulatorHelper {
     public static final String BINARY = "rusefi_simulator.exe";
     private static Process process;
+    public static boolean RUNNING_SIMULATOR;
 
     public static boolean isBinaryHere() {
         return new File(BINARY).exists();
     }
 
     private static void startSimulator() {
+        RUNNING_SIMULATOR = true;
         try {
             process = Runtime.getRuntime().exec(BINARY);
         } catch (IOException e) {