diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java index a1115f9ba9..9f52510573 100644 --- a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java +++ b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java @@ -22,7 +22,6 @@ public class PortDetector { private final static Logging log = Logging.getLogging(PortDetector.class); private static final NamedThreadFactory AUTO_DETECT_PORT = new NamedThreadFactory("ECU AutoDetectPort", true); - public static final String AUTO = "auto"; /** * Connect to all serial ports and find out which one respond first @@ -92,14 +91,4 @@ public class PortDetector { // log.info("Returning " + result.get()); return autoDetectResult; } - - @Nullable - public static SerialAutoChecker.AutoDetectResult autoDetectPort(JFrame parent) { - SerialAutoChecker.AutoDetectResult autoDetectedPort = autoDetectSerial(); - if (autoDetectedPort.getSerialPort() == null) { - JOptionPane.showMessageDialog(parent, "Failed to locate rusEFI"); - return null; - } - return autoDetectedPort; - } } diff --git a/java_console/logging/src/main/java/com/rusefi/FileLog.java b/java_console/logging/src/main/java/com/rusefi/FileLog.java index e76f7d5ab7..01001bd358 100644 --- a/java_console/logging/src/main/java/com/rusefi/FileLog.java +++ b/java_console/logging/src/main/java/com/rusefi/FileLog.java @@ -27,7 +27,6 @@ public enum FileLog { @Nullable private OutputStream fileLog; // null if not opened yet or already closed - public static boolean suspendLogging; FileLog() { } @@ -93,8 +92,7 @@ public enum FileLog { public synchronized void logLine(String fullLine) { String withDate = getDate() + Logger.END_OF_TIMESTAND_TAG + fullLine; System.out.println(withDate); - if (suspendLogging) - return; + if (fileLog == null) return; try { diff --git a/java_console/ui/src/main/java/com/rusefi/CommandControl.java b/java_console/ui/src/main/java/com/rusefi/CommandControl.java index 35130a7360..5f0984b29c 100644 --- a/java_console/ui/src/main/java/com/rusefi/CommandControl.java +++ b/java_console/ui/src/main/java/com/rusefi/CommandControl.java @@ -17,7 +17,6 @@ import java.awt.event.ActionListener; */ abstract class CommandControl { public static final String TEST = "Test"; - public static final String SET = "Set"; protected final JPanel panel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 0)); private final UIContext uiContext; diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java index f3e1517d62..c76e0c675a 100644 --- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java @@ -46,6 +46,8 @@ public class ConsoleUI { public final UIContext uiContext = new UIContext(); + public boolean showTriggerShapePane = false; + /** * We can listen to tab activation event if we so desire */ @@ -93,7 +95,8 @@ public class ConsoleUI { // tabbedPane.addTab("ECU stimulation", stimulator.getPanel()); // } - if (tabbedPane.paneSettings.showTriggerShapePane) + // TODO: always false? + if (showTriggerShapePane) tabbedPane.addTab("Trigger Shape", new AverageAnglePanel(uiContext).getPanel()); int selectedIndex = getConfig().getRoot().getIntProperty(TAB_INDEX, DEFAULT_TAB_INDEX); diff --git a/java_console/ui/src/main/java/com/rusefi/PaneSettings.java b/java_console/ui/src/main/java/com/rusefi/PaneSettings.java deleted file mode 100644 index 2c7029a370..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/PaneSettings.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.rusefi; - -import com.rusefi.core.preferences.storage.Node; - -public class PaneSettings { - public boolean showTriggerShapePane; - public boolean showStimulatorPane; - - public PaneSettings(Node config) { - } -} diff --git a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java index 920892ac97..a38c79327e 100644 --- a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java +++ b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java @@ -28,7 +28,6 @@ public enum SerialPortScanner { private final static Logging log = Logging.getLogging(SerialPortScanner.class); public enum SerialPortType { - None(null, 100), FomeEcu("FOME ECU", 20), FomeEcuWithOpenblt("FOME ECU w/ BL", 20), OpenBlt("OpenBLT Bootloader", 10), @@ -116,21 +115,12 @@ public enum SerialPortScanner { String[] serialPorts = LinkManager.getCommPorts(); - int ecuCount = 0; - boolean hasAnyOpenblt = false; - for (String serialPort : serialPorts) { // First, check the port cache if (portCache.containsKey(serialPort)) { // We've already probed this port - don't re-probe it again PortResult cached = portCache.get(serialPort); - if (cached.isEcu()) { - ecuCount++; - } else if (cached.type == SerialPortType.OpenBlt) { - hasAnyOpenblt = true; - } - ports.add(cached); } else { // This one isn't in the cache, probe it to determine what it is @@ -142,7 +132,6 @@ public enum SerialPortScanner { log.info("Port " + serialPort + (isOpenblt ? " looks like" : " does not look like") + " an OpenBLT bootloader"); if (isOpenblt) { result = new PortResult(serialPort, SerialPortType.OpenBlt); - hasAnyOpenblt = true; } else { // See if this looks like an ECU String signature = getEcuSignature(serialPort); @@ -152,7 +141,6 @@ public enum SerialPortScanner { boolean ecuHasOpenblt = fomeEcuHasOpenblt(serialPort); log.info("FOME ECU at " + serialPort + (ecuHasOpenblt ? " has" : " does not have") + " an OpenBLT bootloader"); result = new PortResult(serialPort, ecuHasOpenblt ? SerialPortType.FomeEcuWithOpenblt : SerialPortType.FomeEcu, signature); - ecuCount++; } else { // Dunno what this is, leave it in the list anyway result = new PortResult(serialPort, SerialPortType.Unknown); @@ -184,15 +172,12 @@ public enum SerialPortScanner { }); } - boolean hasAnyEcu = ecuCount > 0; - // Sort ports by their type to put your ECU at the top ports.sort(Comparator.comparingInt(a -> a.type.sortOrder)); if (includeSlowLookup) { for (String tcpPort : TcpConnector.getAvailablePorts()) { ports.add(new PortResult(tcpPort, SerialPortType.FomeEcu)); - hasAnyEcu = true; } dfuConnected = DfuFlasher.detectSTM32BootloaderDriverState(UpdateOperationCallbacks.DUMMY); @@ -201,7 +186,7 @@ public enum SerialPortScanner { } boolean isListUpdated; - AvailableHardware currentHardware = new AvailableHardware(ports, dfuConnected, hasAnyEcu, hasAnyOpenblt); + AvailableHardware currentHardware = new AvailableHardware(ports, dfuConnected); synchronized (lock) { isListUpdated = !currentHardware.equals(knownHardware); knownHardware = currentHardware; @@ -243,14 +228,10 @@ public enum SerialPortScanner { public static class AvailableHardware { private final List ports; public final boolean dfuFound; - public final boolean hasAnyEcu; - public final boolean hasAnyOpenblt; - public AvailableHardware(List ports, boolean dfuFound, boolean hasAnyEcu, boolean hasAnyOpenblt) { + public AvailableHardware(List ports, boolean dfuFound) { this.ports = ports; this.dfuFound = dfuFound; - this.hasAnyEcu = hasAnyEcu; - this.hasAnyOpenblt = hasAnyOpenblt; } @NotNull diff --git a/java_console/ui/src/main/java/com/rusefi/ValueRangeControl.java b/java_console/ui/src/main/java/com/rusefi/ValueRangeControl.java deleted file mode 100644 index d471c143a8..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/ValueRangeControl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.rusefi; - -import javax.swing.*; -import java.awt.*; - -public class ValueRangeControl { - private final JSpinner minSpinner; - private final JSpinner maxSpinner; - - private final JPanel panel = new JPanel(new FlowLayout()); - private final double increment; - - public ValueRangeControl(String title, double min, double increment, double max) { - this.increment = increment; - minSpinner = new JSpinner(new SpinnerNumberModel(min, min, max, increment)); - maxSpinner = new JSpinner(new SpinnerNumberModel(max, min, max, increment)); - - panel.add(new JLabel(title + " from")); - panel.add(minSpinner); - panel.add(new JLabel("to")); - panel.add(maxSpinner); - } - - public double getFrom() { - return (double) minSpinner.getModel().getValue(); - } - - public double getTo() { - return (double) maxSpinner.getModel().getValue(); - } - - public double getStep() { - return increment; - } - - public Component getContent() { - return panel; - } -} \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java index f114041541..fb732540d3 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java @@ -258,7 +258,7 @@ public class ProgramSelector { return content; } - private SerialPortScanner.AvailableHardware currentHardware = new SerialPortScanner.AvailableHardware(new ArrayList<>(), false, false, false); + private SerialPortScanner.AvailableHardware currentHardware = new SerialPortScanner.AvailableHardware(new ArrayList<>(), false); private void selectedPortChanged(ItemEvent e) { SerialPortScanner.PortResult pr = (SerialPortScanner.PortResult) e.getItem(); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java index 87a4993552..0ff21be13b 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java @@ -1,6 +1,5 @@ package com.rusefi.ui.console; -import com.rusefi.PaneSettings; import com.rusefi.config.generated.Fields; import com.rusefi.core.MessagesCentral; import com.rusefi.io.ConnectionStatusLogic; @@ -15,8 +14,6 @@ public class TabbedPanel { // todo: the logic around 'criticalError' could be implemented nicer private String criticalError; - public final PaneSettings paneSettings = new PaneSettings(getConfig().getRoot().getChild("panes")); - public final JTabbedPane tabbedPane = new JTabbedPane() { @Override public void paint(Graphics g) {