From f77030123c6356088a0345005524336d5b8ec942 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 14 Jul 2015 21:02:30 -0400 Subject: [PATCH] auto-sync --- .../src/com/rusefi/io/serial/SerialPortReader.java | 4 ++-- java_console/ui/src/com/rusefi/Launcher.java | 2 +- java_console/ui/src/com/rusefi/ui/SettingsTab.java | 2 ++ .../ui/src/com/rusefi/ui/config/EnumConfigField.java | 12 +++++++++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/java_console/io/src/com/rusefi/io/serial/SerialPortReader.java b/java_console/io/src/com/rusefi/io/serial/SerialPortReader.java index 03fb9a0a55..ec46cdb9b7 100644 --- a/java_console/io/src/com/rusefi/io/serial/SerialPortReader.java +++ b/java_console/io/src/com/rusefi/io/serial/SerialPortReader.java @@ -27,8 +27,8 @@ public class SerialPortReader implements SerialPortEventListener { } catch (SerialPortException e) { e.printStackTrace(System.err); } - } else { - FileLog.MAIN.logLine("less expected SerialPortReader serialEvent " + spe); + } else if (spe.getEventType() != SerialPortEvent.TXEMPTY) { + FileLog.MAIN.logLine("less expected SerialPortReader serialEvent " + spe.getEventType()); } } diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index c9a7b0563f..af82d78136 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150711; + public static final int CONSOLE_VERSION = 20150713; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/SettingsTab.java b/java_console/ui/src/com/rusefi/ui/SettingsTab.java index 20b964cb4d..8cd19ad365 100644 --- a/java_console/ui/src/com/rusefi/ui/SettingsTab.java +++ b/java_console/ui/src/com/rusefi/ui/SettingsTab.java @@ -24,6 +24,7 @@ public class SettingsTab { public void showContent() { content.removeAll(); + panel.removeAll(); panel.add(UiUtils.wrap(new EnumConfigField(Fields.ALGORITHM, "algorithm").getContent())); panel.add(UiUtils.wrap(new EnumConfigField(Fields.TRIGGER_TYPE, "trigger type").getContent())); @@ -64,5 +65,6 @@ public class SettingsTab { panel.add(UiUtils.wrap(RecentCommands.createButton(new AtomicBoolean(), "writeconfig"))); content.add(panel); + UiUtils.trueLayout(content); } } \ No newline at end of file diff --git a/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java b/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java index beec2e821f..d5e7d174ae 100644 --- a/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java +++ b/java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java @@ -38,11 +38,17 @@ public class EnumConfigField extends BaseConfigField { Pair p = Field.parseResponse(message); if (p != null && p.first == field.getOffset()) { int ordinal = (Integer) p.second; - if (ordinal >= options.length) - throw new IllegalStateException("Unexpected ordinal " + ordinal + " for " + field); + String item; + if (ordinal >= options.length) { + item = "unexpected_" + ordinal; + view.addItem(item); + } else { + item = options[ordinal]; + } + ec = true; view.setEnabled(true); - view.setSelectedItem(options[ordinal]); + view.setSelectedItem(item); onValueArrived(); ec = false; }