From 5261b365f29748f12aedc96bd2f298974c690b1b Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 2 Mar 2019 14:53:29 -0500 Subject: [PATCH] console: fixing signed int16 type logging --- .../io/src/com/rusefi/binaryprotocol/BinaryProtocol.java | 2 +- java_console/models/src/com/rusefi/config/FieldType.java | 3 +++ java_console/ui/src/com/rusefi/Launcher.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 89af4858d0..cff253cec5 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -491,7 +491,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { int value = bb.getInt(); SensorCentral.getInstance().setValue(value, sensor); } else if (sensor.getType() == FieldType.INT16) { - int value = bb.getInt() & 0xFFFF; + short value = (short) (bb.getInt() & 0xFFFF); SensorCentral.getInstance().setValue(value, sensor); } else if (sensor.getType() == null) { // do nothing for old text sensors which I am suprised are still in the code diff --git a/java_console/models/src/com/rusefi/config/FieldType.java b/java_console/models/src/com/rusefi/config/FieldType.java index fd4a144b95..8b528a15d9 100644 --- a/java_console/models/src/com/rusefi/config/FieldType.java +++ b/java_console/models/src/com/rusefi/config/FieldType.java @@ -2,6 +2,9 @@ package com.rusefi.config; public enum FieldType { INT, + /** + * signed 16 bit type + */ INT16, BIT, FLOAT; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index a1117bc3d7..845f654104 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190221; + public static final int CONSOLE_VERSION = 20190302; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port";