diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java index 261503e0..2c001d35 100644 --- a/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/acceptance/ConnectionSteps.java @@ -22,7 +22,7 @@ import net.zscript.javaclient.commandpaths.ResponseElement; import net.zscript.javaclient.commandpaths.ZscriptFieldSet; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; import net.zscript.javaclient.sequence.ResponseSequence; import net.zscript.javareceiver.testing.CollectingConsumer; import net.zscript.model.components.Zchars; diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java index a1893dbd..afe471c8 100644 --- a/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/acceptance/DeviceSteps.java @@ -16,9 +16,9 @@ import net.zscript.javaclient.commandpaths.ResponseElement; import net.zscript.javaclient.commandpaths.ResponseExecutionPath; +import net.zscript.javaclient.devicenodes.DirectConnection; +import net.zscript.javaclient.devicenodes.ZscriptNode; import net.zscript.javaclient.devices.ZscriptDevice; -import net.zscript.javaclient.nodes.DirectConnection; -import net.zscript.javaclient.nodes.ZscriptNode; import net.zscript.javareceiver.testing.CollectingConsumer; import net.zscript.model.ZscriptModel; import net.zscript.model.components.Zchars; diff --git a/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java b/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java index 591a83c6..d8909017 100644 --- a/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java +++ b/acceptance-tests/src/main/java/net/zscript/acceptance/LocalJavaReceiverSteps.java @@ -6,7 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; import net.zscript.javaclient.testing.LocalConnection; import net.zscript.javareceiver.core.Zscript; import net.zscript.javareceiver.modules.core.ZscriptCoreModule; diff --git a/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java b/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java index 6ef21e28..0b60bab3 100644 --- a/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java +++ b/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/CommandExecutionPath.java @@ -38,7 +38,7 @@ * success/failure, so a CommandExecutionPath is essentially "execution-aware". *

* It's the bare "thing that we want executing", before adding the addressing and sequence-level fields which get it to the right place and in the right state. These might be added - * by a client runtime representing a device node hierarchy, see {@link net.zscript.javaclient.nodes.ZscriptNode#send(CommandExecutionPath, Consumer)}. + * by a client runtime representing a device node hierarchy, see {@link net.zscript.javaclient.devicenodes.ZscriptNode#send(CommandExecutionPath, Consumer)}. *

* On execution, the corresponding response object is a {@link ResponseExecutionPath}. */ diff --git a/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java b/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java index d8d2938a..6ce41eba 100644 --- a/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java +++ b/clients/java-client-lib/client-core/src/main/java/net/zscript/javaclient/commandpaths/ResponseExecutionPath.java @@ -25,7 +25,7 @@ * by a CommandExecutionPath (see {@link CommandExecutionPath#compareResponses(ResponseExecutionPath)}) to produce a complete comprehension of what happened during execution. *

* This class represents the result of execution of a {@link CommandExecutionPath} once the addressing and sequence-level fields have been processed, ie by a client runtime - * representing a device node hierarchy, see {@link net.zscript.javaclient.nodes.ZscriptNode#send(CommandExecutionPath, Consumer)}. + * representing a device node hierarchy, see {@link net.zscript.javaclient.devicenodes.ZscriptNode#send(CommandExecutionPath, Consumer)}. */ public class ResponseExecutionPath implements Iterable, ByteAppendable { diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java index 38b67e47..dcacd80d 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/ZscriptConnectors.java @@ -6,7 +6,7 @@ import net.zscript.javaclient.connectors.serial.SerialConnector; import net.zscript.javaclient.connectors.tcp.TcpConnector; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; public class ZscriptConnectors { public static final TcpConnector TCP = new TcpConnector(); diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java index f9452691..6004cf3e 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/serial/SerialConnection.java @@ -13,7 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; /** * diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java index db06b917..697afbea 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/connectors/tcp/TcpConnection.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; public class TcpConnection extends DirectConnection { private static final Logger LOG = LoggerFactory.getLogger(TcpConnection.class); diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/AddressingSystem.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/AddressingSystem.java similarity index 98% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/AddressingSystem.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/AddressingSystem.java index 6d41d54b..03874b19 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/AddressingSystem.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/AddressingSystem.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.HashMap; import java.util.Map; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/Connection.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/Connection.java similarity index 96% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/Connection.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/Connection.java index 7430d9dc..568f37cd 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/Connection.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/Connection.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.function.Consumer; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ConnectionBuffer.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ConnectionBuffer.java similarity index 99% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ConnectionBuffer.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ConnectionBuffer.java index d9783ed1..1115df1f 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ConnectionBuffer.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ConnectionBuffer.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/DirectConnection.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/DirectConnection.java similarity index 99% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/DirectConnection.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/DirectConnection.java index b01c5ba9..ab9c6975 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/DirectConnection.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/DirectConnection.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.io.Closeable; import java.io.IOException; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/EchoAssigner.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/EchoAssigner.java similarity index 99% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/EchoAssigner.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/EchoAssigner.java index a875eae0..a25fe1d1 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/EchoAssigner.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/EchoAssigner.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.BitSet; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/QueuingStrategy.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/QueuingStrategy.java similarity index 90% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/QueuingStrategy.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/QueuingStrategy.java index c648a642..14e215dd 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/QueuingStrategy.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/QueuingStrategy.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import net.zscript.javaclient.addressing.AddressedCommand; import net.zscript.javaclient.commandpaths.CommandExecutionPath; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/StandardQueuingStrategy.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/StandardQueuingStrategy.java similarity index 98% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/StandardQueuingStrategy.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/StandardQueuingStrategy.java index 5ad794dd..acd154d5 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/StandardQueuingStrategy.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/StandardQueuingStrategy.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.ArrayDeque; import java.util.Queue; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptBasicNode.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptBasicNode.java similarity index 99% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptBasicNode.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptBasicNode.java index 6780ede5..661a70ae 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptBasicNode.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptBasicNode.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.util.Collection; import java.util.HashMap; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptNode.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptNode.java similarity index 98% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptNode.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptNode.java index f7d754fe..4283e6d4 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/ZscriptNode.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/ZscriptNode.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import java.lang.reflect.Proxy; import java.util.concurrent.TimeUnit; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/package-info.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/package-info.java similarity index 66% rename from clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/package-info.java rename to clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/package-info.java index e3964cfb..7b934ff7 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/nodes/package-info.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devicenodes/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package net.zscript.javaclient.nodes; +package net.zscript.javaclient.devicenodes; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java index 8d193905..878e2140 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/devices/ZscriptDevice.java @@ -29,7 +29,7 @@ import net.zscript.javaclient.commandpaths.CommandExecutionPath; import net.zscript.javaclient.commandpaths.ResponseExecutionPath; import net.zscript.javaclient.commandpaths.ZscriptFieldSet; -import net.zscript.javaclient.nodes.ZscriptNode; +import net.zscript.javaclient.devicenodes.ZscriptNode; import net.zscript.javaclient.sequence.CommandSequence; import net.zscript.javaclient.sequence.ResponseSequence; import net.zscript.javaclient.tokens.ExtendingTokenBuffer; diff --git a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java index 0dbaf009..0764e3f3 100644 --- a/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java +++ b/clients/java-client-lib/client-main/src/main/java/net/zscript/javaclient/testing/LocalConnection.java @@ -12,7 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; import net.zscript.model.components.Zchars; /** diff --git a/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java b/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java index f66f16cb..ee7d3ab2 100644 --- a/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java +++ b/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/SerialMain.java @@ -9,7 +9,7 @@ import net.zscript.javaclient.commandpaths.CommandExecutionPath; import net.zscript.javaclient.connectors.ZscriptConnectors; import net.zscript.javaclient.connectors.serial.SerialConnector; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; import net.zscript.javaclient.sequence.CommandSequence; import net.zscript.javaclient.tokens.ExtendingTokenBuffer; import net.zscript.model.modules.base.CoreModule; diff --git a/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java b/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java index c39d57eb..ecb457b7 100644 --- a/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java +++ b/clients/java-client-lib/client-main/src/test/java/net/zscript/javaclient/connection/TcpMain.java @@ -6,7 +6,7 @@ import net.zscript.javaclient.commandpaths.CommandExecutionPath; import net.zscript.javaclient.connectors.ZscriptConnectors; import net.zscript.javaclient.connectors.ZscriptConnectors.ZscriptConnector; -import net.zscript.javaclient.nodes.DirectConnection; +import net.zscript.javaclient.devicenodes.DirectConnection; import net.zscript.javaclient.sequence.CommandSequence; import net.zscript.javaclient.tokens.ExtendingTokenBuffer; import net.zscript.model.modules.base.CoreModule; diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java index 2dc7a00b..85ea40fd 100644 --- a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java +++ b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseFullCli.java @@ -23,9 +23,9 @@ import net.zscript.javaclient.commandbuilderapi.nodes.CommandSequenceNode; import net.zscript.javaclient.commandbuilderapi.nodes.ResponseCaptor; import net.zscript.javaclient.connectors.serial.SerialConnection; +import net.zscript.javaclient.devicenodes.ZscriptNode; import net.zscript.javaclient.devices.ResponseSequenceCallback; import net.zscript.javaclient.devices.ZscriptDevice; -import net.zscript.javaclient.nodes.ZscriptNode; import net.zscript.model.ZscriptModel; import net.zscript.model.modules.base.CoreModule; import net.zscript.model.modules.base.PinsModule; diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java index d808f990..93fa6e78 100644 --- a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java +++ b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseReceiver.java @@ -8,7 +8,6 @@ import static net.zscript.model.modules.base.PinsModule.DigitalNotificationSectionContent.Value; -import net.zscript.javaclient.commandbuilderapi.nodes.ResponseCaptor; import net.zscript.javaclient.devices.ZscriptDevice; import net.zscript.model.modules.base.OuterCoreModule; import net.zscript.model.modules.base.PinsModule; @@ -41,14 +40,14 @@ public void startReceiving() { lastTimeNano = System.nanoTime(); // // Older notification registration system, using Captors. - ResponseCaptor captor = ResponseCaptor.create(); - device.getNotificationHandle(PinsModule.DigitalNotification.ID) - .getSection(PinsModule.DigitalNotificationSectionContent.class) - .setCaptor(captor); - device.setNotificationListener_Prev(PinsModule.DigitalNotification.ID, notificationSequenceCallback -> { - PinsModule.DigitalNotificationSectionContent content = notificationSequenceCallback.getResponseFor(captor).get(); - - }); + // ResponseCaptor captor = ResponseCaptor.create(); + // device.getNotificationHandle(PinsModule.DigitalNotification.ID) + // .getSection(PinsModule.DigitalNotificationSectionContent.class) + // .setCaptor(captor); + // device.setNotificationListener_Prev(PinsModule.DigitalNotification.ID, notificationSequenceCallback -> { + // PinsModule.DigitalNotificationSectionContent content = notificationSequenceCallback.getResponseFor(captor).get(); + // + // }); device.setNotificationListener(PinsModule.DigitalNotification.ID, n -> { PinsModule.DigitalNotificationSectionContent content = n.getDigitalSection(); diff --git a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java index 2752f767..6f0381c0 100644 --- a/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java +++ b/demo/demo-morse/client/src/main/java/net/zscript/demo/morse/MorseSimple.java @@ -6,8 +6,8 @@ import com.fazecast.jSerialComm.SerialPort; import net.zscript.javaclient.connectors.serial.SerialConnection; +import net.zscript.javaclient.devicenodes.ZscriptNode; import net.zscript.javaclient.devices.ZscriptDevice; -import net.zscript.javaclient.nodes.ZscriptNode; import net.zscript.model.ZscriptModel; import net.zscript.model.modules.base.CoreModule;