From 1cdcfffc11e1c17fe45c582b2106e823b3ff72da Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 23 Nov 2022 21:21:03 -0500 Subject: [PATCH] =?UTF-8?q?Full=20Optimized=20=E2=80=93=20High=20Speed=20#?= =?UTF-8?q?4818?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactoring - nicer API --- .../java/com/rusefi/io/commands/GetOutputsCommand.java | 6 +----- .../java/com/rusefi/ui/livedocs/LiveDocsRegistry.java | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/GetOutputsCommand.java b/java_console/io/src/main/java/com/rusefi/io/commands/GetOutputsCommand.java index ed2c5fb418..af627cc520 100644 --- a/java_console/io/src/main/java/com/rusefi/io/commands/GetOutputsCommand.java +++ b/java_console/io/src/main/java/com/rusefi/io/commands/GetOutputsCommand.java @@ -6,9 +6,6 @@ import com.rusefi.io.tcp.BinaryProtocolServer; import java.io.IOException; -import static com.rusefi.binaryprotocol.IoHelper.putShort; -import static com.rusefi.binaryprotocol.IoHelper.swap16; - public class GetOutputsCommand { public static byte[] createRequest() { @@ -17,8 +14,7 @@ public class GetOutputsCommand { public static byte[] createRequest(int offset, int size) { byte[] packet = new byte[4]; - putShort(packet, 0, swap16(offset)); - putShort(packet, 2, swap16(size)); + ByteRange.packOffsetAndSize(offset, size, packet); return packet; } diff --git a/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java b/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java index 6ea9f73d7b..d289878141 100644 --- a/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java +++ b/java_console/io/src/main/java/com/rusefi/ui/livedocs/LiveDocsRegistry.java @@ -1,18 +1,15 @@ package com.rusefi.ui.livedocs; -import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.config.Field; import com.rusefi.core.SensorCentral; import com.rusefi.enums.live_data_e; +import com.rusefi.io.commands.ByteRange; import com.rusefi.ldmp.StateDictionary; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import static com.rusefi.binaryprotocol.IoHelper.putShort; -import static com.rusefi.binaryprotocol.IoHelper.swap16; - /** * Singleton map of all live documentation entities. Using this registry we know all the entities to update periodically. * Andrey Belomutskiy, (c) 2013-2020 @@ -51,8 +48,8 @@ public enum LiveDocsRegistry { Field[] values = StateDictionary.INSTANCE.getFields(context); int size = Field.getStructureSize(values); byte[] packet = new byte[4]; - putShort(packet, 0, swap16(context.ordinal())); // offset - putShort(packet, 2, swap16(size)); + int offset = context.ordinal(); + ByteRange.packOffsetAndSize(offset, size, packet); int structOffset = StateDictionary.INSTANCE.getOffset(context); byte[] overallOutputs = SensorCentral.getInstance().getResponse();