From 8d5495111e4e94619b996a35c8557c19c43dae1b Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 9 Jan 2021 12:13:43 -0800 Subject: [PATCH] Fix master fatal error (#2206) * print the fatal that caused test failure * fix the error --- firmware/init/sensor/init_thermistors.cpp | 5 +++++ .../autotest/src/com/rusefi/functional_tests/TestHelper.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/firmware/init/sensor/init_thermistors.cpp b/firmware/init/sensor/init_thermistors.cpp index 404c0815af..8032f4494c 100644 --- a/firmware/init/sensor/init_thermistors.cpp +++ b/firmware/init/sensor/init_thermistors.cpp @@ -57,6 +57,11 @@ void configTherm(FunctionalSensor &sensor, FuncPair &p, ThermistorConf &config, bool isLinear) { + // nothing to do if no channel + if (!isAdcChannelValid(config.adcChannel)) { + return; + } + // Configure the conversion function for this sensor sensor.setFunction(configureTempSensorFunction(config.config, p, isLinear)); } diff --git a/java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java b/java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java index 2d74346818..f37557bc32 100644 --- a/java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java +++ b/java_console/autotest/src/com/rusefi/functional_tests/TestHelper.java @@ -18,6 +18,6 @@ public enum TestHelper { } public void assertNotFatal() { - assertNull("Fatal not expected", criticalError); + assertNull("Fatal not expected: " + criticalError, criticalError); } }