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

minor bugfix

This commit is contained in:
rusefillc 2020-10-09 00:06:40 -04:00
parent c97ccd98bc
commit 8fc8898dde
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
View File

@ -13,12 +13,12 @@ import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.binaryprotocol.MsqFactory; import com.rusefi.binaryprotocol.MsqFactory;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.EngineState; import com.rusefi.core.EngineState;
import com.rusefi.core.Pair;
import com.rusefi.core.ResponseBuffer; import com.rusefi.core.ResponseBuffer;
import com.rusefi.io.ConnectionStateListener; import com.rusefi.io.ConnectionStateListener;
import com.rusefi.io.ConnectionStatusLogic; import com.rusefi.io.ConnectionStatusLogic;
import com.rusefi.io.IoStream; import com.rusefi.io.IoStream;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.SerialIoStreamJSerialComm;
import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.BinaryProtocolServer;
import com.rusefi.maintenance.ExecHelper; import com.rusefi.maintenance.ExecHelper;
import com.rusefi.proxy.client.LocalApplicationProxy; import com.rusefi.proxy.client.LocalApplicationProxy;
@ -150,7 +150,7 @@ public class ConsoleTools {
String autoDetectedPort = autoDetectPort(); String autoDetectedPort = autoDetectPort();
if (autoDetectedPort == null) if (autoDetectedPort == null)
return; return;
IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort); IoStream stream = LinkManager.open(autoDetectedPort);
byte[] commandBytes = BinaryProtocol.getTextCommandBytes(command); byte[] commandBytes = BinaryProtocol.getTextCommandBytes(command);
stream.sendPacket(commandBytes); stream.sendPacket(commandBytes);
} }
@ -311,6 +311,9 @@ public class ConsoleTools {
@Nullable @Nullable
private static String autoDetectPort() { private static String autoDetectPort() {
String rusEfiAddress = System.getProperty("rusefi.address");
if (rusEfiAddress != null)
return rusEfiAddress;
String autoDetectedPort = PortDetector.autoDetectSerial(null); String autoDetectedPort = PortDetector.autoDetectSerial(null);
if (autoDetectedPort == null) { if (autoDetectedPort == null) {
System.err.println(RUS_EFI_NOT_DETECTED); System.err.println(RUS_EFI_NOT_DETECTED);
@ -335,14 +338,13 @@ public class ConsoleTools {
Online.upload(new File(Online.outputXmlFileName), authToken); Online.upload(new File(Online.outputXmlFileName), authToken);
} }
static void detect(String[] strings) throws IOException, InterruptedException { static void detect(String[] strings) throws IOException {
String autoDetectedPort = autoDetectPort(); String autoDetectedPort = autoDetectPort();
if (autoDetectedPort == null) { if (autoDetectedPort == null) {
System.out.println(RUS_EFI_NOT_DETECTED); System.out.println(RUS_EFI_NOT_DETECTED);
return; return;
} }
IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort); IoStream stream = LinkManager.open(autoDetectedPort);
Logger logger = FileLog.LOGGER;
IncomingDataBuffer incomingData = stream.getDataBuffer(); IncomingDataBuffer incomingData = stream.getDataBuffer();
byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello"); byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello");
stream.sendPacket(commandBytes); stream.sendPacket(commandBytes);
@ -385,11 +387,13 @@ public class ConsoleTools {
System.out.println("Signature: " + SerialAutoChecker.SIGNATURE); System.out.println("Signature: " + SerialAutoChecker.SIGNATURE);
System.out.println("It says " + messages); System.out.println("It says " + messages);
System.out.println("Ini file: " + SignatureHelper.getUrl(SerialAutoChecker.SIGNATURE).first); Pair<String, String> stringPair = SignatureHelper.getUrl(SerialAutoChecker.SIGNATURE);
if (stringPair != null)
System.out.println("Ini file: " + stringPair.first);
System.exit(0); System.exit(0);
} }
interface ConsoleTool { interface ConsoleTool {
void runTool(String args[]) throws Exception; void runTool(String[] args) throws Exception;
} }
} }