From dc2796ad15d0dbef6fd6a72d37d58323f95de79f Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 14 Aug 2020 12:43:13 -0400 Subject: [PATCH] progress --- java_console/.idea/libraries/mockito_all_1_10_19.xml | 11 +++++++++++ java_console/io/io.iml | 2 +- .../com/rusefi/binaryprotocol/BinaryProtocol.java | 4 +++- .../ui/src/main/java/com/rusefi/ui/MessagesView.java | 9 +-------- 4 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 java_console/.idea/libraries/mockito_all_1_10_19.xml diff --git a/java_console/.idea/libraries/mockito_all_1_10_19.xml b/java_console/.idea/libraries/mockito_all_1_10_19.xml new file mode 100644 index 0000000000..0d92d84a26 --- /dev/null +++ b/java_console/.idea/libraries/mockito_all_1_10_19.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/java_console/io/io.iml b/java_console/io/io.iml index 392d963789..7f5755f081 100644 --- a/java_console/io/io.iml +++ b/java_console/io/io.iml @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java index d14a8bba53..3e54805efc 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -417,7 +417,9 @@ public class BinaryProtocol implements BinaryProtocolCommands { // that's unusual - most of the protocol is LITTLE_ENDIAN bb.order(ByteOrder.BIG_ENDIAN); int crcFromController = bb.getInt(); - log.info(String.format("From rusEFI CRC %x\n", crcFromController)); + log.info(String.format("From rusEFI tune CRC32 %x %d\n", crcFromController, crcFromController)); + short crc16FromController = (short) crcFromController; + log.info(String.format("From rusEFI tune CRC16 %x %d\n", crc16FromController, crc16FromController)); if (crcOfLocallyCachedConfiguration == crcFromController) { return localCached; } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java b/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java index ab545c062d..e72bf968d5 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/MessagesView.java @@ -24,14 +24,7 @@ public class MessagesView { private boolean isPaused; - protected final JTextPane messages = new JTextPane() { - @Override - public void setVisible(boolean aFlag) { - super.setVisible(aFlag); -// todo: get focus on startup somehow -// anyCommand.getText().requestFocus(); - } - }; + protected final JTextPane messages = new JTextPane(); public final JScrollPane messagesScroll = new JScrollPane(messages, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); public MessagesView() {