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

better handing of lack of port

This commit is contained in:
rusefillc 2021-02-28 19:40:57 -05:00
parent 429c5da521
commit a3b2b9accf
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java_console/autotest/src/com/rusefi/EnduranceTestUtility.java
View File

@ -1,5 +1,6 @@
package com.rusefi; package com.rusefi;
import com.rusefi.autotest.ControllerConnectorState;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.functional_tests.EcuTestHelper; import com.rusefi.functional_tests.EcuTestHelper;
import com.rusefi.io.CommandQueue; import com.rusefi.io.CommandQueue;

2
java_console/autotest/src/com/rusefi/IoUtil.java
View File

@ -152,7 +152,7 @@ public class IoUtil {
} }
} }
static void realHardwareConnect(LinkManager linkManager, String port) { public static void realHardwareConnect(LinkManager linkManager, String port) {
linkManager.getEngineState().registerStringValueAction(Fields.PROTOCOL_OUTPIN, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID); linkManager.getEngineState().registerStringValueAction(Fields.PROTOCOL_OUTPIN, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID);
linkManager.getEngineState().registerStringValueAction(AverageAnglesUtil.KEY, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID); linkManager.getEngineState().registerStringValueAction(AverageAnglesUtil.KEY, (EngineState.ValueCallback<String>) EngineState.ValueCallback.VOID);

2
java_console/autotest/src/com/rusefi/TestingUtils.java
View File

@ -27,7 +27,7 @@ import static com.rusefi.waves.EngineReport.isCloseEnough;
public class TestingUtils { public class TestingUtils {
private static final Logging log = getLogging(TestingUtils.class); private static final Logging log = getLogging(TestingUtils.class);
static boolean isRealHardware; public static boolean isRealHardware;
static void assertTrue(String msg, boolean b) { static void assertTrue(String msg, boolean b) {
if (!b) if (!b)

10
java_console/autotest/src/com/rusefi/ControllerConnectorState.java → java_console/autotest/src/com/rusefi/autotest/ControllerConnectorState.java
View File

@ -1,5 +1,8 @@
package com.rusefi; package com.rusefi.autotest;
import com.rusefi.FileLog;
import com.rusefi.IoUtil;
import com.rusefi.TestingUtils;
import com.rusefi.autodetect.PortDetector; import com.rusefi.autodetect.PortDetector;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.EngineState; import com.rusefi.core.EngineState;
@ -33,8 +36,11 @@ public class ControllerConnectorState {
TestingUtils.isRealHardware = true; TestingUtils.isRealHardware = true;
FileLog.MAIN.start(); FileLog.MAIN.start();
String port = System.getProperty("ecu.port"); String port = System.getProperty("ecu.port");
if (port == null) {
port = PortDetector.autoDetectSerial(null);
if (port == null) if (port == null)
port = PortDetector.autoDetectPort(null); throw new IllegalStateException("ECU serial not detected");
}
IoUtil.realHardwareConnect(linkManager, port); IoUtil.realHardwareConnect(linkManager, port);
ControllerConnectorState.linkManager = linkManager; ControllerConnectorState.linkManager = linkManager;

3
java_console/autotest/src/com/rusefi/f4discovery/VssHardwareLoopTest.java
View File

@ -1,6 +1,6 @@
package com.rusefi.f4discovery; package com.rusefi.f4discovery;
import com.rusefi.ControllerConnectorState; import com.rusefi.autotest.ControllerConnectorState;
import com.rusefi.RusefiTestBase; import com.rusefi.RusefiTestBase;
import com.rusefi.Timeouts; import com.rusefi.Timeouts;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
@ -10,7 +10,6 @@ import com.rusefi.functional_tests.EcuTestHelper;
import org.junit.Test; import org.junit.Test;
import static com.rusefi.IoUtil.getDisableCommand; import static com.rusefi.IoUtil.getDisableCommand;
import static com.rusefi.IoUtil.getEnableCommand;
import static com.rusefi.binaryprotocol.BinaryProtocol.sleep; import static com.rusefi.binaryprotocol.BinaryProtocol.sleep;
import static com.rusefi.config.generated.Fields.*; import static com.rusefi.config.generated.Fields.*;

3
java_console/autotest/src/com/rusefi/functional_tests/EcuTestHelper.java
View File

@ -1,9 +1,8 @@
package com.rusefi.functional_tests; package com.rusefi.functional_tests;
import com.devexperts.logging.Logging; import com.devexperts.logging.Logging;
import com.rusefi.ControllerConnectorState; import com.rusefi.autotest.ControllerConnectorState;
import com.rusefi.IoUtil; import com.rusefi.IoUtil;
import com.rusefi.TestingUtils;
import com.rusefi.Timeouts; import com.rusefi.Timeouts;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.core.ISensorCentral; import com.rusefi.core.ISensorCentral;