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

steps towards Android

This commit is contained in:
rusefi 2020-07-04 10:06:22 -04:00
parent bea9022f73
commit 5d9cc9c324
8 changed files with 75 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java_console/io/src/main/java/com/rusefi/io/LinkConnector.java
View File

@ -69,4 +69,7 @@ public interface LinkConnector extends LinkDecoder {
default BinaryProtocolState getBinaryProtocolState() {
return getBinaryProtocol().getBinaryProtocolState();
}
default void stop() {
}
}

35
java_console/io/src/main/java/com/rusefi/io/LinkManager.java
View File

@ -2,21 +2,27 @@ package com.rusefi.io;
import com.fazecast.jSerialComm.SerialPort;
import com.opensr5.Logger;
import com.rusefi.Callable;
import com.rusefi.NamedThreadFactory;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolState;
import com.rusefi.core.EngineState;
import com.rusefi.io.serial.SerialConnector;
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
import com.rusefi.io.tcp.TcpConnector;
import com.rusefi.io.tcp.TcpIoStream;
import org.jetbrains.annotations.NotNull;
import java.net.Socket;
import java.util.Arrays;
import java.util.Objects;
import java.util.concurrent.*;
/**
* See TcpCommunicationIntegrationTest
*
* @author Andrey Belomutskiy
* 3/3/14
* 3/3/14
*/
public class LinkManager {
@NotNull
@ -127,6 +133,7 @@ public class LinkManager {
public final LinkedBlockingQueue<Runnable> COMMUNICATION_QUEUE = new LinkedBlockingQueue<>();
/**
* All request/responses to underlying controller are happening on this single-threaded executor in a FIFO manner
*
* @see #TCP_READ_EXECUTOR
*/
public final ExecutorService COMMUNICATION_EXECUTOR = new ThreadPoolExecutor(1, 1,
@ -172,7 +179,7 @@ public class LinkManager {
public void startAndConnect(String port, ConnectionStateListener stateListener) {
Objects.requireNonNull(port, "port");
start(port);
start(port, stateListener);
connector.connectAndReadConfiguration(stateListener);
}
@ -180,7 +187,7 @@ public class LinkManager {
return connector;
}
public void start(String port) {
public void start(String port, ConnectionStateListener stateListener) {
if (isStarted) {
throw new IllegalStateException("Already started");
}
@ -190,10 +197,24 @@ public class LinkManager {
if (isLogViewerMode(port)) {
connector = LinkConnector.VOID;
} else if (TcpConnector.isTcpPort(port)) {
connector = new TcpConnector(this, port, logger);
connector = new SerialConnector(this, port, logger, new Callable<IoStream>() {
@Override
public IoStream call() {
Socket socket;
try {
int portPart = TcpConnector.getTcpPort(port);
String hostname = TcpConnector.getHostname(port);
socket = new Socket(hostname, portPart);
return new TcpIoStream(logger, LinkManager.this, socket);
} catch (Throwable e) {
stateListener.onConnectionFailed();
return null;
}
}
});
isSimulationMode = true;
} else {
connector = new SerialConnector(this, port, logger);
connector = new SerialConnector(this, port, logger, () -> SerialIoStreamJSerialComm.openPort(port, logger));
}
}
@ -221,6 +242,10 @@ public class LinkManager {
connector.restart();
}
public void stop() {
connector.stop();
}
public static String unpackConfirmation(String message) {
if (message.startsWith(CommandQueue.CONFIRMATION_PREFIX))
return message.substring(CommandQueue.CONFIRMATION_PREFIX.length());

17
java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java
View File

@ -1,6 +1,7 @@
package com.rusefi.io.serial;
import com.opensr5.Logger;
import com.rusefi.Callable;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.core.MessagesCentral;
import com.rusefi.io.ConnectionStateListener;
@ -18,33 +19,39 @@ import java.awt.*;
* 7/25/13
* Andrey Belomutskiy, (c) 2013-2020
*/
public abstract class PortHolder {
public class PortHolder {
private final DataListener dataListener;
private final Logger logger;
private final Callable<IoStream> streamFactory;
private final LinkManager linkManager;
public ConnectionStateListener listener;
private final Object portLock = new Object();
private final String port;
private IoStream stream;
@Nullable
private BinaryProtocol bp;
protected PortHolder(String port, LinkManager linkManager, Logger logger) {
protected PortHolder(String port, LinkManager linkManager, Logger logger, Callable<IoStream> streamFactory) {
this.port = port;
this.linkManager = linkManager;
dataListener = freshData -> linkManager.getEngineState().processNewData(new String(freshData), LinkManager.ENCODER);
this.logger = logger;
this.streamFactory = streamFactory;
}
boolean connectAndReadConfiguration() {
if (port == null)
return false;
MessagesCentral.getInstance().postMessage(logger, getClass(), "Opening port: " + port);
IoStream stream = openStream();
stream = streamFactory.call();
if (stream == null) {
// error already reported
return false;
}
synchronized (portLock) {
bp = new BinaryProtocol(linkManager, logger, stream);
portLock.notifyAll();
@ -61,8 +68,6 @@ public abstract class PortHolder {
return result;
}
protected abstract IoStream openStream();
public void close() {
synchronized (portLock) {
if (bp != null) {

17
java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java
View File

@ -1,13 +1,13 @@
package com.rusefi.io.serial;
import com.opensr5.Logger;
import com.rusefi.Callable;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.core.MessagesCentral;
import com.rusefi.io.ConnectionStateListener;
import com.rusefi.io.IoStream;
import com.rusefi.io.LinkConnector;
import com.rusefi.io.LinkManager;
import org.jetbrains.annotations.NotNull;
/**
* @author Andrey Belomutskiy
@ -19,15 +19,11 @@ public class SerialConnector implements LinkConnector {
private final Logger logger;
private final LinkManager linkManager;
public SerialConnector(LinkManager linkManager, String serialPort, Logger logger) {
public SerialConnector(LinkManager linkManager, String portName, Logger logger, Callable<IoStream> streamFactory) {
this.linkManager = linkManager;
this.logger = logger;
portHolder = new PortHolder(serialPort, linkManager, logger) {
@NotNull
public IoStream openStream() {
return SerialIoStreamJSerialComm.openPort(serialPort, logger);
}
};
portHolder = new PortHolder(portName, linkManager, logger, streamFactory);
}
@Override
@ -49,6 +45,11 @@ public class SerialConnector implements LinkConnector {
return portHolder.getBp();
}
@Override
public void stop() {
portHolder.close();
}
@Override
public void restart() {
linkManager.execute(new Runnable() {

2
java_console/io/src/main/java/com/rusefi/io/tcp/TcpConnector.java
View File

@ -84,7 +84,7 @@ public class TcpConnector implements LinkConnector {
}
}
private static String getHostname(String port) {
public static String getHostname(String port) {
String[] portParts = port.split(":");
return (portParts.length == 1 ? LOCALHOST : portParts[0].length() > 0 ? portParts[0] : LOCALHOST);
}

4
java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
View File

@ -29,7 +29,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
import static com.rusefi.StartupFrame.createLogoLabel;
import static com.rusefi.StartupFrame.setFrameIcon;
import static com.rusefi.rusEFIVersion.CONSOLE_VERSION;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
@ -75,7 +74,8 @@ public class ConsoleUI {
getConfig().getRoot().setProperty(SPEED_KEY, BaudRateHolder.INSTANCE.baudRate);
LinkManager linkManager = uiContext.getLinkManager();
linkManager.start(port);
// todo: this blocking IO operation should NOT be happening on the UI thread
linkManager.start(port, mainFrame.listener);
engineSnifferPanel = new EngineSnifferPanel(uiContext, getConfig().getRoot().getChild("digital_sniffer"));
if (!LinkManager.isLogViewerMode(port))

17
java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
View File

@ -42,10 +42,27 @@ public class MainFrame {
}
};
public ConnectionStateListener listener;
public MainFrame(ConsoleUI consoleUI, TabbedPanel tabbedPane) {
this.consoleUI = consoleUI;
this.tabbedPane = tabbedPane;
listener = new ConnectionStateListener() {
@Override
public void onConnectionFailed() {
}
@Override
public void onConnectionEstablished() {
FileLog.MAIN.logLine("onConnectionEstablished");
// tabbedPane.romEditorPane.showContent();
tabbedPane.settingsTab.showContent();
tabbedPane.logsManager.showContent();
tabbedPane.fuelTunePane.showContent();
new BinaryProtocolServer(FileLog.LOGGER).start(consoleUI.uiContext.getLinkManager());
}
};
}
private void windowOpenedHandler() {

2
java_console/ui/src/test/java/com/rusefi/io/TcpCommunicationIntegrationTest.java
View File

@ -77,6 +77,8 @@ public class TcpCommunicationIntegrationTest {
});
assertTrue(connectionEstablishedCountDownLatch.await(30, TimeUnit.SECONDS));
assertEquals(0, server.unknownCommands.get());
clientManager.stop();
}
@NotNull