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

auto-sync

This commit is contained in:
rusEfi 2016-08-07 21:03:59 -04:00
parent b5de763748
commit b6520e1213
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java_console/io/src/com/rusefi/io/CommandQueue.java
View File

@ -160,6 +160,7 @@ public class CommandQueue {
* *
* @param command dev console command * @param command dev console command
* @param timeoutMs retry timeout * @param timeoutMs retry timeout
* @param fireEvent true if we want global even about this comment, i.e. recent commands list to know about this command
*/ */
public void write(String command, int timeoutMs, InvocationConfirmationListener listener, boolean fireEvent) { public void write(String command, int timeoutMs, InvocationConfirmationListener listener, boolean fireEvent) {

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

@ -6,9 +6,7 @@ import com.rusefi.core.EngineState;
import com.rusefi.core.MessagesCentral; import com.rusefi.core.MessagesCentral;
import com.rusefi.core.Sensor; import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral; import com.rusefi.core.SensorCentral;
import com.rusefi.io.ConnectionStatus; import com.rusefi.io.*;
import com.rusefi.io.ConnectionWatchdog;
import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.PortHolder; import com.rusefi.io.serial.PortHolder;
import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.maintenance.VersionChecker; import com.rusefi.maintenance.VersionChecker;
@ -24,6 +22,7 @@ import jssc.SerialPortList;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
@ -39,7 +38,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 = 20160724; public static final int CONSOLE_VERSION = 20160807;
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";
@ -191,6 +190,12 @@ public class Launcher {
public void onConnectionStatus(boolean isConnected) { public void onConnectionStatus(boolean isConnected) {
setTitle(); setTitle();
UiUtils.trueRepaint(tabbedPane); // this would repaint status label UiUtils.trueRepaint(tabbedPane); // this would repaint status label
if (ConnectionStatus.INSTANCE.getValue() == ConnectionStatus.Value.CONNECTED) {
long unixTime = System.currentTimeMillis() / 1000L;
long withOffset = unixTime + TimeZone.getDefault().getOffset(System.currentTimeMillis());
CommandQueue.getInstance().write("set date " + withOffset, CommandQueue.DEFAULT_TIMEOUT,
InvocationConfirmationListener.VOID, false);
}
} }
}); });