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

better fatal error handling

This commit is contained in:
rusefi 2017-04-05 17:28:38 -04:00
parent 0bb499e70e
commit a1fb0bd72f
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -1,14 +1,15 @@
package com.rusefi;
import com.rusefi.core.MessagesCentral;
import com.rusefi.core.Sensor;
import com.rusefi.core.SensorCentral;
import com.rusefi.io.CommandQueue;
import com.rusefi.io.ConnectionStatus;
import com.rusefi.waves.EngineChart;
import com.rusefi.waves.EngineReport;
import static com.rusefi.IoUtil.changeRpm;
import static com.rusefi.TestingUtils.nextChart;
import static com.rusefi.IoUtil.sendCommand;
import static com.rusefi.IoUtil.sleep;
import static com.rusefi.TestingUtils.*;
import static com.rusefi.waves.EngineReport.isCloseEnough;
@ -24,8 +25,17 @@ import static com.rusefi.waves.EngineReport.isCloseEnough;
public class AutoTest {
public static final int COMPLEX_COMMAND_RETRY = 10000;
static int currentEngineType;
private static String fatalError;
static void mainTestBody() {
MessagesCentral.getInstance().addListener(new MessagesCentral.MessageListener() {
@Override
public void onMessage(Class clazz, String message) {
if (message.startsWith(ConnectionStatus.FATAL_MESSAGE_PREFIX))
fatalError = message;
}
});
sendCommand("fl 1"); // just in case it was disabled
testCustomEngine();
testMazdaMiata2003();
@ -410,6 +420,15 @@ public class AutoTest {
assertWaveNull("hard limit check", chart, EngineChart.INJECTOR_1);
}
private static void sendCommand(String command) {
sendCommand(command, CommandQueue.DEFAULT_TIMEOUT, Timeouts.CMD_TIMEOUT);
}
private static void sendCommand(String command, int retryTimeoutMs, int totalTimeoutSeconds) {
assertNull("Fatal not expected", fatalError);
IoUtil.sendCommand(command, retryTimeoutMs, totalTimeoutSeconds);
}
private static void assertEquals(double expected, double actual) {
assertEquals("", expected, actual);
}

2
java_console/io/src/com/rusefi/io/ConnectionStatus.java
View File

@ -18,7 +18,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/
public class ConnectionStatus {
// todo: react to any message as connected? how to know if message from controller, not internal message?
private static final String FATAL_MESSAGE_PREFIX = "FATAL";
public static final String FATAL_MESSAGE_PREFIX = "FATAL";
@NotNull
private Value value = Value.NOT_CONNECTED;