diff --git a/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh b/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh index c4f10090ec..43bb243d6b 100644 --- a/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh +++ b/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh @@ -2,7 +2,7 @@ export PROJECT_BOARD=hellen/alphax-2chan export PROJECT_CPU=ARCH_STM32F4 -export EXTRA_PARAMS="-DSHORT_BOARD_NAME=AlphaX-2chan" +export EXTRA_PARAMS="-DSHORT_BOARD_NAME=alphax-2chan" cd .. bash ../common_make.sh diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java b/java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java index 32aa2a472b..e5367b2cbb 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/FiringOrderTSLogic.java @@ -1,5 +1,7 @@ package com.rusefi; +import com.devexperts.logging.Logging; + import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; @@ -7,11 +9,14 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import static com.devexperts.logging.Logging.getLogging; + /** * Andrey Belomutskiy, (c) 2012-2016 * 7/20/2016 */ public class FiringOrderTSLogic { + private static final Logging log = getLogging(FiringOrderTSLogic.class); private static final String FIRING_ORDER_PREFIX = "FO_"; @@ -39,7 +44,8 @@ public class FiringOrderTSLogic { while ((line = br.readLine()) != null) { int index = line.indexOf(FIRING_ORDER_PREFIX); if (index == -1) { - System.out.println("Skipping [" + line); + if (log.debugEnabled()) + log.debug("Skipping [" + line); continue; } line = line.substring(index + FIRING_ORDER_PREFIX.length()); @@ -50,13 +56,15 @@ public class FiringOrderTSLogic { public static void parseLine(String line, State state) { line = line.replaceAll("[\\s]*\\,.*", ""); line = line.replaceAll("[\\s\\,]", ""); - System.out.println("Processing " + line); + if (log.debugEnabled()) + log.debug("Processing " + line); String s[] = line.split("\\="); String order[] = s[0].split("_"); int ordinal = Integer.parseInt(s[1]); - System.out.println("order " + Arrays.toString(order) + ": " + ordinal); + if (log.debugEnabled()) + log.debug("order " + Arrays.toString(order) + ": " + ordinal); state.maxOrdinal = Math.max(ordinal, state.maxOrdinal); state.ordinal2order.put(ordinal, order);