From abf454aa9f08f046c6e67d1746383dc3a5bf975b Mon Sep 17 00:00:00 2001 From: Mickael Date: Thu, 24 Nov 2022 01:39:45 +0200 Subject: [PATCH] move static ezsp version to zigbee dongle (as non static property) --- .../ember/EmberConsoleNcpVersionCommand.java | 3 +- .../ember/autocode/CommandGenerator.java | 56 +----- .../zigbee/dongle/ember/EmberNcp.java | 174 +++++++----------- .../zigbee/dongle/ember/ZigBeeDongleEzsp.java | 75 ++++---- .../zigbee/dongle/ember/ezsp/EzspFrame.java | 45 +---- .../dongle/ember/ezsp/EzspFrameRequest.java | 6 +- .../dongle/ember/ezsp/EzspFrameResponse.java | 2 +- .../ezsp/command/EzspAddEndpointRequest.java | 4 +- .../ezsp/command/EzspAddEndpointResponse.java | 4 +- .../EzspAddOrUpdateKeyTableEntryRequest.java | 4 +- .../EzspAddOrUpdateKeyTableEntryResponse.java | 4 +- .../EzspAddTransientLinkKeyRequest.java | 4 +- .../EzspAddTransientLinkKeyResponse.java | 4 +- .../EzspAddressTableEntryIsActiveRequest.java | 4 +- ...EzspAddressTableEntryIsActiveResponse.java | 4 +- .../ezsp/command/EzspAesMmoHashRequest.java | 4 +- .../ezsp/command/EzspAesMmoHashResponse.java | 4 +- .../command/EzspBecomeTrustCenterRequest.java | 4 +- .../EzspBecomeTrustCenterResponse.java | 4 +- .../command/EzspBindingIsActiveRequest.java | 4 +- .../command/EzspBindingIsActiveResponse.java | 4 +- .../EzspCalculateSmacs283k1Handler.java | 4 +- .../EzspCalculateSmacs283k1Request.java | 4 +- .../EzspCalculateSmacs283k1Response.java | 4 +- .../command/EzspCalculateSmacsHandler.java | 4 +- .../command/EzspCalculateSmacsRequest.java | 4 +- .../command/EzspCalculateSmacsResponse.java | 4 +- .../ezsp/command/EzspCallbackRequest.java | 4 +- .../ezsp/command/EzspCallbackResponse.java | 4 +- .../ezsp/command/EzspChildJoinHandler.java | 4 +- .../command/EzspClearBindingTableRequest.java | 4 +- .../EzspClearBindingTableResponse.java | 4 +- .../command/EzspClearKeyTableRequest.java | 4 +- .../command/EzspClearKeyTableResponse.java | 4 +- .../EzspClearStoredBeaconsRequest.java | 4 +- .../EzspClearStoredBeaconsResponse.java | 4 +- ...raryDataMaybeStoreLinkKey283k1Request.java | 4 +- ...aryDataMaybeStoreLinkKey283k1Response.java | 4 +- ...TemporaryDataMaybeStoreLinkKeyRequest.java | 4 +- ...emporaryDataMaybeStoreLinkKeyResponse.java | 4 +- .../EzspClearTransientLinkKeysRequest.java | 4 +- .../EzspClearTransientLinkKeysResponse.java | 4 +- .../command/EzspCounterRolloverHandler.java | 4 +- .../ezsp/command/EzspCustomFrameHandler.java | 4 +- .../ezsp/command/EzspCustomFrameRequest.java | 4 +- .../ezsp/command/EzspCustomFrameResponse.java | 4 +- .../ezsp/command/EzspDGpSendRequest.java | 4 +- .../ezsp/command/EzspDGpSendResponse.java | 4 +- .../ezsp/command/EzspDGpSentHandler.java | 4 +- .../command/EzspDeleteBindingRequest.java | 4 +- .../command/EzspDeleteBindingResponse.java | 4 +- .../command/EzspEnergyScanRequestRequest.java | 4 +- .../EzspEnergyScanRequestResponse.java | 4 +- .../command/EzspEnergyScanResultHandler.java | 4 +- .../EzspEraseKeyTableEntryRequest.java | 4 +- .../EzspEraseKeyTableEntryResponse.java | 4 +- .../EzspFindAndRejoinNetworkRequest.java | 4 +- .../EzspFindAndRejoinNetworkResponse.java | 4 +- .../command/EzspFindKeyTableEntryRequest.java | 4 +- .../EzspFindKeyTableEntryResponse.java | 4 +- .../ezsp/command/EzspFormNetworkRequest.java | 4 +- .../ezsp/command/EzspFormNetworkResponse.java | 4 +- .../EzspGenerateCbkeKeys283k1Handler.java | 4 +- .../EzspGenerateCbkeKeys283k1Request.java | 4 +- .../EzspGenerateCbkeKeys283k1Response.java | 4 +- .../command/EzspGenerateCbkeKeysHandler.java | 4 +- .../command/EzspGenerateCbkeKeysRequest.java | 4 +- .../command/EzspGenerateCbkeKeysResponse.java | 4 +- ...EzspGetAddressTableRemoteEui64Request.java | 4 +- ...zspGetAddressTableRemoteEui64Response.java | 4 +- ...zspGetAddressTableRemoteNodeIdRequest.java | 4 +- ...spGetAddressTableRemoteNodeIdResponse.java | 4 +- .../EzspGetBindingRemoteNodeIdRequest.java | 4 +- .../EzspGetBindingRemoteNodeIdResponse.java | 4 +- .../ezsp/command/EzspGetBindingRequest.java | 4 +- .../ezsp/command/EzspGetBindingResponse.java | 4 +- .../EzspGetCertificate283k1Request.java | 4 +- .../EzspGetCertificate283k1Response.java | 4 +- .../command/EzspGetCertificateRequest.java | 4 +- .../command/EzspGetCertificateResponse.java | 4 +- .../ezsp/command/EzspGetChildDataRequest.java | 4 +- .../command/EzspGetChildDataResponse.java | 4 +- .../EzspGetConfigurationValueRequest.java | 4 +- .../EzspGetConfigurationValueResponse.java | 4 +- .../EzspGetCurrentSecurityStateRequest.java | 4 +- .../EzspGetCurrentSecurityStateResponse.java | 4 +- .../ezsp/command/EzspGetEui64Request.java | 4 +- .../ezsp/command/EzspGetEui64Response.java | 4 +- .../EzspGetExtendedTimeoutRequest.java | 4 +- .../EzspGetExtendedTimeoutResponse.java | 4 +- .../command/EzspGetExtendedValueRequest.java | 4 +- .../command/EzspGetExtendedValueResponse.java | 4 +- .../command/EzspGetFirstBeaconRequest.java | 4 +- .../command/EzspGetFirstBeaconResponse.java | 4 +- .../ember/ezsp/command/EzspGetKeyRequest.java | 4 +- .../ezsp/command/EzspGetKeyResponse.java | 4 +- .../command/EzspGetKeyTableEntryRequest.java | 4 +- .../command/EzspGetKeyTableEntryResponse.java | 4 +- .../command/EzspGetLibraryStatusRequest.java | 4 +- .../command/EzspGetLibraryStatusResponse.java | 4 +- .../ezsp/command/EzspGetMfgTokenRequest.java | 4 +- .../ezsp/command/EzspGetMfgTokenResponse.java | 4 +- .../EzspGetMulticastTableEntryRequest.java | 4 +- .../EzspGetMulticastTableEntryResponse.java | 4 +- .../ezsp/command/EzspGetNeighborRequest.java | 4 +- .../ezsp/command/EzspGetNeighborResponse.java | 4 +- .../EzspGetNetworkParametersRequest.java | 4 +- .../EzspGetNetworkParametersResponse.java | 4 +- .../command/EzspGetNextBeaconRequest.java | 4 +- .../command/EzspGetNextBeaconResponse.java | 4 +- .../ezsp/command/EzspGetNodeIdRequest.java | 4 +- .../ezsp/command/EzspGetNodeIdResponse.java | 4 +- .../EzspGetNumStoredBeaconsRequest.java | 4 +- .../EzspGetNumStoredBeaconsResponse.java | 4 +- .../EzspGetParentChildParametersRequest.java | 4 +- .../EzspGetParentChildParametersResponse.java | 4 +- .../ezsp/command/EzspGetPolicyRequest.java | 4 +- .../ezsp/command/EzspGetPolicyResponse.java | 4 +- .../EzspGetRouteTableEntryRequest.java | 4 +- .../EzspGetRouteTableEntryResponse.java | 4 +- ...zspGetRoutingShortcutThresholdRequest.java | 4 +- ...spGetRoutingShortcutThresholdResponse.java | 4 +- .../EzspGetSourceRouteTableEntryRequest.java | 4 +- .../EzspGetSourceRouteTableEntryResponse.java | 4 +- ...pGetSourceRouteTableFilledSizeRequest.java | 4 +- ...GetSourceRouteTableFilledSizeResponse.java | 4 +- ...spGetSourceRouteTableTotalSizeRequest.java | 4 +- ...pGetSourceRouteTableTotalSizeResponse.java | 4 +- ...eBootloaderVersionPlatMicroPhyRequest.java | 4 +- ...BootloaderVersionPlatMicroPhyResponse.java | 4 +- .../EzspGetTransientKeyTableEntryRequest.java | 4 +- ...EzspGetTransientKeyTableEntryResponse.java | 4 +- .../EzspGetTransientLinkKeyRequest.java | 4 +- .../EzspGetTransientLinkKeyResponse.java | 4 +- .../ezsp/command/EzspGetValueRequest.java | 4 +- .../ezsp/command/EzspGetValueResponse.java | 4 +- .../ezsp/command/EzspGetXncpInfoRequest.java | 4 +- .../ezsp/command/EzspGetXncpInfoResponse.java | 4 +- .../EzspGpProxyTableGetEntryRequest.java | 4 +- .../EzspGpProxyTableGetEntryResponse.java | 4 +- .../EzspGpProxyTableLookupRequest.java | 4 +- .../EzspGpProxyTableLookupResponse.java | 4 +- ...spGpProxyTableProcessGpPairingRequest.java | 4 +- ...pGpProxyTableProcessGpPairingResponse.java | 4 +- .../EzspGpSinkTableClearAllRequest.java | 4 +- .../EzspGpSinkTableClearAllResponse.java | 4 +- ...GpSinkTableFindOrAllocateEntryRequest.java | 4 +- ...pSinkTableFindOrAllocateEntryResponse.java | 4 +- .../EzspGpSinkTableGetEntryRequest.java | 4 +- .../EzspGpSinkTableGetEntryResponse.java | 4 +- .../command/EzspGpSinkTableInitRequest.java | 4 +- .../command/EzspGpSinkTableInitResponse.java | 4 +- .../command/EzspGpSinkTableLookupRequest.java | 4 +- .../EzspGpSinkTableLookupResponse.java | 4 +- .../EzspGpSinkTableRemoveEntryRequest.java | 4 +- .../EzspGpSinkTableRemoveEntryResponse.java | 4 +- .../EzspGpSinkTableSetEntryRequest.java | 4 +- .../EzspGpSinkTableSetEntryResponse.java | 4 +- .../EzspGpepIncomingMessageHandler.java | 4 +- .../ezsp/command/EzspIdConflictHandler.java | 4 +- ...pIncomingManyToOneRouteRequestHandler.java | 4 +- .../command/EzspIncomingMessageHandler.java | 4 +- .../EzspIncomingNetworkStatusHandler.java | 4 +- .../EzspIncomingRouteErrorHandler.java | 4 +- .../EzspIncomingRouteRecordHandler.java | 4 +- .../EzspIncomingSenderEui64Handler.java | 4 +- .../command/EzspInvalidCommandRequest.java | 4 +- .../command/EzspInvalidCommandResponse.java | 4 +- .../ezsp/command/EzspJoinNetworkRequest.java | 4 +- .../ezsp/command/EzspJoinNetworkResponse.java | 4 +- ...EzspLaunchStandaloneBootloaderRequest.java | 4 +- ...zspLaunchStandaloneBootloaderResponse.java | 4 +- .../ezsp/command/EzspLeaveNetworkRequest.java | 4 +- .../command/EzspLeaveNetworkResponse.java | 4 +- .../EzspLookupEui64ByNodeIdRequest.java | 4 +- .../EzspLookupEui64ByNodeIdResponse.java | 4 +- .../EzspLookupNodeIdByEui64Request.java | 4 +- .../EzspLookupNodeIdByEui64Response.java | 4 +- .../EzspMacFilterMatchMessageHandler.java | 4 +- .../ezsp/command/EzspMessageSentHandler.java | 4 +- .../ezsp/command/EzspMfglibEndRequest.java | 4 +- .../ezsp/command/EzspMfglibEndResponse.java | 4 +- .../command/EzspMfglibGetChannelRequest.java | 4 +- .../command/EzspMfglibGetChannelResponse.java | 4 +- .../command/EzspMfglibGetPowerRequest.java | 4 +- .../command/EzspMfglibGetPowerResponse.java | 4 +- .../ezsp/command/EzspMfglibRxHandler.java | 4 +- .../command/EzspMfglibSendPacketRequest.java | 4 +- .../command/EzspMfglibSendPacketResponse.java | 4 +- .../command/EzspMfglibSetChannelRequest.java | 4 +- .../command/EzspMfglibSetChannelResponse.java | 4 +- .../command/EzspMfglibSetPowerRequest.java | 4 +- .../command/EzspMfglibSetPowerResponse.java | 4 +- .../ezsp/command/EzspMfglibStartRequest.java | 4 +- .../ezsp/command/EzspMfglibStartResponse.java | 4 +- .../command/EzspMfglibStartStreamRequest.java | 4 +- .../EzspMfglibStartStreamResponse.java | 4 +- .../command/EzspMfglibStartToneRequest.java | 4 +- .../command/EzspMfglibStartToneResponse.java | 4 +- .../command/EzspMfglibStopStreamRequest.java | 4 +- .../command/EzspMfglibStopStreamResponse.java | 4 +- .../command/EzspMfglibStopToneRequest.java | 4 +- .../command/EzspMfglibStopToneResponse.java | 4 +- .../command/EzspNeighborCountRequest.java | 4 +- .../command/EzspNeighborCountResponse.java | 4 +- .../ezsp/command/EzspNetworkFoundHandler.java | 4 +- .../ezsp/command/EzspNetworkInitRequest.java | 4 +- .../ezsp/command/EzspNetworkInitResponse.java | 4 +- .../ezsp/command/EzspNetworkStateRequest.java | 4 +- .../command/EzspNetworkStateResponse.java | 4 +- .../ezsp/command/EzspNoCallbacksRequest.java | 4 +- .../ezsp/command/EzspNoCallbacksResponse.java | 4 +- .../ember/ezsp/command/EzspNopRequest.java | 4 +- .../ember/ezsp/command/EzspNopResponse.java | 4 +- .../command/EzspPermitJoiningRequest.java | 4 +- .../command/EzspPermitJoiningResponse.java | 4 +- .../ember/ezsp/command/EzspPollHandler.java | 4 +- .../EzspReadAndClearCountersRequest.java | 4 +- .../EzspReadAndClearCountersResponse.java | 4 +- .../ezsp/command/EzspReadCountersRequest.java | 4 +- .../command/EzspReadCountersResponse.java | 4 +- .../EzspRemoteDeleteBindingHandler.java | 4 +- .../command/EzspRemoteSetBindingHandler.java | 4 +- .../ezsp/command/EzspRemoveDeviceRequest.java | 4 +- .../command/EzspRemoveDeviceResponse.java | 4 +- .../command/EzspRequestLinkKeyRequest.java | 4 +- .../command/EzspRequestLinkKeyResponse.java | 4 +- .../EzspResetToFactoryDefaultsRequest.java | 4 +- .../EzspResetToFactoryDefaultsResponse.java | 4 +- .../ezsp/command/EzspScanCompleteHandler.java | 4 +- .../command/EzspSendBroadcastRequest.java | 4 +- .../command/EzspSendBroadcastResponse.java | 4 +- .../EzspSendManyToOneRouteRequestRequest.java | 4 +- ...EzspSendManyToOneRouteRequestResponse.java | 4 +- .../command/EzspSendMulticastRequest.java | 4 +- .../command/EzspSendMulticastResponse.java | 4 +- .../ezsp/command/EzspSendReplyRequest.java | 4 +- .../ezsp/command/EzspSendReplyResponse.java | 4 +- .../EzspSendTrustCenterLinkKeyRequest.java | 4 +- .../EzspSendTrustCenterLinkKeyResponse.java | 4 +- .../ezsp/command/EzspSendUnicastRequest.java | 4 +- .../ezsp/command/EzspSendUnicastResponse.java | 4 +- ...EzspSetAddressTableRemoteEui64Request.java | 4 +- ...zspSetAddressTableRemoteEui64Response.java | 4 +- ...zspSetAddressTableRemoteNodeIdRequest.java | 4 +- ...spSetAddressTableRemoteNodeIdResponse.java | 4 +- .../EzspSetBindingRemoteNodeIdRequest.java | 4 +- .../EzspSetBindingRemoteNodeIdResponse.java | 4 +- .../ezsp/command/EzspSetBindingRequest.java | 4 +- .../ezsp/command/EzspSetBindingResponse.java | 4 +- .../command/EzspSetConcentratorRequest.java | 4 +- .../command/EzspSetConcentratorResponse.java | 4 +- .../EzspSetConfigurationValueRequest.java | 4 +- .../EzspSetConfigurationValueResponse.java | 4 +- .../EzspSetExtendedTimeoutRequest.java | 4 +- .../EzspSetExtendedTimeoutResponse.java | 4 +- .../EzspSetInitialSecurityStateRequest.java | 4 +- .../EzspSetInitialSecurityStateResponse.java | 4 +- .../command/EzspSetKeyTableEntryRequest.java | 4 +- .../command/EzspSetKeyTableEntryResponse.java | 4 +- .../EzspSetManufacturerCodeRequest.java | 4 +- .../EzspSetManufacturerCodeResponse.java | 4 +- .../ezsp/command/EzspSetMfgTokenRequest.java | 4 +- .../ezsp/command/EzspSetMfgTokenResponse.java | 4 +- .../EzspSetMulticastTableEntryRequest.java | 4 +- .../EzspSetMulticastTableEntryResponse.java | 4 +- .../ezsp/command/EzspSetPolicyRequest.java | 4 +- .../ezsp/command/EzspSetPolicyResponse.java | 4 +- .../EzspSetPowerDescriptorRequest.java | 4 +- .../EzspSetPowerDescriptorResponse.java | 4 +- ...spSetPreinstalledCbkeData283k1Request.java | 4 +- ...pSetPreinstalledCbkeData283k1Response.java | 4 +- .../EzspSetPreinstalledCbkeDataRequest.java | 4 +- .../EzspSetPreinstalledCbkeDataResponse.java | 4 +- .../command/EzspSetRadioChannelRequest.java | 4 +- .../command/EzspSetRadioChannelResponse.java | 4 +- .../command/EzspSetRadioPowerRequest.java | 4 +- .../command/EzspSetRadioPowerResponse.java | 4 +- ...zspSetRoutingShortcutThresholdRequest.java | 4 +- ...spSetRoutingShortcutThresholdResponse.java | 4 +- ...zspSetSourceRouteDiscoveryModeRequest.java | 4 +- ...spSetSourceRouteDiscoveryModeResponse.java | 4 +- .../command/EzspSetSourceRouteRequest.java | 4 +- .../command/EzspSetSourceRouteResponse.java | 4 +- .../ezsp/command/EzspSetValueRequest.java | 4 +- .../ezsp/command/EzspSetValueResponse.java | 4 +- .../ezsp/command/EzspStackStatusHandler.java | 4 +- .../command/EzspStackTokenChangedHandler.java | 4 +- .../ezsp/command/EzspStartScanRequest.java | 4 +- .../ezsp/command/EzspStartScanResponse.java | 4 +- .../ezsp/command/EzspStopScanRequest.java | 4 +- .../ezsp/command/EzspStopScanResponse.java | 4 +- .../command/EzspSwitchNetworkKeyHandler.java | 4 +- .../command/EzspTrustCenterJoinHandler.java | 4 +- .../ezsp/command/EzspVersionRequest.java | 4 +- .../ezsp/command/EzspVersionResponse.java | 4 +- .../EzspZigbeeKeyEstablishmentHandler.java | 4 +- .../internal/EmberNetworkInitialisation.java | 16 +- .../ember/internal/EzspFrameHandler.java | 7 + .../ember/internal/ash/AshFrameData.java | 5 +- .../ember/internal/ash/AshFrameHandler.java | 4 +- .../ember/internal/spi/SpiFrameHandler.java | 4 +- .../zigbee/dongle/ember/EmberNcpTest.java | 4 +- .../dongle/ember/ZigBeeDongleEzspTest.java | 20 -- .../ember/ezsp/EzspFrameRequestTest.java | 23 +-- .../ember/ezsp/EzspFrameResponseTest.java | 16 +- .../dongle/ember/ezsp/EzspFrameTest.java | 6 +- .../command/EzspAddEndpointRequestTest.java | 6 +- .../command/EzspAddEndpointResponseTest.java | 3 +- .../command/EzspAesMmoHashRequestTest.java | 3 +- .../command/EzspChildJoinHandlerTest.java | 3 +- .../ezsp/command/EzspGetKeyRequestTest.java | 3 +- .../ezsp/command/EzspGetKeyResponseTest.java | 3 +- .../EzspGetKeyTableEntryRequestTest.java | 3 +- .../EzspGetKeyTableEntryResponseTest.java | 4 +- .../command/EzspGetNeighborResponseTest.java | 4 +- .../EzspGetNetworkParametersResponseTest.java | 4 +- .../EzspGetRouteTableEntryResponseTest.java | 4 +- .../EzspGpepIncomingMessageHandlerTest.java | 4 +- .../EzspIncomingMessageHandlerTest.java | 11 +- .../EzspIncomingRouteRecordHandlerTest.java | 4 +- .../EzspIncomingSenderEui64HandlerTest.java | 4 +- .../EzspLookupEui64ByNodeIdRequestTest.java | 3 +- .../EzspLookupEui64ByNodeIdResponseTest.java | 4 +- .../EzspMacFilterMatchMessageHandlerTest.java | 5 +- .../command/EzspMessageSentHandlerTest.java | 7 +- .../EzspNeighborCountResponseTest.java | 4 +- .../command/EzspNetworkFoundHandlerTest.java | 5 +- .../command/EzspScanCompleteHandlerTest.java | 5 +- .../ezsp/command/EzspSendBroadcastTest.java | 2 +- .../ezsp/command/EzspSendUnicastTest.java | 6 +- .../EzspSetConcentratorRequestTest.java | 6 +- .../EzspSetConfigurationValueRequestTest.java | 3 +- ...EzspSetConfigurationValueResponseTest.java | 5 +- ...zspSetInitialSecurityStateRequestTest.java | 4 +- .../ezsp/command/EzspSetValueRequestTest.java | 3 +- .../EzspStackStatusHandlerResponseTest.java | 5 +- .../command/EzspStartScanRequestTest.java | 3 +- .../command/EzspStartScanResponseTest.java | 6 +- .../ezsp/command/EzspVersionRequestTest.java | 9 +- .../ezsp/command/EzspVersionResponseTest.java | 13 +- .../ember/internal/ash/AshFrameDataTest.java | 6 +- .../EzspMultiResponseTransactionTest.java | 14 +- .../transaction/EzspScanTransactionTest.java | 13 +- .../EzspSingleResponseTransactionTest.java | 4 +- 345 files changed, 806 insertions(+), 1018 deletions(-) diff --git a/com.zsmartsystems.zigbee.console.ember/src/main/java/com/zsmartsystems/zigbee/console/ember/EmberConsoleNcpVersionCommand.java b/com.zsmartsystems.zigbee.console.ember/src/main/java/com/zsmartsystems/zigbee/console/ember/EmberConsoleNcpVersionCommand.java index da4d587c05..6cf3e844c3 100644 --- a/com.zsmartsystems.zigbee.console.ember/src/main/java/com/zsmartsystems/zigbee/console/ember/EmberConsoleNcpVersionCommand.java +++ b/com.zsmartsystems.zigbee.console.ember/src/main/java/com/zsmartsystems/zigbee/console/ember/EmberConsoleNcpVersionCommand.java @@ -11,7 +11,6 @@ import com.zsmartsystems.zigbee.ZigBeeNetworkManager; import com.zsmartsystems.zigbee.dongle.ember.EmberNcp; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; /** @@ -47,7 +46,7 @@ public void process(ZigBeeNetworkManager networkManager, String[] args, PrintStr EzspVersionResponse version = ncp.getVersion(); out.println("Ember NCP version " + getVersionString(version.getStackVersion()) + ", EZSP version " - + EzspFrame.getEzspVersion()); + + version.getProtocolVersion()); } private String getVersionString(int value) { diff --git a/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java b/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java index a8d4d78a40..eba23af3d0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java +++ b/com.zsmartsystems.zigbee.dongle.ember.autocode/src/main/java/com/zsmartsystems/zigbee/dongle/ember/autocode/CommandGenerator.java @@ -140,9 +140,9 @@ private void createCommandClass(String className, Command command, List autoSizers = new HashMap(); @@ -211,9 +211,9 @@ private void createCommandClass(String className, Command command, List ctor;"); out.println(" try {"); - out.println(" ctor = ezspClass.getConstructor(int[].class);"); - out.println(" EzspFrameResponse ezspFrame = (EzspFrameResponse) ctor.newInstance(data);"); + out.println(" ctor = ezspClass.getConstructor(int.class, int[].class);"); + out.println(" EzspFrameResponse ezspFrame = (EzspFrameResponse) ctor.newInstance(ezspVersion, data);"); out.println(" return ezspFrame;"); out.println( " } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | InstantiationException"); @@ -1136,33 +1121,6 @@ private void createEmberFrame(Protocol protocol) throws FileNotFoundException, U out.println(" }"); out.println(); - out.println(" /**"); - out.println(" * Set the EZSP version to use"); - out.println(" *"); - out.println(" * @param ezspVersion the EZSP protocol version"); - out.println(" * @return true if the version is supported"); - out.println(" */"); - out.println(" public static boolean setEzspVersion(int ezspVersion) {"); - out.println(" if (ezspVersion <= EZSP_MAX_VERSION && ezspVersion >= EZSP_MIN_VERSION) {"); - out.println(" EzspFrame.ezspVersion = ezspVersion;"); - out.println(" return true;"); - out.println(" }"); - out.println(); - out.println(" return false;"); - out.println(" }"); - out.println(); - - out.println(" /**"); - out.println( - " * Gets the current version of EZSP that is in use. This will default to the minimum supported version on startup"); - out.println(" *"); - out.println(" * @return the current version of EZSP"); - out.println(" */"); - out.println(" public static int getEzspVersion() {"); - out.println(" return EzspFrame.ezspVersion;"); - out.println(" }"); - out.println(); - out.println(" private static String frameToString(int[] inputBuffer) {"); out.println(" StringBuilder result = new StringBuilder();"); out.println(" for (int data : inputBuffer) {"); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcp.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcp.java index 4d69b388e0..2c723054f4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcp.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcp.java @@ -154,8 +154,6 @@ import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspPolicyId; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspStatus; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspValueId; -import com.zsmartsystems.zigbee.dongle.ember.internal.EzspFrameHandler; -import com.zsmartsystems.zigbee.dongle.ember.internal.EzspProtocolHandler; import com.zsmartsystems.zigbee.dongle.ember.internal.transaction.EzspMultiResponseTransaction; import com.zsmartsystems.zigbee.dongle.ember.internal.transaction.EzspSingleResponseTransaction; import com.zsmartsystems.zigbee.dongle.ember.internal.transaction.EzspTransaction; @@ -175,31 +173,17 @@ public class EmberNcp { private final Logger logger = LoggerFactory.getLogger(EmberNcp.class); /** - * The protocol handler used to send and receive EZSP packets + * The ZigBee dongle used to send and receive EZSP packets */ - private final EzspProtocolHandler protocolHandler; - - /** - * The status value from the last request - */ - private EmberStatus lastStatus; + private final ZigBeeDongleEzsp zigBeeDongleEzsp; /** * Create the NCP instance * - * @param protocolHandler the {@link EzspFrameHandler} used for communicating with the NCP - */ - public EmberNcp(EzspProtocolHandler protocolHandler) { - this.protocolHandler = protocolHandler; - } - - /** - * Returns the {@link EmberStatus} from the last request. If the request did not provide a status, null is returned. - * - * @return {@link EmberStatus} + * @param zigBeeDongleEzsp the {@link ZigBeeDongleEzsp} used for communicating with the NCP */ - public EmberStatus getLastStatus() { - return lastStatus; + public EmberNcp(ZigBeeDongleEzsp zigBeeDongleEzsp) { + this.zigBeeDongleEzsp = zigBeeDongleEzsp; } /** @@ -210,8 +194,8 @@ public EmberStatus getLastStatus() { */ public EzspVersionResponse getVersion() { EzspVersionRequest request = new EzspVersionRequest(); - request.setDesiredProtocolVersion(EzspFrame.getEzspVersion()); - EzspTransaction transaction = protocolHandler + request.setDesiredProtocolVersion(zigBeeDongleEzsp.getEzspVersion()); + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspVersionResponse.class)); EzspVersionResponse response = (EzspVersionResponse) transaction.getResponse(); if (response == null) { @@ -219,7 +203,6 @@ public EzspVersionResponse getVersion() { return null; } logger.debug(response.toString()); - lastStatus = null; return response; } @@ -233,7 +216,7 @@ public EzspVersionResponse getVersion() { */ public EmberStatus networkInit() { EzspNetworkInitRequest request = new EzspNetworkInitRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspNetworkInitResponse.class)); EzspNetworkInitResponse response = (EzspNetworkInitResponse) transaction.getResponse(); if (response == null) { @@ -256,7 +239,7 @@ public EmberStatus networkInit() { */ public EmberStatus leaveNetwork() { EzspLeaveNetworkRequest request = new EzspLeaveNetworkRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspLeaveNetworkResponse.class)); EzspLeaveNetworkResponse response = (EzspLeaveNetworkResponse) transaction.getResponse(); if (response == null) { @@ -274,14 +257,13 @@ public EmberStatus leaveNetwork() { */ public EmberCurrentSecurityState getCurrentSecurityState() { EzspGetCurrentSecurityStateRequest request = new EzspGetCurrentSecurityStateRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetCurrentSecurityStateResponse.class)); EzspGetCurrentSecurityStateResponse response = (EzspGetCurrentSecurityStateResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); return response.getState(); } @@ -292,7 +274,7 @@ public EmberCurrentSecurityState getCurrentSecurityState() { */ public EzspGetNetworkParametersResponse getNetworkParameters() { EzspGetNetworkParametersRequest request = new EzspGetNetworkParametersRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetNetworkParametersResponse.class)); return (EzspGetNetworkParametersResponse) transaction.getResponse(); } @@ -304,10 +286,9 @@ public EzspGetNetworkParametersResponse getNetworkParameters() { */ public EmberNetworkStatus getNetworkState() { EzspNetworkStateRequest request = new EzspNetworkStateRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspNetworkStateResponse.class)); EzspNetworkStateResponse response = (EzspNetworkStateResponse) transaction.getResponse(); - lastStatus = null; if (response == null) { return null; } @@ -322,11 +303,10 @@ public EmberNetworkStatus getNetworkState() { */ public EzspGetParentChildParametersResponse getChildParameters() { EzspGetParentChildParametersRequest request = new EzspGetParentChildParametersRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetParentChildParametersResponse.class)); EzspGetParentChildParametersResponse response = (EzspGetParentChildParametersResponse) transaction .getResponse(); - lastStatus = null; if (response == null) { return null; } @@ -343,15 +323,14 @@ public EzspGetParentChildParametersResponse getChildParameters() { public EzspGetChildDataResponse getChildInformation(int childId) { EzspGetChildDataRequest request = new EzspGetChildDataRequest(); request.setIndex(childId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetChildDataResponse.class)); EzspGetChildDataResponse response = (EzspGetChildDataResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - if (lastStatus != EmberStatus.EMBER_SUCCESS) { + if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { return null; } @@ -378,7 +357,7 @@ public EzspStatus addEndpoint(int endpointId, int deviceId, int profileId, int[] request.setProfileId(profileId); request.setInputClusterList(inputClusters); request.setOutputClusterList(outputClusters); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspAddEndpointResponse.class)); EzspAddEndpointResponse response = (EzspAddEndpointResponse) transaction.getResponse(); if (response == null) { @@ -386,7 +365,6 @@ public EzspStatus addEndpoint(int endpointId, int deviceId, int profileId, int[] } logger.debug(response.toString()); - lastStatus = null; return response.getStatus(); } @@ -398,14 +376,13 @@ public EzspStatus addEndpoint(int endpointId, int deviceId, int profileId, int[] */ public int[] getCounters() { EzspReadCountersRequest request = new EzspReadCountersRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspReadCountersResponse.class)); EzspReadCountersResponse response = (EzspReadCountersResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = null; return response.getValues(); } @@ -416,15 +393,14 @@ public int[] getCounters() { */ public EmberStatus clearKeyTable() { EzspClearKeyTableRequest request = new EzspClearKeyTableRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspClearKeyTableResponse.class)); EzspClearKeyTableResponse response = (EzspClearKeyTableResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - return lastStatus; + return response.getStatus(); } /** @@ -436,15 +412,14 @@ public EmberStatus clearKeyTable() { public EmberKeyStruct getKey(EmberKeyType keyType) { EzspGetKeyRequest request = new EzspGetKeyRequest(); request.setKeyType(keyType); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetKeyResponse.class)); EzspGetKeyResponse response = (EzspGetKeyResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - if (lastStatus != EmberStatus.EMBER_SUCCESS) { + if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { return null; } return response.getKeyStruct(); @@ -459,15 +434,14 @@ public EmberKeyStruct getKey(EmberKeyType keyType) { public EmberKeyStruct getKeyTableEntry(int index) { EzspGetKeyTableEntryRequest request = new EzspGetKeyTableEntryRequest(); request.setIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetKeyTableEntryResponse.class)); EzspGetKeyTableEntryResponse response = (EzspGetKeyTableEntryResponse) transaction.getResponse(); if (response == null) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - if (lastStatus != EmberStatus.EMBER_SUCCESS) { + if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { return null; } return response.getKeyStruct(); @@ -483,11 +457,9 @@ public Integer getConfiguration(EzspConfigId configId) { EzspGetConfigurationValueRequest request = new EzspGetConfigurationValueRequest(); request.setConfigId(configId); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetConfigurationValueResponse.class)); EzspGetConfigurationValueResponse response = (EzspGetConfigurationValueResponse) transaction.getResponse(); - lastStatus = null; - if (response == null || response.getStatus() != EzspStatus.EZSP_SUCCESS) { return null; } @@ -509,11 +481,9 @@ public EzspStatus setConfiguration(EzspConfigId configId, Integer value) { request.setValue(value); logger.debug(request.toString()); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspSetConfigurationValueResponse.class)); EzspSetConfigurationValueResponse response = (EzspSetConfigurationValueResponse) transaction.getResponse(); - lastStatus = null; - if (response == null) { return null; } @@ -534,13 +504,12 @@ public EzspStatus setPolicy(EzspPolicyId policyId, EzspDecisionId decisionId) { EzspSetPolicyRequest setPolicyRequest = new EzspSetPolicyRequest(); setPolicyRequest.setPolicyId(policyId); setPolicyRequest.setDecisionId(decisionId.getKey()); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(setPolicyRequest, EzspSetPolicyResponse.class)); EzspSetPolicyResponse setPolicyResponse = (EzspSetPolicyResponse) transaction.getResponse(); if (setPolicyResponse == null) { return EzspStatus.UNKNOWN; } - lastStatus = null; logger.debug(setPolicyResponse.toString()); if (setPolicyResponse.getStatus() != EzspStatus.EZSP_SUCCESS) { logger.debug("Error during setting policy: {}", setPolicyResponse); @@ -560,13 +529,12 @@ public EzspStatus setPolicy(EzspPolicyId policyId, int decisionId) { EzspSetPolicyRequest setPolicyRequest = new EzspSetPolicyRequest(); setPolicyRequest.setPolicyId(policyId); setPolicyRequest.setDecisionId(decisionId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(setPolicyRequest, EzspSetPolicyResponse.class)); EzspSetPolicyResponse setPolicyResponse = (EzspSetPolicyResponse) transaction.getResponse(); if (setPolicyResponse == null) { return EzspStatus.UNKNOWN; } - lastStatus = null; logger.debug(setPolicyResponse.toString()); if (setPolicyResponse.getStatus() != EzspStatus.EZSP_SUCCESS) { logger.debug("Error during setting policy: {}", setPolicyResponse); @@ -585,13 +553,12 @@ public EzspStatus setPolicy(EzspPolicyId policyId, int decisionId) { public Integer getPolicy(EzspPolicyId policyId) { EzspGetPolicyRequest getPolicyRequest = new EzspGetPolicyRequest(); getPolicyRequest.setPolicyId(policyId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(getPolicyRequest, EzspGetPolicyResponse.class)); EzspGetPolicyResponse getPolicyResponse = (EzspGetPolicyResponse) transaction.getResponse(); if (getPolicyResponse == null) { return null; } - lastStatus = null; logger.debug(getPolicyResponse.toString()); if (getPolicyResponse.getStatus() != EzspStatus.EZSP_SUCCESS) { logger.debug("Error getting policy: {}", getPolicyResponse); @@ -612,13 +579,12 @@ public EzspStatus setValue(EzspValueId valueId, int[] value) { EzspSetValueRequest request = new EzspSetValueRequest(); request.setValueId(valueId); request.setValue(value); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetValueResponse.class)); EzspSetValueResponse response = (EzspSetValueResponse) transaction.getResponse(); if (response == null) { return EzspStatus.UNKNOWN; } - lastStatus = null; logger.debug(response.toString()); if (response.getStatus() != EzspStatus.EZSP_SUCCESS) { logger.debug("Error setting value: {}", response); @@ -636,13 +602,12 @@ public EzspStatus setValue(EzspValueId valueId, int[] value) { public int[] getValue(EzspValueId valueId) { EzspGetValueRequest request = new EzspGetValueRequest(); request.setValueId(valueId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetValueResponse.class)); EzspGetValueResponse response = (EzspGetValueResponse) transaction.getResponse(); if (response == null) { return null; } - lastStatus = null; logger.debug(response.toString()); if (response.getStatus() != EzspStatus.EZSP_SUCCESS) { logger.debug("Error getting value: {}", response); @@ -665,13 +630,12 @@ public EmberStatus addTransientLinkKey(IeeeAddress partner, ZigBeeKey transientK EzspAddTransientLinkKeyRequest request = new EzspAddTransientLinkKeyRequest(); request.setPartner(partner); request.setTransientKey(emberKey); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspAddTransientLinkKeyResponse.class)); EzspAddTransientLinkKeyResponse response = (EzspAddTransientLinkKeyResponse) transaction.getResponse(); if (response == null) { return EmberStatus.UNKNOWN; } - lastStatus = response.getStatus(); logger.debug(response.toString()); if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { logger.debug("Error setting transient key: {}", response); @@ -689,7 +653,7 @@ public EmberStatus addTransientLinkKey(IeeeAddress partner, ZigBeeKey transientK public EmberTransientKeyData getTransientLinkKeyIndex(int index) { EzspGetTransientKeyTableEntryRequest request = new EzspGetTransientKeyTableEntryRequest(); request.setIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetTransientKeyTableEntryResponse.class)); EzspGetTransientKeyTableEntryResponse response = (EzspGetTransientKeyTableEntryResponse) transaction @@ -698,8 +662,7 @@ public EmberTransientKeyData getTransientLinkKeyIndex(int index) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - if (lastStatus != EmberStatus.EMBER_SUCCESS) { + if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { return null; } return response.getTransientKeyData(); @@ -714,7 +677,7 @@ public EmberTransientKeyData getTransientLinkKeyIndex(int index) { public EmberTransientKeyData getTransientLinkKey(IeeeAddress ieeeAddress) { EzspGetTransientLinkKeyRequest request = new EzspGetTransientLinkKeyRequest(); request.setEui(ieeeAddress); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetTransientLinkKeyResponse.class)); EzspGetTransientLinkKeyResponse response = (EzspGetTransientLinkKeyResponse) transaction .getResponse(); @@ -722,8 +685,7 @@ public EmberTransientKeyData getTransientLinkKey(IeeeAddress ieeeAddress) { return null; } logger.debug(response.toString()); - lastStatus = response.getStatus(); - if (lastStatus != EmberStatus.EMBER_SUCCESS) { + if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { return null; } return response.getTransientKeyData(); @@ -738,13 +700,12 @@ public EmberTransientKeyData getTransientLinkKey(IeeeAddress ieeeAddress) { */ public EmberCertificateData getCertificateData() { EzspGetCertificateRequest request = new EzspGetCertificateRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetCertificateResponse.class)); EzspGetCertificateResponse response = (EzspGetCertificateResponse) transaction.getResponse(); if (response == null) { return null; } - lastStatus = response.getStatus(); if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { logger.debug("Error getting 163k1 certificate: {}", response); return null; @@ -760,13 +721,12 @@ public EmberCertificateData getCertificateData() { */ public EmberCertificate283k1Data getCertificate283k1Data() { EzspGetCertificate283k1Request request = new EzspGetCertificate283k1Request(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetCertificate283k1Response.class)); EzspGetCertificate283k1Response response = (EzspGetCertificate283k1Response) transaction.getResponse(); if (response == null) { return null; } - lastStatus = response.getStatus(); if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { logger.debug("Error getting 283k1 certificate: {}", response); return null; @@ -792,10 +752,9 @@ public EmberAesMmoHashContext mmoHash(int[] code) { request.setData(code); request.setFinalize(true); request.setLength(code.length); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspAesMmoHashResponse.class)); EzspAesMmoHashResponse response = (EzspAesMmoHashResponse) transaction.getResponse(); - lastStatus = response.getStatus(); logger.debug(response.toString()); if (response.getStatus() != EmberStatus.EMBER_SUCCESS) { logger.debug("Error performing AES MMO hash: {}", response); @@ -811,7 +770,7 @@ public EmberAesMmoHashContext mmoHash(int[] code) { */ public IeeeAddress getIeeeAddress() { EzspGetEui64Request request = new EzspGetEui64Request(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetEui64Response.class)); EzspGetEui64Response response = (EzspGetEui64Response) transaction.getResponse(); if (response == null) { @@ -827,7 +786,7 @@ public IeeeAddress getIeeeAddress() { */ public int getNwkAddress() { EzspGetNodeIdRequest request = new EzspGetNodeIdRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetNodeIdResponse.class)); EzspGetNodeIdResponse response = (EzspGetNodeIdResponse) transaction.getResponse(); if (response == null) { @@ -849,7 +808,7 @@ public int getNwkAddress() { public EmberStatus setRadioPower(int power) { EzspSetRadioPowerRequest request = new EzspSetRadioPowerRequest(); request.setPower(power); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetRadioPowerResponse.class)); EzspSetRadioPowerResponse response = (EzspSetRadioPowerResponse) transaction.getResponse(); if (response == null) { @@ -866,7 +825,7 @@ public EmberStatus setRadioPower(int power) { public EmberLibraryStatus getLibraryStatus(EmberLibraryId libraryId) { EzspGetLibraryStatusRequest request = new EzspGetLibraryStatusRequest(); request.setLibraryId(libraryId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetLibraryStatusResponse.class)); EzspGetLibraryStatusResponse response = (EzspGetLibraryStatusResponse) transaction.getResponse(); if (response == null) { @@ -894,7 +853,7 @@ public EmberStatus addOrUpdateKeyTableEntry(IeeeAddress address, ZigBeeKey key, request.setAddress(address); request.setKeyData(keyData); request.setLinkKey(linkKey); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspAddOrUpdateKeyTableEntryResponse.class)); EzspAddOrUpdateKeyTableEntryResponse response = (EzspAddOrUpdateKeyTableEntryResponse) transaction .getResponse(); @@ -913,7 +872,7 @@ public EmberStatus addOrUpdateKeyTableEntry(IeeeAddress address, ZigBeeKey key, public EmberRouteTableEntry getRouteTableEntry(int index) { EzspGetRouteTableEntryRequest request = new EzspGetRouteTableEntryRequest(); request.setIndex(index); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetRouteTableEntryResponse.class)); EzspGetRouteTableEntryResponse response = (EzspGetRouteTableEntryResponse) transaction .getResponse(); @@ -936,7 +895,7 @@ public EmberRouteTableEntry getRouteTableEntry(int index) { public EmberSourceRouteTableEntry getSourceRouteTableEntry(int index) { EzspGetSourceRouteTableEntryRequest request = new EzspGetSourceRouteTableEntryRequest(); request.setIndex(index); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetSourceRouteTableEntryResponse.class)); EzspGetSourceRouteTableEntryResponse response = (EzspGetSourceRouteTableEntryResponse) transaction .getResponse(); @@ -957,7 +916,7 @@ public EmberSourceRouteTableEntry getSourceRouteTableEntry(int index) { */ public int getSourceRouteTableTotalSize() { EzspGetSourceRouteTableTotalSizeRequest request = new EzspGetSourceRouteTableTotalSizeRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetSourceRouteTableTotalSizeResponse.class)); EzspGetSourceRouteTableTotalSizeResponse response = (EzspGetSourceRouteTableTotalSizeResponse) transaction .getResponse(); @@ -974,7 +933,7 @@ public int getSourceRouteTableTotalSize() { */ public int getSourceRouteTableFilledSize() { EzspGetSourceRouteTableFilledSizeRequest request = new EzspGetSourceRouteTableFilledSizeRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetSourceRouteTableFilledSizeResponse.class)); EzspGetSourceRouteTableFilledSizeResponse response = (EzspGetSourceRouteTableFilledSizeResponse) transaction .getResponse(); @@ -993,7 +952,7 @@ public int getSourceRouteTableFilledSize() { public void setPowerDescriptor(int descriptor) { EzspSetPowerDescriptorRequest request = new EzspSetPowerDescriptorRequest(); request.setDescriptor(descriptor); - protocolHandler + zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetPowerDescriptorResponse.class)); } @@ -1006,7 +965,7 @@ public void setPowerDescriptor(int descriptor) { public void setManufacturerCode(int code) { EzspSetManufacturerCodeRequest request = new EzspSetManufacturerCodeRequest(); request.setCode(code); - protocolHandler + zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetManufacturerCodeResponse.class)); } @@ -1109,14 +1068,13 @@ public Collection doActiveScan(int channelMask, int sca Set> relatedResponses = new HashSet>( Arrays.asList(EzspStartScanResponse.class, EzspNetworkFoundHandler.class)); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspMultiResponseTransaction(activeScan, EzspScanCompleteHandler.class, relatedResponses), 45); logger.debug("Active scan response: {}", transaction.getResponse()); if (transaction.getResponse() instanceof EzspScanCompleteHandler) { EzspScanCompleteHandler activeScanCompleteResponse = (EzspScanCompleteHandler) transaction.getResponse(); if (activeScanCompleteResponse.getStatus() != EmberStatus.EMBER_SUCCESS) { - lastStatus = activeScanCompleteResponse.getStatus(); logger.debug("Error during active scan: {}", activeScanCompleteResponse); return null; } @@ -1153,7 +1111,7 @@ public List doEnergyScan(int channelMask, int scanD Set> relatedResponses = new HashSet>( Arrays.asList(EzspStartScanResponse.class, EzspEnergyScanResultHandler.class)); - EzspTransaction transaction = protocolHandler.sendEzspTransaction( + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction( new EzspMultiResponseTransaction(energyScan, EzspScanCompleteHandler.class, relatedResponses), 45); if (transaction.getResponse() instanceof EzspScanCompleteHandler) { @@ -1172,7 +1130,6 @@ public List doEnergyScan(int channelMask, int scanD } } - lastStatus = scanCompleteResponse.getStatus(); return channels; } else { logger.debug("Invalid response during energy scan: {}", transaction.getResponse()); @@ -1200,7 +1157,7 @@ public ZigBeeStatus setExtendedTimeout(IeeeAddress remoteEui64, boolean extended EzspSetExtendedTimeoutRequest request = new EzspSetExtendedTimeoutRequest(); request.setRemoteEui64(remoteEui64); request.setExtendedTimeout(extendedTimeout); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetExtendedTimeoutResponse.class)); EzspSetExtendedTimeoutResponse response = (EzspSetExtendedTimeoutResponse) transaction.getResponse(); return (response == null) ? ZigBeeStatus.FAILURE : ZigBeeStatus.SUCCESS; @@ -1214,7 +1171,7 @@ public ZigBeeStatus setExtendedTimeout(IeeeAddress remoteEui64, boolean extended */ public int getBootloaderVersion() { EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest request = new EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest(); - EzspTransaction transaction = protocolHandler.sendEzspTransaction(new EzspSingleResponseTransaction(request, + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler().sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse.class)); EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse response = (EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse) transaction .getResponse(); @@ -1228,7 +1185,7 @@ public int getBootloaderVersion() { */ public EzspGetXncpInfoResponse getXncpInfo() { EzspGetXncpInfoRequest request = new EzspGetXncpInfoRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetXncpInfoResponse.class)); EzspGetXncpInfoResponse response = (EzspGetXncpInfoResponse) transaction.getResponse(); if (response == null || response.getStatus() != EzspStatus.EZSP_SUCCESS) { @@ -1246,10 +1203,9 @@ public EzspGetXncpInfoResponse getXncpInfo() { public EzspCustomFrameResponse sendCustomFrame(int[] customFrame) { EzspCustomFrameRequest request = new EzspCustomFrameRequest(); request.setPayload(customFrame); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspCustomFrameResponse.class)); EzspCustomFrameResponse response = (EzspCustomFrameResponse) transaction.getResponse(); - lastStatus = response.getStatus(); if (response == null || response.getStatus() != EmberStatus.EMBER_SUCCESS) { logger.debug("Error sending custom frame: {}", response); return null; @@ -1285,7 +1241,7 @@ public EmberStatus sendManyToOneRouteRequest(EmberConcentratorType concentratorT EzspSendManyToOneRouteRequestRequest request = new EzspSendManyToOneRouteRequestRequest(); request.setConcentratorType(concentratorType); request.setRadius(radius); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspSendManyToOneRouteRequestResponse.class)); EzspSendManyToOneRouteRequestResponse response = (EzspSendManyToOneRouteRequestResponse) transaction @@ -1303,7 +1259,7 @@ public EmberStatus sendManyToOneRouteRequest(EmberConcentratorType concentratorT */ public EzspStatus resetToFactoryDefaults() { EzspResetToFactoryDefaultsRequest request = new EzspResetToFactoryDefaultsRequest(); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspResetToFactoryDefaultsResponse.class)); EzspResetToFactoryDefaultsResponse response = (EzspResetToFactoryDefaultsResponse) transaction @@ -1333,7 +1289,7 @@ private String intArrayToString(int[] payload) { public int[] getMfgToken(EzspMfgTokenId tokenId) { EzspGetMfgTokenRequest request = new EzspGetMfgTokenRequest(); request.setTokenId(tokenId); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspGetMfgTokenResponse.class)); EzspGetMfgTokenResponse response = (EzspGetMfgTokenResponse) transaction.getResponse(); if (response == null) { @@ -1353,7 +1309,7 @@ public EmberStatus setMfgToken(EzspMfgTokenId tokenId, int[] token) { EzspSetMfgTokenRequest request = new EzspSetMfgTokenRequest(); request.setTokenId(tokenId); request.setTokenData(token); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetMfgTokenResponse.class)); EzspSetMfgTokenResponse response = (EzspSetMfgTokenResponse) transaction.getResponse(); if (response == null) { @@ -1376,7 +1332,7 @@ public EmberStatus setMfgToken(EzspMfgTokenId tokenId, int[] token) { public EmberStatus setRadioChannel(ZigBeeChannel channel) { EzspSetRadioChannelRequest request = new EzspSetRadioChannelRequest(); request.setChannel(channel.getChannel()); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction(new EzspSingleResponseTransaction(request, EzspSetRadioChannelResponse.class)); EzspSetRadioChannelResponse response = (EzspSetRadioChannelResponse) transaction.getResponse(); if (response == null) { @@ -1393,7 +1349,7 @@ public EmberStatus setRadioChannel(ZigBeeChannel channel) { public EmberMulticastTableEntry getMulticastTableEntry(int index) { EzspGetMulticastTableEntryRequest request = new EzspGetMulticastTableEntryRequest(); request.setIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetMulticastTableEntryResponse.class)); @@ -1416,7 +1372,7 @@ public EmberStatus setMulticastTableEntry(int index, EmberMulticastTableEntry va EzspSetMulticastTableEntryRequest request = new EzspSetMulticastTableEntryRequest(); request.setIndex(index); request.setValue(value); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspSetMulticastTableEntryResponse.class)); EzspSetMulticastTableEntryResponse response = (EzspSetMulticastTableEntryResponse) transaction.getResponse(); @@ -1439,7 +1395,7 @@ public EmberStatus setMulticastTableEntry(int index, EmberMulticastTableEntry va public Boolean addressTableEntryIsActive(int index) { EzspAddressTableEntryIsActiveRequest request = new EzspAddressTableEntryIsActiveRequest(); request.setAddressTableIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspAddressTableEntryIsActiveResponse.class)); EzspAddressTableEntryIsActiveResponse response = (EzspAddressTableEntryIsActiveResponse) transaction @@ -1460,7 +1416,7 @@ public Boolean addressTableEntryIsActive(int index) { public IeeeAddress getAddressTableRemoteEui64(int index) { EzspGetAddressTableRemoteEui64Request request = new EzspGetAddressTableRemoteEui64Request(); request.setAddressTableIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetAddressTableRemoteEui64Response.class)); EzspGetAddressTableRemoteEui64Response response = (EzspGetAddressTableRemoteEui64Response) transaction @@ -1482,7 +1438,7 @@ public IeeeAddress getAddressTableRemoteEui64(int index) { public int getAddressTableRemoteNodeId(int index) { EzspGetAddressTableRemoteNodeIdRequest request = new EzspGetAddressTableRemoteNodeIdRequest(); request.setAddressTableIndex(index); - EzspTransaction transaction = protocolHandler + EzspTransaction transaction = zigBeeDongleEzsp.getProtocolHandler() .sendEzspTransaction( new EzspSingleResponseTransaction(request, EzspGetAddressTableRemoteNodeIdResponse.class)); EzspGetAddressTableRemoteNodeIdResponse response = (EzspGetAddressTableRemoteNodeIdResponse) transaction diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java index 6272dbd8d6..fe018db123 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java @@ -108,6 +108,16 @@ */ public class ZigBeeDongleEzsp implements ZigBeeTransportTransmit, ZigBeeTransportFirmwareUpdate, EzspFrameHandler { + /** + * The minimum supported version of EZSP + */ + private static final int EZSP_MIN_VERSION = 4; + + /** + * The maximum supported version of EZSP + */ + private static final int EZSP_MAX_VERSION = 8; + private static final int POLL_FRAME_ID = EzspNetworkStateRequest.FRAME_ID; private static final int WAIT_FOR_ONLINE = 5000; @@ -186,6 +196,11 @@ public class ZigBeeDongleEzsp implements ZigBeeTransportTransmit, ZigBeeTranspor */ private DeviceType deviceType = DeviceType.COORDINATOR; + /** + * The Ember NCP utility class + */ + private EmberNcp ncp; + /** * The low level protocol to use for this dongle */ @@ -194,7 +209,7 @@ public class ZigBeeDongleEzsp implements ZigBeeTransportTransmit, ZigBeeTranspor /** * The stack version returned by the stack */ - private EzspVersionResponse ezspVersion; + private int ezspVersion = EZSP_MIN_VERSION; /** * The Ember version used in this system. Set during initialisation and saved in case the client is interested. @@ -429,6 +444,8 @@ public ZigBeeStatus initialize() { logger.debug("EZSP Dongle: Initialize with protocol {}.", protocol); zigbeeTransportReceive.setTransportState(ZigBeeTransportState.INITIALISING); + ncp = new EmberNcp(this); + if (protocol != EmberSerialProtocol.NONE && !initialiseEzspProtocol()) { return ZigBeeStatus.COMMUNICATION_ERROR; } @@ -462,8 +479,6 @@ public ZigBeeStatus initialize() { String.format("%02X", policy.getValue())); } - EmberNcp ncp = getEmberNcp(); - // Get the current network parameters so that any configuration updates start from here networkParameters = ncp.getNetworkParameters().getParameters(); logger.debug("Ember initial network parameters are {}", networkParameters); @@ -489,8 +504,6 @@ public ZigBeeStatus startup(boolean reinitialize) { return ZigBeeStatus.INVALID_STATE; } - EmberNcp ncp = getEmberNcp(); - // Add the endpoint logger.debug("EZSP Adding Endpoint: ProfileID={}, DeviceID={}", String.format("%04X", defaultProfileId), String.format("%04X", defaultDeviceId)); @@ -515,7 +528,7 @@ public ZigBeeStatus startup(boolean reinitialize) { logger.debug("EZSP networkStateResponse {}", networkState); // If we want to reinitialize the network, then go... - EmberNetworkInitialisation netInitialiser = new EmberNetworkInitialisation(frameHandler); + EmberNetworkInitialisation netInitialiser = new EmberNetworkInitialisation(this, frameHandler); if (reinitialize) { logger.debug("Reinitialising Ember NCP network as {}", deviceType); if (deviceType == DeviceType.COORDINATOR) { @@ -705,12 +718,12 @@ public void passLoopbackMessages(boolean passLoopbackMessages) { } /** - * Returns an instance of the {@link EmberNcp} + * Returns the instance of the {@link EmberNcp} * - * @return an instance of the {@link EmberNcp} + * @return the instance of the {@link EmberNcp} */ public EmberNcp getEmberNcp() { - return new EmberNcp(frameHandler); + return ncp; } /** @@ -858,7 +871,6 @@ public void setNodeDescriptor(IeeeAddress ieeeAddress, NodeDescriptor nodeDescri logger.debug("{}: NodeDescriptor passed to Ember NCP {}", ieeeAddress, nodeDescriptor); if (!nodeDescriptor.getMacCapabilities().contains(MacCapabilitiesType.RECEIVER_ON_WHEN_IDLE) || nodeDescriptor.getMacCapabilities().contains(MacCapabilitiesType.REDUCED_FUNCTION_DEVICE)) { - EmberNcp ncp = getEmberNcp(); ncp.setExtendedTimeout(ieeeAddress, true); } } @@ -1040,8 +1052,6 @@ public void run() { if (linkState) { logger.debug("Ember: Link State up running"); - EmberNcp ncp = getEmberNcp(); - // Ensure we synchronise the network parameters // This allows the system to read back the actual network parameters networkParameters = ncp.getNetworkParameters().getParameters(); @@ -1061,7 +1071,6 @@ public void run() { @Override public ZigBeeChannel getZigBeeChannel() { if (networkStateUp) { - EmberNcp ncp = getEmberNcp(); EzspGetNetworkParametersResponse networkParameters = ncp.getNetworkParameters(); return ZigBeeChannel.create(networkParameters.getParameters().getRadioChannel()); } else { @@ -1076,7 +1085,6 @@ public ZigBeeStatus setZigBeeChannel(ZigBeeChannel channel) { return ZigBeeStatus.INVALID_ARGUMENTS; } if (networkStateUp) { - EmberNcp ncp = getEmberNcp(); ncp.setRadioChannel(channel); } else { networkParameters.setRadioChannel(channel.getChannel()); @@ -1117,7 +1125,6 @@ public ZigBeeStatus setZigBeeNetworkKey(final ZigBeeKey key) { @Override public ZigBeeKey getZigBeeNetworkKey() { - EmberNcp ncp = getEmberNcp(); EmberKeyStruct key = ncp.getKey(EmberKeyType.EMBER_CURRENT_NETWORK_KEY); return emberKeyToZigBeeKey(key); @@ -1134,7 +1141,6 @@ public ZigBeeStatus setTcLinkKey(ZigBeeKey key) { @Override public ZigBeeKey getTcLinkKey() { - EmberNcp ncp = getEmberNcp(); EmberKeyStruct key = ncp.getKey(EmberKeyType.EMBER_TRUST_CENTER_LINK_KEY); return emberKeyToZigBeeKey(key); @@ -1151,7 +1157,6 @@ public void updateTransportConfig(TransportConfig configuration) { break; case INSTALL_KEY: - EmberNcp ncp = getEmberNcp(); ZigBeeKey nodeKey = (ZigBeeKey) configuration.getValue(option); if (!nodeKey.hasAddress()) { logger.debug("Attempt to set INSTALL_KEY without setting address"); @@ -1267,11 +1272,11 @@ private ZigBeeStatus setTcJoinMode(TrustCentreJoinMode joinMode) { return ZigBeeStatus.INVALID_ARGUMENTS; } - if (ezspVersion.getProtocolVersion() < 8) { - return (getEmberNcp().setPolicy(EzspPolicyId.EZSP_TRUST_CENTER_POLICY, + if (ezspVersion < 8) { + return (ncp.setPolicy(EzspPolicyId.EZSP_TRUST_CENTER_POLICY, emberJoinMode) == EzspStatus.EZSP_SUCCESS) ? ZigBeeStatus.SUCCESS : ZigBeeStatus.FAILURE; } else { - return (getEmberNcp().setPolicy(EzspPolicyId.EZSP_TRUST_CENTER_POLICY, + return (ncp.setPolicy(EzspPolicyId.EZSP_TRUST_CENTER_POLICY, bitmask) == EzspStatus.EZSP_SUCCESS) ? ZigBeeStatus.SUCCESS : ZigBeeStatus.FAILURE; } } @@ -1315,36 +1320,35 @@ private boolean initialiseEzspProtocol() { frameHandler.connect(); - EmberNcp ncp = getEmberNcp(); - // We MUST send the version command first. // Any failure to respond here indicates a failure of the ASH or EZSP layers to initialise - ezspVersion = ncp.getVersion(); - if (ezspVersion == null) { + EzspVersionResponse ezspVersionResponse = ncp.getVersion(); + if (ezspVersionResponse == null) { logger.debug("EZSP Dongle: Version returned null. ASH/EZSP not initialised."); return false; } - if (ezspVersion.getProtocolVersion() != EzspFrame.getEzspVersion()) { + if (ezspVersionResponse.getProtocolVersion() != ezspVersion) { // The device supports a different version that we current have set - if (!EzspFrame.setEzspVersion(ezspVersion.getProtocolVersion())) { + if (ezspVersion > EZSP_MAX_VERSION || ezspVersion < EZSP_MIN_VERSION) { logger.error("EZSP Dongle: NCP requires unsupported version of EZSP (required = V{}, supported = V{})", - ezspVersion.getProtocolVersion(), EzspFrame.getEzspVersion()); + ezspVersionResponse.getProtocolVersion(), ezspVersion); return false; } - ezspVersion = ncp.getVersion(); - logger.debug(ezspVersion.toString()); + ezspVersion = ezspVersionResponse.getProtocolVersion(); + ezspVersionResponse = ncp.getVersion(); + logger.debug(ezspVersionResponse.toString()); } StringBuilder builder = new StringBuilder(60); builder.append("EZSP Version="); - builder.append(ezspVersion.getProtocolVersion()); + builder.append(ezspVersionResponse.getProtocolVersion()); builder.append(", Stack Type="); - builder.append(ezspVersion.getStackType()); + builder.append(ezspVersionResponse.getStackType()); builder.append(", Stack Version="); for (int cnt = 3; cnt >= 0; cnt--) { - builder.append((ezspVersion.getStackVersion() >> (cnt * 4)) & 0x0F); + builder.append((ezspVersionResponse.getStackVersion() >> (cnt * 4)) & 0x0F); if (cnt != 0) { builder.append('.'); } @@ -1381,7 +1385,6 @@ public boolean updateFirmware(final InputStream firmware, final ZigBeeTransportF // Initialise the EZSP protocol so we can start the bootloader // If this fails, then we continue on the assumption that the bootloader may already be running if (initialiseEzspProtocol()) { - EmberNcp ncp = getEmberNcp(); if (ncp.getBootloaderVersion() == BOOTLOADER_INVALID_VERSION) { logger.debug("EZSP bootload failed: No bootloader present"); return false; @@ -1490,7 +1493,6 @@ private ZigBeeStatus setConcentrator(ConcentratorConfig concentratorConfig) { private ZigBeeStatus setEmberTxPower(int txPower) { networkParameters.setRadioTxPower(txPower); - EmberNcp ncp = getEmberNcp(); return (ncp.setRadioPower(txPower) == EmberStatus.EMBER_SUCCESS) ? ZigBeeStatus.SUCCESS : ZigBeeStatus.BAD_RESPONSE; } @@ -1556,4 +1558,9 @@ private String printClusterList(int[] clusterIds) { protected EzspProtocolHandler getProtocolHandler() { return frameHandler; } + + @Override + public int getEzspVersion() { + return ezspVersion; + } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java index 8574d71042..a28a3f8b5f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrame.java @@ -50,16 +50,6 @@ public abstract class EzspFrame { */ private final static Logger logger = LoggerFactory.getLogger(EzspFrame.class); - /** - * The minimum supported version of EZSP - */ - private static final int EZSP_MIN_VERSION = 4; - - /** - * The maximum supported version of EZSP - */ - private static final int EZSP_MAX_VERSION = 8; - /** * The network ID bit shift */ @@ -70,11 +60,6 @@ public abstract class EzspFrame { */ protected static final int EZSP_NETWORK_ID_MASK = 0x60; - /** - * The current version of EZSP being used - */ - protected static int ezspVersion = EZSP_MIN_VERSION; - /** * Legacy frame ID for EZSP 5+ */ @@ -472,7 +457,7 @@ public int getFrameId() { * @param data the int[] containing the EZSP data from which to generate the frame * @return the {@link EzspFrameResponse} or null if the response can't be created. */ - public static EzspFrameResponse createHandler(int[] data) { + public static EzspFrameResponse createHandler(int ezspVersion, int[] data) { int frameId; try { @@ -497,8 +482,8 @@ public static EzspFrameResponse createHandler(int[] data) { Constructor ctor; try { - ctor = ezspClass.getConstructor(int[].class); - EzspFrameResponse ezspFrame = (EzspFrameResponse) ctor.newInstance(data); + ctor = ezspClass.getConstructor(int.class, int[].class); + EzspFrameResponse ezspFrame = (EzspFrameResponse) ctor.newInstance(ezspVersion, data); return ezspFrame; } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException e) { @@ -513,30 +498,6 @@ public static EzspFrameResponse createHandler(int[] data) { return null; } - /** - * Set the EZSP version to use - * - * @param ezspVersion the EZSP protocol version - * @return true if the version is supported - */ - public static boolean setEzspVersion(int ezspVersion) { - if (ezspVersion <= EZSP_MAX_VERSION && ezspVersion >= EZSP_MIN_VERSION) { - EzspFrame.ezspVersion = ezspVersion; - return true; - } - - return false; - } - - /** - * Gets the current version of EZSP that is in use. This will default to the minimum supported version on startup - * - * @return the current version of EZSP - */ - public static int getEzspVersion() { - return EzspFrame.ezspVersion; - } - private static String frameToString(int[] inputBuffer) { StringBuilder result = new StringBuilder(); for (int data : inputBuffer) { diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequest.java index 413ca7eecd..4d95713e40 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequest.java @@ -49,7 +49,7 @@ protected EzspFrameRequest() { sequenceNumber = (int) sequence.getAndIncrement() & 0xFF; } - protected void serializeHeader(final EzspSerializer serializer) { + protected void serializeHeader(final int ezspVersion, final EzspSerializer serializer) { // Output sequence number serializer.serializeUInt8(sequenceNumber); @@ -73,9 +73,9 @@ protected void serializeHeader(final EzspSerializer serializer) { } } - public int[] serialize() { + public int[] serialize(int ezspVersion) { EzspSerializer serializer = new EzspSerializer(); - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); return serializer.getPayload(); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponse.java index 9cd097ba0a..3166ce5c03 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponse.java @@ -53,7 +53,7 @@ public abstract class EzspFrameResponse extends EzspFrame { * * @param inputBuffer the input array to deserialize */ - protected EzspFrameResponse(int[] inputBuffer) { + protected EzspFrameResponse(int ezspVersion, int[] inputBuffer) { super(); deserializer = new EzspDeserializer(inputBuffer); sequenceNumber = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequest.java index c832ccf2e2..ba71be7ddc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequest.java @@ -203,9 +203,9 @@ public void setOutputClusterList(int[] outputClusterList) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(endpoint); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponse.java index 36213fa1d4..468a6f54e3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponse.java @@ -40,9 +40,9 @@ public class EzspAddEndpointResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspAddEndpointResponse(int[] inputBuffer) { + public EzspAddEndpointResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryRequest.java index 57c4ce05c8..178cd150b3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryRequest.java @@ -125,9 +125,9 @@ public void setKeyData(EmberKeyData keyData) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(address); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryResponse.java index dfcd10052d..28c4f796fd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddOrUpdateKeyTableEntryResponse.java @@ -38,9 +38,9 @@ public class EzspAddOrUpdateKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspAddOrUpdateKeyTableEntryResponse(int[] inputBuffer) { + public EzspAddOrUpdateKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyRequest.java index ea6d209209..138be59bbc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyRequest.java @@ -99,9 +99,9 @@ public void setTransientKey(EmberKeyData transientKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(partner); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyResponse.java index 7a3a0d5dbb..b0a01fabbf 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddTransientLinkKeyResponse.java @@ -36,9 +36,9 @@ public class EzspAddTransientLinkKeyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspAddTransientLinkKeyResponse(int[] inputBuffer) { + public EzspAddTransientLinkKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveRequest.java index 913b9f0a78..cba302d2c6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveRequest.java @@ -69,9 +69,9 @@ public void setAddressTableIndex(int addressTableIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(addressTableIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveResponse.java index 29b058c41a..f4ff1ebb99 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddressTableEntryIsActiveResponse.java @@ -37,9 +37,9 @@ public class EzspAddressTableEntryIsActiveResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspAddressTableEntryIsActiveResponse(int[] inputBuffer) { + public EzspAddressTableEntryIsActiveResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields active = deserializer.deserializeBool(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequest.java index fae1e17421..dbf73b8899 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequest.java @@ -150,9 +150,9 @@ public void setData(int[] data) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberAesMmoHashContext(context); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashResponse.java index 89a2182134..56f5482809 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashResponse.java @@ -45,9 +45,9 @@ public class EzspAesMmoHashResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspAesMmoHashResponse(int[] inputBuffer) { + public EzspAesMmoHashResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterRequest.java index 1d2df1ab00..3d9f1bab6e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterRequest.java @@ -69,9 +69,9 @@ public void setNewNetworkKey(EmberKeyData newNetworkKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberKeyData(newNetworkKey); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterResponse.java index 554e216c56..a943cf9b6d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBecomeTrustCenterResponse.java @@ -37,9 +37,9 @@ public class EzspBecomeTrustCenterResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspBecomeTrustCenterResponse(int[] inputBuffer) { + public EzspBecomeTrustCenterResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveRequest.java index 959dc10d6e..c308ff0f00 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveRequest.java @@ -68,9 +68,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveResponse.java index 8c440fdd69..dba63d17c7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspBindingIsActiveResponse.java @@ -36,9 +36,9 @@ public class EzspBindingIsActiveResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspBindingIsActiveResponse(int[] inputBuffer) { + public EzspBindingIsActiveResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields active = deserializer.deserializeBool(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Handler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Handler.java index be3cb5d0b4..9678856144 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Handler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Handler.java @@ -52,9 +52,9 @@ public class EzspCalculateSmacs283k1Handler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCalculateSmacs283k1Handler(int[] inputBuffer) { + public EzspCalculateSmacs283k1Handler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Request.java index 96c2a845bb..c69e2ac2f7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Request.java @@ -125,9 +125,9 @@ public void setPartnerEphemeralPublicKey(EmberPublicKey283k1Data partnerEphemera } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(amInitiator); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Response.java index 23df2eb82c..e2befde63c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacs283k1Response.java @@ -38,9 +38,9 @@ public class EzspCalculateSmacs283k1Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCalculateSmacs283k1Response(int[] inputBuffer) { + public EzspCalculateSmacs283k1Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsHandler.java index 717a721668..b6b2a95dc0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsHandler.java @@ -52,9 +52,9 @@ public class EzspCalculateSmacsHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCalculateSmacsHandler(int[] inputBuffer) { + public EzspCalculateSmacsHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsRequest.java index f26c2ba7c3..7e085f7d53 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsRequest.java @@ -124,9 +124,9 @@ public void setPartnerEphemeralPublicKey(EmberPublicKeyData partnerEphemeralPubl } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(amInitiator); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsResponse.java index dddb2e27c4..0b7ffa1e12 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCalculateSmacsResponse.java @@ -37,9 +37,9 @@ public class EzspCalculateSmacsResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCalculateSmacsResponse(int[] inputBuffer) { + public EzspCalculateSmacsResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackRequest.java index 877df5220d..817e34cc61 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackRequest.java @@ -38,9 +38,9 @@ public EzspCallbackRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackResponse.java index 11903052e1..f6f80e01bd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCallbackResponse.java @@ -26,9 +26,9 @@ public class EzspCallbackResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCallbackResponse(int[] inputBuffer) { + public EzspCallbackResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandler.java index 479661f45a..7e3440caea 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandler.java @@ -63,9 +63,9 @@ public class EzspChildJoinHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspChildJoinHandler(int[] inputBuffer) { + public EzspChildJoinHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableRequest.java index c3f0ce7929..50c422bebe 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableRequest.java @@ -38,9 +38,9 @@ public EzspClearBindingTableRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableResponse.java index 52f6008c33..c508e89a66 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearBindingTableResponse.java @@ -34,9 +34,9 @@ public class EzspClearBindingTableResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspClearBindingTableResponse(int[] inputBuffer) { + public EzspClearBindingTableResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableRequest.java index b2b57375ec..a48901d442 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableRequest.java @@ -38,9 +38,9 @@ public EzspClearKeyTableRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableResponse.java index 5c4d7d7ad2..893d27cf20 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearKeyTableResponse.java @@ -34,9 +34,9 @@ public class EzspClearKeyTableResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspClearKeyTableResponse(int[] inputBuffer) { + public EzspClearKeyTableResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsRequest.java index a864363ec9..bd7609056a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsRequest.java @@ -38,9 +38,9 @@ public EzspClearStoredBeaconsRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsResponse.java index c5677d6338..095b0869a6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearStoredBeaconsResponse.java @@ -26,9 +26,9 @@ public class EzspClearStoredBeaconsResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspClearStoredBeaconsResponse(int[] inputBuffer) { + public EzspClearStoredBeaconsResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Request.java index 2fab249789..1396c6443f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Request.java @@ -70,9 +70,9 @@ public void setStoreLinkKey(boolean storeLinkKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(storeLinkKey); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Response.java index aa9f2ae725..8a1ee92ff6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKey283k1Response.java @@ -36,9 +36,9 @@ public class EzspClearTemporaryDataMaybeStoreLinkKey283k1Response extends EzspFr /** * Response and Handler constructor */ - public EzspClearTemporaryDataMaybeStoreLinkKey283k1Response(int[] inputBuffer) { + public EzspClearTemporaryDataMaybeStoreLinkKey283k1Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyRequest.java index 40b75a5a8e..c7ea3b00fe 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyRequest.java @@ -70,9 +70,9 @@ public void setStoreLinkKey(boolean storeLinkKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(storeLinkKey); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyResponse.java index 15ce5dcc77..15d6e21f01 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTemporaryDataMaybeStoreLinkKeyResponse.java @@ -36,9 +36,9 @@ public class EzspClearTemporaryDataMaybeStoreLinkKeyResponse extends EzspFrameRe /** * Response and Handler constructor */ - public EzspClearTemporaryDataMaybeStoreLinkKeyResponse(int[] inputBuffer) { + public EzspClearTemporaryDataMaybeStoreLinkKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysRequest.java index 58d8e81005..f7089e316d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysRequest.java @@ -38,9 +38,9 @@ public EzspClearTransientLinkKeysRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysResponse.java index 0658269221..d4c3ef7be7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspClearTransientLinkKeysResponse.java @@ -26,9 +26,9 @@ public class EzspClearTransientLinkKeysResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspClearTransientLinkKeysResponse(int[] inputBuffer) { + public EzspClearTransientLinkKeysResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCounterRolloverHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCounterRolloverHandler.java index e23973d323..0b67a8bcc5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCounterRolloverHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCounterRolloverHandler.java @@ -33,9 +33,9 @@ public class EzspCounterRolloverHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCounterRolloverHandler(int[] inputBuffer) { + public EzspCounterRolloverHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields type = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameHandler.java index 5de0ad3cf0..a2c202c69d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameHandler.java @@ -33,9 +33,9 @@ public class EzspCustomFrameHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCustomFrameHandler(int[] inputBuffer) { + public EzspCustomFrameHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields int payloadLength = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameRequest.java index 279f17ef51..e21e06961b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameRequest.java @@ -67,9 +67,9 @@ public void setPayload(int[] payload) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(payload.length); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameResponse.java index c1dc97c851..498010cfc6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspCustomFrameResponse.java @@ -43,9 +43,9 @@ public class EzspCustomFrameResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspCustomFrameResponse(int[] inputBuffer) { + public EzspCustomFrameResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendRequest.java index 7aafa5dd41..609d11aa07 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendRequest.java @@ -228,9 +228,9 @@ public void setGpTxQueueEntryLifetimeMs(int gpTxQueueEntryLifetimeMs) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(action); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendResponse.java index b1dd0a8224..3bdc697f1b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSendResponse.java @@ -34,9 +34,9 @@ public class EzspDGpSendResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspDGpSendResponse(int[] inputBuffer) { + public EzspDGpSendResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSentHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSentHandler.java index a0763731a2..105e87a6a8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSentHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDGpSentHandler.java @@ -41,9 +41,9 @@ public class EzspDGpSentHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspDGpSentHandler(int[] inputBuffer) { + public EzspDGpSentHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingRequest.java index 2aeb6e0bfa..e106848243 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingRequest.java @@ -65,9 +65,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingResponse.java index 3869b3245a..9d071fd9bc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspDeleteBindingResponse.java @@ -34,9 +34,9 @@ public class EzspDeleteBindingResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspDeleteBindingResponse(int[] inputBuffer) { + public EzspDeleteBindingResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestRequest.java index 262d247650..89956c2a13 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestRequest.java @@ -151,9 +151,9 @@ public void setScanCount(int scanCount) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(target); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestResponse.java index 416187e099..0cc1048a20 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanRequestResponse.java @@ -36,9 +36,9 @@ public class EzspEnergyScanRequestResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspEnergyScanRequestResponse(int[] inputBuffer) { + public EzspEnergyScanRequestResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanResultHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanResultHandler.java index d60c1c82ec..08a460408b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanResultHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEnergyScanResultHandler.java @@ -41,9 +41,9 @@ public class EzspEnergyScanResultHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspEnergyScanResultHandler(int[] inputBuffer) { + public EzspEnergyScanResultHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields channel = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryRequest.java index 40eb8281bb..5840d9ac19 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryRequest.java @@ -66,9 +66,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryResponse.java index 8321db2b2a..3decf74f78 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspEraseKeyTableEntryResponse.java @@ -35,9 +35,9 @@ public class EzspEraseKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspEraseKeyTableEntryResponse(int[] inputBuffer) { + public EzspEraseKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkRequest.java index eddec35dab..13a89edf9c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkRequest.java @@ -116,9 +116,9 @@ public void setChannelMask(int channelMask) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(haveCurrentNetworkKey); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkResponse.java index 873c2b4492..fe74a90bb1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindAndRejoinNetworkResponse.java @@ -43,9 +43,9 @@ public class EzspFindAndRejoinNetworkResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspFindAndRejoinNetworkResponse(int[] inputBuffer) { + public EzspFindAndRejoinNetworkResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryRequest.java index 0c46492ca8..8e0d19d6ff 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryRequest.java @@ -100,9 +100,9 @@ public void setLinkKey(boolean linkKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(address); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryResponse.java index e414fd6f7b..0e794658b2 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFindKeyTableEntryResponse.java @@ -35,9 +35,9 @@ public class EzspFindKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspFindKeyTableEntryResponse(int[] inputBuffer) { + public EzspFindKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkRequest.java index 3aff1e0122..1438f9f202 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkRequest.java @@ -66,9 +66,9 @@ public void setParameters(EmberNetworkParameters parameters) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberNetworkParameters(parameters); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkResponse.java index 7b152e2f21..d2de907f61 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspFormNetworkResponse.java @@ -34,9 +34,9 @@ public class EzspFormNetworkResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspFormNetworkResponse(int[] inputBuffer) { + public EzspFormNetworkResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Handler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Handler.java index 70bf991e2d..e90dcf2fc6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Handler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Handler.java @@ -45,9 +45,9 @@ public class EzspGenerateCbkeKeys283k1Handler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGenerateCbkeKeys283k1Handler(int[] inputBuffer) { + public EzspGenerateCbkeKeys283k1Handler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Request.java index ca81aff466..45d38f4e18 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Request.java @@ -40,9 +40,9 @@ public EzspGenerateCbkeKeys283k1Request() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Response.java index 64feee2308..91bcf46ee4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeys283k1Response.java @@ -36,9 +36,9 @@ public class EzspGenerateCbkeKeys283k1Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGenerateCbkeKeys283k1Response(int[] inputBuffer) { + public EzspGenerateCbkeKeys283k1Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysHandler.java index 88f69378c5..09a1e8a7e0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysHandler.java @@ -44,9 +44,9 @@ public class EzspGenerateCbkeKeysHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGenerateCbkeKeysHandler(int[] inputBuffer) { + public EzspGenerateCbkeKeysHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysRequest.java index 6b0b47d84a..d4d963fdc4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysRequest.java @@ -39,9 +39,9 @@ public EzspGenerateCbkeKeysRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysResponse.java index b888ceb22c..0cd9b48d95 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGenerateCbkeKeysResponse.java @@ -35,9 +35,9 @@ public class EzspGenerateCbkeKeysResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGenerateCbkeKeysResponse(int[] inputBuffer) { + public EzspGenerateCbkeKeysResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Request.java index 64c9ea7d38..272b7bd94c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Request.java @@ -65,9 +65,9 @@ public void setAddressTableIndex(int addressTableIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(addressTableIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Response.java index bb50f25225..cd702daa20 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteEui64Response.java @@ -34,9 +34,9 @@ public class EzspGetAddressTableRemoteEui64Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetAddressTableRemoteEui64Response(int[] inputBuffer) { + public EzspGetAddressTableRemoteEui64Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields eui64 = deserializer.deserializeEmberEui64(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdRequest.java index 0c391a41e9..e329cfc5fa 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdRequest.java @@ -65,9 +65,9 @@ public void setAddressTableIndex(int addressTableIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(addressTableIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdResponse.java index 777979056b..8113451e1d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetAddressTableRemoteNodeIdResponse.java @@ -39,9 +39,9 @@ public class EzspGetAddressTableRemoteNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetAddressTableRemoteNodeIdResponse(int[] inputBuffer) { + public EzspGetAddressTableRemoteNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields nodeId = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdRequest.java index ba4af8f340..e6e669f684 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdRequest.java @@ -70,9 +70,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdResponse.java index fc82153eb0..c62d9f4a42 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRemoteNodeIdResponse.java @@ -38,9 +38,9 @@ public class EzspGetBindingRemoteNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetBindingRemoteNodeIdResponse(int[] inputBuffer) { + public EzspGetBindingRemoteNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields nodeId = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRequest.java index e951350a4b..f8517680c9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingRequest.java @@ -65,9 +65,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingResponse.java index ac40753b17..3a9fda5877 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetBindingResponse.java @@ -42,9 +42,9 @@ public class EzspGetBindingResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetBindingResponse(int[] inputBuffer) { + public EzspGetBindingResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Request.java index b16e5a7491..de1467b7ef 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Request.java @@ -38,9 +38,9 @@ public EzspGetCertificate283k1Request() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Response.java index 3dd7a6b708..22877f5d49 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificate283k1Response.java @@ -42,9 +42,9 @@ public class EzspGetCertificate283k1Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetCertificate283k1Response(int[] inputBuffer) { + public EzspGetCertificate283k1Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateRequest.java index 6eb410d521..8901c4e4f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateRequest.java @@ -38,9 +38,9 @@ public EzspGetCertificateRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateResponse.java index d68150b86f..67c3ed7bff 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCertificateResponse.java @@ -42,9 +42,9 @@ public class EzspGetCertificateResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetCertificateResponse(int[] inputBuffer) { + public EzspGetCertificateResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataRequest.java index 707fca00a7..05225abb10 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataRequest.java @@ -68,9 +68,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataResponse.java index e4b4b80935..95ea0d550d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetChildDataResponse.java @@ -57,9 +57,9 @@ public class EzspGetChildDataResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetChildDataResponse(int[] inputBuffer) { + public EzspGetChildDataResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueRequest.java index cd9235b55d..9bb1573e18 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueRequest.java @@ -66,9 +66,9 @@ public void setConfigId(EzspConfigId configId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspConfigId(configId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueResponse.java index 30216b2cb6..f662e50cfd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetConfigurationValueResponse.java @@ -42,9 +42,9 @@ public class EzspGetConfigurationValueResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetConfigurationValueResponse(int[] inputBuffer) { + public EzspGetConfigurationValueResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateRequest.java index 5940887cbb..c955e45736 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateRequest.java @@ -38,9 +38,9 @@ public EzspGetCurrentSecurityStateRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateResponse.java index 6cdbc1f60a..97b8195cc7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetCurrentSecurityStateResponse.java @@ -42,9 +42,9 @@ public class EzspGetCurrentSecurityStateResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetCurrentSecurityStateResponse(int[] inputBuffer) { + public EzspGetCurrentSecurityStateResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Request.java index e0fcd2c1e9..601d0e9d0a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Request.java @@ -38,9 +38,9 @@ public EzspGetEui64Request() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Response.java index f3ecbe04cb..aede4c6ec6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetEui64Response.java @@ -34,9 +34,9 @@ public class EzspGetEui64Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetEui64Response(int[] inputBuffer) { + public EzspGetEui64Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields eui64 = deserializer.deserializeEmberEui64(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutRequest.java index b0060fc6b8..fe8bf63fb4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutRequest.java @@ -67,9 +67,9 @@ public void setRemoteEui64(IeeeAddress remoteEui64) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(remoteEui64); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutResponse.java index 07a649b5f2..01759f3beb 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedTimeoutResponse.java @@ -35,9 +35,9 @@ public class EzspGetExtendedTimeoutResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetExtendedTimeoutResponse(int[] inputBuffer) { + public EzspGetExtendedTimeoutResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields extendedTimeout = deserializer.deserializeBool(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueRequest.java index b0b337ef45..27c1921861 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueRequest.java @@ -96,9 +96,9 @@ public void setCharacteristics(int characteristics) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspExtendedValueId(valueId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueResponse.java index fc038dd754..5843a2869e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetExtendedValueResponse.java @@ -42,9 +42,9 @@ public class EzspGetExtendedValueResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetExtendedValueResponse(int[] inputBuffer) { + public EzspGetExtendedValueResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconRequest.java index 8f35490e2f..16692e0446 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconRequest.java @@ -39,9 +39,9 @@ public EzspGetFirstBeaconRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconResponse.java index 3f8b59a874..74b2aedc0a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetFirstBeaconResponse.java @@ -44,9 +44,9 @@ public class EzspGetFirstBeaconResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetFirstBeaconResponse(int[] inputBuffer) { + public EzspGetFirstBeaconResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequest.java index eeb040a0d9..ba21398433 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequest.java @@ -61,9 +61,9 @@ public void setKeyType(EmberKeyType keyType) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberKeyType(keyType); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponse.java index a396b08f60..f8fa1ece1a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponse.java @@ -42,9 +42,9 @@ public class EzspGetKeyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetKeyResponse(int[] inputBuffer) { + public EzspGetKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequest.java index 4467287fec..3c9d152cda 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequest.java @@ -65,9 +65,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponse.java index d9f9a7a54c..b3c906c9d3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponse.java @@ -43,9 +43,9 @@ public class EzspGetKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetKeyTableEntryResponse(int[] inputBuffer) { + public EzspGetKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusRequest.java index b55cec40e6..c0ab3f7e4d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusRequest.java @@ -67,9 +67,9 @@ public void setLibraryId(EmberLibraryId libraryId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberLibraryId(libraryId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusResponse.java index 70a02e6e85..2a24b09a26 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetLibraryStatusResponse.java @@ -35,9 +35,9 @@ public class EzspGetLibraryStatusResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetLibraryStatusResponse(int[] inputBuffer) { + public EzspGetLibraryStatusResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberLibraryStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenRequest.java index 5e9804ee18..878f1ebd68 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenRequest.java @@ -67,9 +67,9 @@ public void setTokenId(EzspMfgTokenId tokenId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspMfgTokenId(tokenId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenResponse.java index da98a275a7..395b144392 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMfgTokenResponse.java @@ -34,9 +34,9 @@ public class EzspGetMfgTokenResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetMfgTokenResponse(int[] inputBuffer) { + public EzspGetMfgTokenResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields int tokenDataLength = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryRequest.java index 5a93389a96..df460efc37 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryRequest.java @@ -65,9 +65,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryResponse.java index cf7f967efe..282863757f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetMulticastTableEntryResponse.java @@ -42,9 +42,9 @@ public class EzspGetMulticastTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetMulticastTableEntryResponse(int[] inputBuffer) { + public EzspGetMulticastTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborRequest.java index baee376da7..da8d556d8b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborRequest.java @@ -69,9 +69,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponse.java index b87db71d47..06b755fcde 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponse.java @@ -44,9 +44,9 @@ public class EzspGetNeighborResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetNeighborResponse(int[] inputBuffer) { + public EzspGetNeighborResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersRequest.java index d9198d67b0..7b7cc2a092 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersRequest.java @@ -38,9 +38,9 @@ public EzspGetNetworkParametersRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponse.java index 27d8d4e135..d1480d09cd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponse.java @@ -50,9 +50,9 @@ public class EzspGetNetworkParametersResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetNetworkParametersResponse(int[] inputBuffer) { + public EzspGetNetworkParametersResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconRequest.java index 25ae21fb0b..b01b38fdbf 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconRequest.java @@ -39,9 +39,9 @@ public EzspGetNextBeaconRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconResponse.java index 6e369b1600..ebf11ef31d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNextBeaconResponse.java @@ -45,9 +45,9 @@ public class EzspGetNextBeaconResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetNextBeaconResponse(int[] inputBuffer) { + public EzspGetNextBeaconResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdRequest.java index 82e88a356d..973f6ec07d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdRequest.java @@ -38,9 +38,9 @@ public EzspGetNodeIdRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdResponse.java index 4a61c47809..1b8273c5a5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNodeIdResponse.java @@ -33,9 +33,9 @@ public class EzspGetNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetNodeIdResponse(int[] inputBuffer) { + public EzspGetNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields nodeId = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsRequest.java index 7c91c0c3bf..f56d71caa9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsRequest.java @@ -38,9 +38,9 @@ public EzspGetNumStoredBeaconsRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsResponse.java index c7276cfade..bb6c1d8cc6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNumStoredBeaconsResponse.java @@ -33,9 +33,9 @@ public class EzspGetNumStoredBeaconsResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetNumStoredBeaconsResponse(int[] inputBuffer) { + public EzspGetNumStoredBeaconsResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields numBeacons = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersRequest.java index d45ad573a4..8344197594 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersRequest.java @@ -38,9 +38,9 @@ public EzspGetParentChildParametersRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersResponse.java index b0f42a29a7..81f30ec880 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetParentChildParametersResponse.java @@ -50,9 +50,9 @@ public class EzspGetParentChildParametersResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetParentChildParametersResponse(int[] inputBuffer) { + public EzspGetParentChildParametersResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields childCount = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyRequest.java index 417cb42c63..84c7200516 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyRequest.java @@ -66,9 +66,9 @@ public void setPolicyId(EzspPolicyId policyId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspPolicyId(policyId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyResponse.java index ab93f664a3..50258067c3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetPolicyResponse.java @@ -42,9 +42,9 @@ public class EzspGetPolicyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetPolicyResponse(int[] inputBuffer) { + public EzspGetPolicyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryRequest.java index b8c35c498d..08bda30df1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryRequest.java @@ -66,9 +66,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponse.java index 6d355ee2a1..2002d4229e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponse.java @@ -44,9 +44,9 @@ public class EzspGetRouteTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetRouteTableEntryResponse(int[] inputBuffer) { + public EzspGetRouteTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdRequest.java index f5af859b81..c91134afa4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdRequest.java @@ -39,9 +39,9 @@ public EzspGetRoutingShortcutThresholdRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdResponse.java index 235832912b..b562dfaef8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRoutingShortcutThresholdResponse.java @@ -34,9 +34,9 @@ public class EzspGetRoutingShortcutThresholdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetRoutingShortcutThresholdResponse(int[] inputBuffer) { + public EzspGetRoutingShortcutThresholdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields routingShortcutThresh = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryRequest.java index fa0fc6d850..5a10dacdb7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryRequest.java @@ -68,9 +68,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryResponse.java index f5ab64526f..3f5ca86719 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableEntryResponse.java @@ -49,9 +49,9 @@ public class EzspGetSourceRouteTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetSourceRouteTableEntryResponse(int[] inputBuffer) { + public EzspGetSourceRouteTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeRequest.java index 57abf6e0d7..73ff951d14 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeRequest.java @@ -38,9 +38,9 @@ public EzspGetSourceRouteTableFilledSizeRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeResponse.java index 60b3bb8d1f..b833cf91ad 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableFilledSizeResponse.java @@ -33,9 +33,9 @@ public class EzspGetSourceRouteTableFilledSizeResponse extends EzspFrameResponse /** * Response and Handler constructor */ - public EzspGetSourceRouteTableFilledSizeResponse(int[] inputBuffer) { + public EzspGetSourceRouteTableFilledSizeResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields sourceRouteTableFilledSize = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeRequest.java index 6ee0c11b48..72a3adcb9b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeRequest.java @@ -38,9 +38,9 @@ public EzspGetSourceRouteTableTotalSizeRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeResponse.java index 50b69030ab..76356c5107 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetSourceRouteTableTotalSizeResponse.java @@ -33,9 +33,9 @@ public class EzspGetSourceRouteTableTotalSizeResponse extends EzspFrameResponse /** * Response and Handler constructor */ - public EzspGetSourceRouteTableTotalSizeResponse(int[] inputBuffer) { + public EzspGetSourceRouteTableTotalSizeResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields sourceRouteTableTotalSize = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest.java index aa94e5f0c7..4965e56df8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest.java @@ -40,9 +40,9 @@ public EzspGetStandaloneBootloaderVersionPlatMicroPhyRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse.java index 346f4ddc77..7ba33e2bfe 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse.java @@ -57,9 +57,9 @@ public class EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse extends Ezsp /** * Response and Handler constructor */ - public EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse(int[] inputBuffer) { + public EzspGetStandaloneBootloaderVersionPlatMicroPhyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields bootloaderVersion = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryRequest.java index 99ffe60d17..585d80f3af 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryRequest.java @@ -65,9 +65,9 @@ public void setIndex(int index) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryResponse.java index 969c2ac74c..75b1337226 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientKeyTableEntryResponse.java @@ -42,9 +42,9 @@ public class EzspGetTransientKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetTransientKeyTableEntryResponse(int[] inputBuffer) { + public EzspGetTransientKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyRequest.java index e67ab735f0..5b97a44b88 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyRequest.java @@ -68,9 +68,9 @@ public void setEui(IeeeAddress eui) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(eui); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyResponse.java index 2646c3cbb9..37e6387eec 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetTransientLinkKeyResponse.java @@ -44,9 +44,9 @@ public class EzspGetTransientLinkKeyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetTransientLinkKeyResponse(int[] inputBuffer) { + public EzspGetTransientLinkKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueRequest.java index bc8827065e..a5301e67ef 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueRequest.java @@ -66,9 +66,9 @@ public void setValueId(EzspValueId valueId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspValueId(valueId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueResponse.java index e758ab446f..2a6cd6b9f7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetValueResponse.java @@ -42,9 +42,9 @@ public class EzspGetValueResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetValueResponse(int[] inputBuffer) { + public EzspGetValueResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoRequest.java index 8d7acc006e..a1ec7baeff 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoRequest.java @@ -40,9 +40,9 @@ public EzspGetXncpInfoRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoResponse.java index 56858bf6cd..e1add9a501 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetXncpInfoResponse.java @@ -50,9 +50,9 @@ public class EzspGetXncpInfoResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGetXncpInfoResponse(int[] inputBuffer) { + public EzspGetXncpInfoResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryRequest.java index dc1f71439f..08673b5a5d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryRequest.java @@ -65,9 +65,9 @@ public void setProxyIndex(int proxyIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(proxyIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryResponse.java index cbd7a9dfea..32400f52b5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableGetEntryResponse.java @@ -42,9 +42,9 @@ public class EzspGpProxyTableGetEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpProxyTableGetEntryResponse(int[] inputBuffer) { + public EzspGpProxyTableGetEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupRequest.java index 6a2660526f..f69260d1b8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupRequest.java @@ -66,9 +66,9 @@ public void setAddr(EmberGpAddress addr) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberGpAddress(addr); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupResponse.java index adcfe13d23..b3f4fdce6f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableLookupResponse.java @@ -33,9 +33,9 @@ public class EzspGpProxyTableLookupResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpProxyTableLookupResponse(int[] inputBuffer) { + public EzspGpProxyTableLookupResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingRequest.java index 6013bfbb10..92fc315d5e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingRequest.java @@ -257,9 +257,9 @@ public void setGpdKey(EmberKeyData gpdKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt32(options); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingResponse.java index 32221681e8..fdab695859 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpProxyTableProcessGpPairingResponse.java @@ -33,9 +33,9 @@ public class EzspGpProxyTableProcessGpPairingResponse extends EzspFrameResponse /** * Response and Handler constructor */ - public EzspGpProxyTableProcessGpPairingResponse(int[] inputBuffer) { + public EzspGpProxyTableProcessGpPairingResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields gpPairingAdded = deserializer.deserializeBool(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllRequest.java index f64973c9fb..b7c4c6b85b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllRequest.java @@ -38,9 +38,9 @@ public EzspGpSinkTableClearAllRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllResponse.java index 3623dd1081..e207e801d4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableClearAllResponse.java @@ -26,9 +26,9 @@ public class EzspGpSinkTableClearAllResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableClearAllResponse(int[] inputBuffer) { + public EzspGpSinkTableClearAllResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryRequest.java index 846a842c7f..9c9ed6a2ba 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryRequest.java @@ -66,9 +66,9 @@ public void setAddr(EmberGpAddress addr) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberGpAddress(addr); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryResponse.java index 43e991fbaf..c2ad09c699 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableFindOrAllocateEntryResponse.java @@ -33,9 +33,9 @@ public class EzspGpSinkTableFindOrAllocateEntryResponse extends EzspFrameRespons /** * Response and Handler constructor */ - public EzspGpSinkTableFindOrAllocateEntryResponse(int[] inputBuffer) { + public EzspGpSinkTableFindOrAllocateEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryRequest.java index 2459f9677d..bcf3629eb0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryRequest.java @@ -65,9 +65,9 @@ public void setSinkIndex(int sinkIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(sinkIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryResponse.java index aefffd60d4..96b93f55a1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableGetEntryResponse.java @@ -42,9 +42,9 @@ public class EzspGpSinkTableGetEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableGetEntryResponse(int[] inputBuffer) { + public EzspGpSinkTableGetEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitRequest.java index 60660478dd..62c01c3d17 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitRequest.java @@ -38,9 +38,9 @@ public EzspGpSinkTableInitRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitResponse.java index 3f74a7e47e..6df67e7c42 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableInitResponse.java @@ -26,9 +26,9 @@ public class EzspGpSinkTableInitResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableInitResponse(int[] inputBuffer) { + public EzspGpSinkTableInitResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupRequest.java index d879f057d2..56e687f6b6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupRequest.java @@ -66,9 +66,9 @@ public void setAddr(EmberGpAddress addr) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberGpAddress(addr); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupResponse.java index 83f6cecd06..eca0d9af18 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableLookupResponse.java @@ -33,9 +33,9 @@ public class EzspGpSinkTableLookupResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableLookupResponse(int[] inputBuffer) { + public EzspGpSinkTableLookupResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryRequest.java index 02260e4556..cbb3daa55e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryRequest.java @@ -65,9 +65,9 @@ public void setSinkIndex(int sinkIndex) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(sinkIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryResponse.java index 664d438125..dba047ba4e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableRemoveEntryResponse.java @@ -26,9 +26,9 @@ public class EzspGpSinkTableRemoveEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableRemoveEntryResponse(int[] inputBuffer) { + public EzspGpSinkTableRemoveEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryRequest.java index bfef47741f..5280fef086 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryRequest.java @@ -93,9 +93,9 @@ public void setEntry(EmberGpSinkTableEntry entry) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(sinkIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryResponse.java index 0bb27fc392..18362875d2 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpSinkTableSetEntryResponse.java @@ -34,9 +34,9 @@ public class EzspGpSinkTableSetEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpSinkTableSetEntryResponse(int[] inputBuffer) { + public EzspGpSinkTableSetEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandler.java index 60716a6474..9292351e3c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandler.java @@ -122,9 +122,9 @@ public class EzspGpepIncomingMessageHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspGpepIncomingMessageHandler(int[] inputBuffer) { + public EzspGpepIncomingMessageHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIdConflictHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIdConflictHandler.java index 68e261cbf7..3f9d1a9914 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIdConflictHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIdConflictHandler.java @@ -37,9 +37,9 @@ public class EzspIdConflictHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIdConflictHandler(int[] inputBuffer) { + public EzspIdConflictHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields id = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingManyToOneRouteRequestHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingManyToOneRouteRequestHandler.java index 6eec7051fa..1a17a280f1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingManyToOneRouteRequestHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingManyToOneRouteRequestHandler.java @@ -50,9 +50,9 @@ public class EzspIncomingManyToOneRouteRequestHandler extends EzspFrameResponse /** * Response and Handler constructor */ - public EzspIncomingManyToOneRouteRequestHandler(int[] inputBuffer) { + public EzspIncomingManyToOneRouteRequestHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields source = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandler.java index 308932eb97..755114bcfc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandler.java @@ -88,9 +88,9 @@ public class EzspIncomingMessageHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIncomingMessageHandler(int[] inputBuffer) { + public EzspIncomingMessageHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields type = deserializer.deserializeEmberIncomingMessageType(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingNetworkStatusHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingNetworkStatusHandler.java index 3faf4feee1..04d454ae7f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingNetworkStatusHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingNetworkStatusHandler.java @@ -42,9 +42,9 @@ public class EzspIncomingNetworkStatusHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIncomingNetworkStatusHandler(int[] inputBuffer) { + public EzspIncomingNetworkStatusHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields errorCode = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteErrorHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteErrorHandler.java index dba09f606f..8e9d19c7ac 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteErrorHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteErrorHandler.java @@ -42,9 +42,9 @@ public class EzspIncomingRouteErrorHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIncomingRouteErrorHandler(int[] inputBuffer) { + public EzspIncomingRouteErrorHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandler.java index fbebc0b67f..b09fdb0789 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandler.java @@ -62,9 +62,9 @@ public class EzspIncomingRouteRecordHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIncomingRouteRecordHandler(int[] inputBuffer) { + public EzspIncomingRouteRecordHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields source = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64Handler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64Handler.java index cf2f1e1b49..08755be1a9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64Handler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64Handler.java @@ -36,9 +36,9 @@ public class EzspIncomingSenderEui64Handler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspIncomingSenderEui64Handler(int[] inputBuffer) { + public EzspIncomingSenderEui64Handler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields senderEui64 = deserializer.deserializeEmberEui64(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandRequest.java index 0873e0e3c5..189abac9a8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandRequest.java @@ -38,9 +38,9 @@ public EzspInvalidCommandRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandResponse.java index 376c9bbf72..e91e60b099 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspInvalidCommandResponse.java @@ -34,9 +34,9 @@ public class EzspInvalidCommandResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspInvalidCommandResponse(int[] inputBuffer) { + public EzspInvalidCommandResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields reason = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkRequest.java index 45af564668..3464454193 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkRequest.java @@ -99,9 +99,9 @@ public void setParameters(EmberNetworkParameters parameters) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberNodeType(nodeType); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkResponse.java index c99febb61f..1768b91e4d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspJoinNetworkResponse.java @@ -36,9 +36,9 @@ public class EzspJoinNetworkResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspJoinNetworkResponse(int[] inputBuffer) { + public EzspJoinNetworkResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderRequest.java index fd1949ca8c..12500fe5f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderRequest.java @@ -81,9 +81,9 @@ public void setMode(int mode) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(mode); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderResponse.java index 27964070a0..a7ffed4a58 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLaunchStandaloneBootloaderResponse.java @@ -35,9 +35,9 @@ public class EzspLaunchStandaloneBootloaderResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspLaunchStandaloneBootloaderResponse(int[] inputBuffer) { + public EzspLaunchStandaloneBootloaderResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkRequest.java index 8b909ce78e..298518b14e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkRequest.java @@ -40,9 +40,9 @@ public EzspLeaveNetworkRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkResponse.java index 94b0d288d7..9b97167cb7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLeaveNetworkResponse.java @@ -36,9 +36,9 @@ public class EzspLeaveNetworkResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspLeaveNetworkResponse(int[] inputBuffer) { + public EzspLeaveNetworkResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequest.java index ad94b2a615..d6bc8639f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequest.java @@ -66,9 +66,9 @@ public void setNodeId(int nodeId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(nodeId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponse.java index 06f40f1a36..2af4db286b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponse.java @@ -43,9 +43,9 @@ public class EzspLookupEui64ByNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspLookupEui64ByNodeIdResponse(int[] inputBuffer) { + public EzspLookupEui64ByNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Request.java index 7ff940c58a..4f7520956c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Request.java @@ -67,9 +67,9 @@ public void setEui64(IeeeAddress eui64) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(eui64); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Response.java index 89502e9882..527e50d886 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupNodeIdByEui64Response.java @@ -34,9 +34,9 @@ public class EzspLookupNodeIdByEui64Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspLookupNodeIdByEui64Response(int[] inputBuffer) { + public EzspLookupNodeIdByEui64Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields nodeId = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandler.java index c7cc6fd14b..b596ee1262 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandler.java @@ -63,9 +63,9 @@ public class EzspMacFilterMatchMessageHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMacFilterMatchMessageHandler(int[] inputBuffer) { + public EzspMacFilterMatchMessageHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields filterIndexMatch = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandler.java index e27e9fc530..49f29f2db9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandler.java @@ -76,9 +76,9 @@ public class EzspMessageSentHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMessageSentHandler(int[] inputBuffer) { + public EzspMessageSentHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields type = deserializer.deserializeEmberOutgoingMessageType(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndRequest.java index 23a9545f68..e1296883a4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndRequest.java @@ -39,9 +39,9 @@ public EzspMfglibEndRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndResponse.java index cad92c334f..037705fac1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibEndResponse.java @@ -35,9 +35,9 @@ public class EzspMfglibEndResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibEndResponse(int[] inputBuffer) { + public EzspMfglibEndResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelRequest.java index fd6ef3c0e8..4355470019 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelRequest.java @@ -38,9 +38,9 @@ public EzspMfglibGetChannelRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelResponse.java index 4d8ee1f142..0ec5521433 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetChannelResponse.java @@ -33,9 +33,9 @@ public class EzspMfglibGetChannelResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibGetChannelResponse(int[] inputBuffer) { + public EzspMfglibGetChannelResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields channel = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerRequest.java index a8e545b362..c1ad06339d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerRequest.java @@ -38,9 +38,9 @@ public EzspMfglibGetPowerRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerResponse.java index f6affbd4dc..4e0a8d2721 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibGetPowerResponse.java @@ -33,9 +33,9 @@ public class EzspMfglibGetPowerResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibGetPowerResponse(int[] inputBuffer) { + public EzspMfglibGetPowerResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields power = deserializer.deserializeInt8S(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibRxHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibRxHandler.java index 7613561a15..f5ea95edc6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibRxHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibRxHandler.java @@ -47,9 +47,9 @@ public class EzspMfglibRxHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibRxHandler(int[] inputBuffer) { + public EzspMfglibRxHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields linkQuality = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketRequest.java index dff7f28d21..38f086eff4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketRequest.java @@ -68,9 +68,9 @@ public void setPacketContents(int[] packetContents) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(packetContents.length); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketResponse.java index 4e81635cad..c69052a6e5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSendPacketResponse.java @@ -37,9 +37,9 @@ public class EzspMfglibSendPacketResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibSendPacketResponse(int[] inputBuffer) { + public EzspMfglibSendPacketResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelRequest.java index d2c5181f4a..f6134cb9c9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelRequest.java @@ -66,9 +66,9 @@ public void setChannel(int channel) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(channel); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelResponse.java index 845e887b69..73299e4838 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetChannelResponse.java @@ -35,9 +35,9 @@ public class EzspMfglibSetChannelResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibSetChannelResponse(int[] inputBuffer) { + public EzspMfglibSetChannelResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerRequest.java index 9e0a590108..c4a76f5811 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerRequest.java @@ -96,9 +96,9 @@ public void setPower(int power) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberPowerMode(txPowerMode); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerResponse.java index 578de396ea..31ad9db271 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibSetPowerResponse.java @@ -37,9 +37,9 @@ public class EzspMfglibSetPowerResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibSetPowerResponse(int[] inputBuffer) { + public EzspMfglibSetPowerResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartRequest.java index c793691494..8d2d7c1f74 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartRequest.java @@ -68,9 +68,9 @@ public void setRxCallback(boolean rxCallback) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(rxCallback); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartResponse.java index 57476781af..ffe20018c0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartResponse.java @@ -37,9 +37,9 @@ public class EzspMfglibStartResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibStartResponse(int[] inputBuffer) { + public EzspMfglibStartResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamRequest.java index 8c837cea70..2d54c426f4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamRequest.java @@ -39,9 +39,9 @@ public EzspMfglibStartStreamRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamResponse.java index 388fe48fe2..2a394d3a01 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartStreamResponse.java @@ -35,9 +35,9 @@ public class EzspMfglibStartStreamResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibStartStreamResponse(int[] inputBuffer) { + public EzspMfglibStartStreamResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneRequest.java index d56ed02420..c7de7f0171 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneRequest.java @@ -41,9 +41,9 @@ public EzspMfglibStartToneRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneResponse.java index 3dcb4c3ae0..12cd89c04f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStartToneResponse.java @@ -37,9 +37,9 @@ public class EzspMfglibStartToneResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibStartToneResponse(int[] inputBuffer) { + public EzspMfglibStartToneResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamRequest.java index 6546dc9f4e..cdf415400e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamRequest.java @@ -38,9 +38,9 @@ public EzspMfglibStopStreamRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamResponse.java index 3c2197a286..1cda6659f1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopStreamResponse.java @@ -34,9 +34,9 @@ public class EzspMfglibStopStreamResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibStopStreamResponse(int[] inputBuffer) { + public EzspMfglibStopStreamResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneRequest.java index a3cf5975b7..9607a49707 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneRequest.java @@ -38,9 +38,9 @@ public EzspMfglibStopToneRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneResponse.java index c614db8304..ad5b6615bf 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMfglibStopToneResponse.java @@ -34,9 +34,9 @@ public class EzspMfglibStopToneResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspMfglibStopToneResponse(int[] inputBuffer) { + public EzspMfglibStopToneResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountRequest.java index 1e88d8ce4e..006542d25c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountRequest.java @@ -38,9 +38,9 @@ public EzspNeighborCountRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponse.java index e53af1b55c..81ecd797a1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponse.java @@ -33,9 +33,9 @@ public class EzspNeighborCountResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNeighborCountResponse(int[] inputBuffer) { + public EzspNeighborCountResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields value = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandler.java index d764689a1f..fff590b7c1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandler.java @@ -49,9 +49,9 @@ public class EzspNetworkFoundHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNetworkFoundHandler(int[] inputBuffer) { + public EzspNetworkFoundHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields networkFound = deserializer.deserializeEmberZigbeeNetwork(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitRequest.java index 80cf0726d0..680c9ddc6f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitRequest.java @@ -40,9 +40,9 @@ public EzspNetworkInitRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitResponse.java index 8d6198ee6e..f2820bb501 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkInitResponse.java @@ -37,9 +37,9 @@ public class EzspNetworkInitResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNetworkInitResponse(int[] inputBuffer) { + public EzspNetworkInitResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateRequest.java index 9d14b30632..e6c5362949 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateRequest.java @@ -38,9 +38,9 @@ public EzspNetworkStateRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateResponse.java index d572386e9f..2650d74909 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkStateResponse.java @@ -34,9 +34,9 @@ public class EzspNetworkStateResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNetworkStateResponse(int[] inputBuffer) { + public EzspNetworkStateResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberNetworkStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksRequest.java index 6719f0e83b..731a9fa60f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksRequest.java @@ -38,9 +38,9 @@ public EzspNoCallbacksRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksResponse.java index 299091b019..893a511e9c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNoCallbacksResponse.java @@ -26,9 +26,9 @@ public class EzspNoCallbacksResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNoCallbacksResponse(int[] inputBuffer) { + public EzspNoCallbacksResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopRequest.java index ee0796b67c..fc43172029 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopRequest.java @@ -39,9 +39,9 @@ public EzspNopRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopResponse.java index 3f0c9b67c7..5abdf21436 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNopResponse.java @@ -27,9 +27,9 @@ public class EzspNopResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspNopResponse(int[] inputBuffer) { + public EzspNopResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningRequest.java index b4bbc71229..1510f10540 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningRequest.java @@ -69,9 +69,9 @@ public void setDuration(int duration) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(duration); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningResponse.java index e550cd219f..4b554b083a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPermitJoiningResponse.java @@ -35,9 +35,9 @@ public class EzspPermitJoiningResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspPermitJoiningResponse(int[] inputBuffer) { + public EzspPermitJoiningResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPollHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPollHandler.java index f1febf3e42..fc66588ac3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPollHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspPollHandler.java @@ -34,9 +34,9 @@ public class EzspPollHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspPollHandler(int[] inputBuffer) { + public EzspPollHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields senderEui64 = deserializer.deserializeEmberEui64(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersRequest.java index 3f06d8b035..aa8b99c668 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersRequest.java @@ -39,9 +39,9 @@ public EzspReadAndClearCountersRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersResponse.java index 5377597efd..c21f1b6640 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadAndClearCountersResponse.java @@ -34,9 +34,9 @@ public class EzspReadAndClearCountersResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspReadAndClearCountersResponse(int[] inputBuffer) { + public EzspReadAndClearCountersResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields values = deserializer.deserializeUInt16Array(29); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersRequest.java index b21e05eb8a..28a0036405 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersRequest.java @@ -38,9 +38,9 @@ public EzspReadCountersRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersResponse.java index 4373fe555d..ccfe34c69e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspReadCountersResponse.java @@ -33,9 +33,9 @@ public class EzspReadCountersResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspReadCountersResponse(int[] inputBuffer) { + public EzspReadCountersResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields values = deserializer.deserializeUInt16Array(29); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteDeleteBindingHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteDeleteBindingHandler.java index ae31e73dce..1ae1fb12f8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteDeleteBindingHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteDeleteBindingHandler.java @@ -43,9 +43,9 @@ public class EzspRemoteDeleteBindingHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspRemoteDeleteBindingHandler(int[] inputBuffer) { + public EzspRemoteDeleteBindingHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields index = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteSetBindingHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteSetBindingHandler.java index e7e5ae81d6..5805668c8c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteSetBindingHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoteSetBindingHandler.java @@ -51,9 +51,9 @@ public class EzspRemoteSetBindingHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspRemoteSetBindingHandler(int[] inputBuffer) { + public EzspRemoteSetBindingHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields entry = deserializer.deserializeEmberBindingTableEntry(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceRequest.java index 65291d9b0e..189afa38dd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceRequest.java @@ -121,9 +121,9 @@ public void setTargetLong(IeeeAddress targetLong) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(destShort); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceResponse.java index b887016948..66783ba086 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRemoveDeviceResponse.java @@ -35,9 +35,9 @@ public class EzspRemoveDeviceResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspRemoveDeviceResponse(int[] inputBuffer) { + public EzspRemoveDeviceResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyRequest.java index f9b0a4b983..2cf5595c1a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyRequest.java @@ -77,9 +77,9 @@ public void setPartner(IeeeAddress partner) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(partner); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyResponse.java index 6350e6170f..9b58111182 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspRequestLinkKeyResponse.java @@ -46,9 +46,9 @@ public class EzspRequestLinkKeyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspRequestLinkKeyResponse(int[] inputBuffer) { + public EzspRequestLinkKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsRequest.java index f00824e04f..e8f6c7bf39 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsRequest.java @@ -38,9 +38,9 @@ public EzspResetToFactoryDefaultsRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsResponse.java index 10d68ee63a..56ed707c92 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspResetToFactoryDefaultsResponse.java @@ -34,9 +34,9 @@ public class EzspResetToFactoryDefaultsResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspResetToFactoryDefaultsResponse(int[] inputBuffer) { + public EzspResetToFactoryDefaultsResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandler.java index f02e7f3e67..d7304422c8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandler.java @@ -44,9 +44,9 @@ public class EzspScanCompleteHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspScanCompleteHandler(int[] inputBuffer) { + public EzspScanCompleteHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields channel = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastRequest.java index ccac0345c7..00108e3a24 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastRequest.java @@ -183,9 +183,9 @@ public void setMessageContents(int[] messageContents) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(destination); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastResponse.java index 8785277829..20e0934be4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastResponse.java @@ -41,9 +41,9 @@ public class EzspSendBroadcastResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendBroadcastResponse(int[] inputBuffer) { + public EzspSendBroadcastResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestRequest.java index d8b3e809c4..e934a9c0d4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestRequest.java @@ -132,9 +132,9 @@ public void setRadius(int radius) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberConcentratorType(concentratorType); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestResponse.java index db303788a4..701ebc2427 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendManyToOneRouteRequestResponse.java @@ -56,9 +56,9 @@ public class EzspSendManyToOneRouteRequestResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendManyToOneRouteRequestResponse(int[] inputBuffer) { + public EzspSendManyToOneRouteRequestResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastRequest.java index 0d6165dcae..4c86b33bb3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastRequest.java @@ -184,9 +184,9 @@ public void setMessageContents(int[] messageContents) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberApsFrame(apsFrame); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastResponse.java index 030c5adf49..1d28513d01 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendMulticastResponse.java @@ -48,9 +48,9 @@ public class EzspSendMulticastResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendMulticastResponse(int[] inputBuffer) { + public EzspSendMulticastResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyRequest.java index 67cbec9bc2..20eebd4810 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyRequest.java @@ -151,9 +151,9 @@ public void setMessageContents(int[] messageContents) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(sender); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyResponse.java index 75e823ee34..207396e562 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendReplyResponse.java @@ -43,9 +43,9 @@ public class EzspSendReplyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendReplyResponse(int[] inputBuffer) { + public EzspSendReplyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields policyDecision = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyRequest.java index 65e9846d29..f3874eaa3a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyRequest.java @@ -95,9 +95,9 @@ public void setDestinationEui64(IeeeAddress destinationEui64) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(destinationNodeId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyResponse.java index 81d95cf586..2d9f06a62c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendTrustCenterLinkKeyResponse.java @@ -36,9 +36,9 @@ public class EzspSendTrustCenterLinkKeyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendTrustCenterLinkKeyResponse(int[] inputBuffer) { + public EzspSendTrustCenterLinkKeyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastRequest.java index 2b154e461c..34e705ead2 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastRequest.java @@ -203,9 +203,9 @@ public void setMessageContents(int[] messageContents) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberOutgoingMessageType(type); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastResponse.java index 2407359d76..5e158ef1ac 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastResponse.java @@ -60,9 +60,9 @@ public class EzspSendUnicastResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSendUnicastResponse(int[] inputBuffer) { + public EzspSendUnicastResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Request.java index 25bd2c0b3d..b45607c8a5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Request.java @@ -96,9 +96,9 @@ public void setEui64(IeeeAddress eui64) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(addressTableIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Response.java index bcc55d22e3..e452941ab6 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteEui64Response.java @@ -38,9 +38,9 @@ public class EzspSetAddressTableRemoteEui64Response extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetAddressTableRemoteEui64Response(int[] inputBuffer) { + public EzspSetAddressTableRemoteEui64Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdRequest.java index 94f33939d1..bcea373dbc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdRequest.java @@ -101,9 +101,9 @@ public void setNodeId(int nodeId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(addressTableIndex); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdResponse.java index 0a36f24a09..2b3c5059eb 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetAddressTableRemoteNodeIdResponse.java @@ -29,9 +29,9 @@ public class EzspSetAddressTableRemoteNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetAddressTableRemoteNodeIdResponse(int[] inputBuffer) { + public EzspSetAddressTableRemoteNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdRequest.java index 0193df0939..3512b4aeee 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdRequest.java @@ -93,9 +93,9 @@ public void setNodeId(int nodeId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdResponse.java index 2fed02632e..21a80b4436 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRemoteNodeIdResponse.java @@ -27,9 +27,9 @@ public class EzspSetBindingRemoteNodeIdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetBindingRemoteNodeIdResponse(int[] inputBuffer) { + public EzspSetBindingRemoteNodeIdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRequest.java index bd2832633c..754c22709a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingRequest.java @@ -93,9 +93,9 @@ public void setValue(EmberBindingTableEntry value) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingResponse.java index b84010eef7..5aa40998f2 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetBindingResponse.java @@ -34,9 +34,9 @@ public class EzspSetBindingResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetBindingResponse(int[] inputBuffer) { + public EzspSetBindingResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequest.java index b58046d4b8..16cbb37aff 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequest.java @@ -249,9 +249,9 @@ public void setMaxHops(int maxHops) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeBool(enable); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorResponse.java index ab445592fb..8b5cce7582 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorResponse.java @@ -34,9 +34,9 @@ public class EzspSetConcentratorResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetConcentratorResponse(int[] inputBuffer) { + public EzspSetConcentratorResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequest.java index 35d8ace9f3..dec9593402 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequest.java @@ -96,9 +96,9 @@ public void setValue(int value) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspConfigId(configId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponse.java index 02aeb7baf1..a2417ea9a3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponse.java @@ -40,9 +40,9 @@ public class EzspSetConfigurationValueResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetConfigurationValueResponse(int[] inputBuffer) { + public EzspSetConfigurationValueResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutRequest.java index 5b76fc7ecc..1902c9d77b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutRequest.java @@ -103,9 +103,9 @@ public void setExtendedTimeout(boolean extendedTimeout) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberEui64(remoteEui64); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutResponse.java index c1f3b3394a..c68e209169 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetExtendedTimeoutResponse.java @@ -33,9 +33,9 @@ public class EzspSetExtendedTimeoutResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetExtendedTimeoutResponse(int[] inputBuffer) { + public EzspSetExtendedTimeoutResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequest.java index 10b09c31de..aff0bfbed1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequest.java @@ -69,9 +69,9 @@ public void setState(EmberInitialSecurityState state) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberInitialSecurityState(state); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateResponse.java index 6b030c7343..ccab8d1d99 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateResponse.java @@ -37,9 +37,9 @@ public class EzspSetInitialSecurityStateResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetInitialSecurityStateResponse(int[] inputBuffer) { + public EzspSetInitialSecurityStateResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryRequest.java index 24e14530f9..58d73cbd78 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryRequest.java @@ -148,9 +148,9 @@ public void setKeyStruct(EmberKeyData keyStruct) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryResponse.java index 6ef1378ce7..099754d32d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetKeyTableEntryResponse.java @@ -35,9 +35,9 @@ public class EzspSetKeyTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetKeyTableEntryResponse(int[] inputBuffer) { + public EzspSetKeyTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeRequest.java index 88b8c990ba..22683617d5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeRequest.java @@ -66,9 +66,9 @@ public void setCode(int code) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(code); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeResponse.java index f148bbb1bb..8238bc9c8b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetManufacturerCodeResponse.java @@ -27,9 +27,9 @@ public class EzspSetManufacturerCodeResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetManufacturerCodeResponse(int[] inputBuffer) { + public EzspSetManufacturerCodeResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenRequest.java index dd385df721..28ad75c783 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenRequest.java @@ -95,9 +95,9 @@ public void setTokenData(int[] tokenData) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspMfgTokenId(tokenId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenResponse.java index 433e11ecea..554e1fecb3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMfgTokenResponse.java @@ -36,9 +36,9 @@ public class EzspSetMfgTokenResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetMfgTokenResponse(int[] inputBuffer) { + public EzspSetMfgTokenResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryRequest.java index 48508af31f..09e5eb5f25 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryRequest.java @@ -93,9 +93,9 @@ public void setValue(EmberMulticastTableEntry value) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(index); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryResponse.java index 6cbecabe91..3c400e0e95 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetMulticastTableEntryResponse.java @@ -34,9 +34,9 @@ public class EzspSetMulticastTableEntryResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetMulticastTableEntryResponse(int[] inputBuffer) { + public EzspSetMulticastTableEntryResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyRequest.java index 611f7d8ffd..a7cbad52c3 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyRequest.java @@ -93,9 +93,9 @@ public void setDecisionId(int decisionId) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspPolicyId(policyId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyResponse.java index c72672cd57..b228a7870c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPolicyResponse.java @@ -35,9 +35,9 @@ public class EzspSetPolicyResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetPolicyResponse(int[] inputBuffer) { + public EzspSetPolicyResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorRequest.java index 92d4808e8d..f61a5ff1f9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorRequest.java @@ -66,9 +66,9 @@ public void setDescriptor(int descriptor) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(descriptor); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorResponse.java index b9d6960417..b338d308a7 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPowerDescriptorResponse.java @@ -27,9 +27,9 @@ public class EzspSetPowerDescriptorResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetPowerDescriptorResponse(int[] inputBuffer) { + public EzspSetPowerDescriptorResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Request.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Request.java index fa2b926f53..2a589cd030 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Request.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Request.java @@ -40,9 +40,9 @@ public EzspSetPreinstalledCbkeData283k1Request() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Response.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Response.java index dd4df6800f..711a7538b0 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Response.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeData283k1Response.java @@ -36,9 +36,9 @@ public class EzspSetPreinstalledCbkeData283k1Response extends EzspFrameResponse /** * Response and Handler constructor */ - public EzspSetPreinstalledCbkeData283k1Response(int[] inputBuffer) { + public EzspSetPreinstalledCbkeData283k1Response(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataRequest.java index f019d88692..978405f0a1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataRequest.java @@ -123,9 +123,9 @@ public void setMyKey(EmberPrivateKeyData myKey) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEmberPublicKeyData(caCert); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataResponse.java index 50e6ccd027..610b817f4b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetPreinstalledCbkeDataResponse.java @@ -35,9 +35,9 @@ public class EzspSetPreinstalledCbkeDataResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetPreinstalledCbkeDataResponse(int[] inputBuffer) { + public EzspSetPreinstalledCbkeDataResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelRequest.java index 81b04ec2fe..4daf1c542c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelRequest.java @@ -70,9 +70,9 @@ public void setChannel(int channel) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(channel); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelResponse.java index e27bf28c9e..18b56f077f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioChannelResponse.java @@ -39,9 +39,9 @@ public class EzspSetRadioChannelResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetRadioChannelResponse(int[] inputBuffer) { + public EzspSetRadioChannelResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerRequest.java index d8281b739d..4722395998 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerRequest.java @@ -72,9 +72,9 @@ public void setPower(int power) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeInt8S(power); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerResponse.java index 7253a6d280..745ce55e28 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRadioPowerResponse.java @@ -41,9 +41,9 @@ public class EzspSetRadioPowerResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetRadioPowerResponse(int[] inputBuffer) { + public EzspSetRadioPowerResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdRequest.java index e922737976..18c46cc64e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdRequest.java @@ -66,9 +66,9 @@ public void setCostThresh(int costThresh) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(costThresh); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdResponse.java index 90868af819..46284696bb 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetRoutingShortcutThresholdResponse.java @@ -35,9 +35,9 @@ public class EzspSetRoutingShortcutThresholdResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetRoutingShortcutThresholdResponse(int[] inputBuffer) { + public EzspSetRoutingShortcutThresholdResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeRequest.java index 125ad8af63..490a5bd0fd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeRequest.java @@ -65,9 +65,9 @@ public void setMode(int mode) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(mode); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeResponse.java index 523d720fb2..75113cd4b9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteDiscoveryModeResponse.java @@ -34,9 +34,9 @@ public class EzspSetSourceRouteDiscoveryModeResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetSourceRouteDiscoveryModeResponse(int[] inputBuffer) { + public EzspSetSourceRouteDiscoveryModeResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields remainingTime = deserializer.deserializeUInt32(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteRequest.java index f5d395d83d..c9a289e4fe 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteRequest.java @@ -92,9 +92,9 @@ public void setRelayList(int[] relayList) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt16(destination); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteResponse.java index 891291a44a..33a10ecd5a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetSourceRouteResponse.java @@ -35,9 +35,9 @@ public class EzspSetSourceRouteResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetSourceRouteResponse(int[] inputBuffer) { + public EzspSetSourceRouteResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequest.java index afa9cfe28b..08c397d24f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequest.java @@ -93,9 +93,9 @@ public void setValue(int[] value) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspValueId(valueId); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueResponse.java index c82f02f605..1447ebfd26 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueResponse.java @@ -36,9 +36,9 @@ public class EzspSetValueResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSetValueResponse(int[] inputBuffer) { + public EzspSetValueResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEzspStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandler.java index 50b35bfc89..b995a03cdc 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandler.java @@ -38,9 +38,9 @@ public class EzspStackStatusHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspStackStatusHandler(int[] inputBuffer) { + public EzspStackStatusHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackTokenChangedHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackTokenChangedHandler.java index e70b7966ec..c87dcb8f3b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackTokenChangedHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackTokenChangedHandler.java @@ -33,9 +33,9 @@ public class EzspStackTokenChangedHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspStackTokenChangedHandler(int[] inputBuffer) { + public EzspStackTokenChangedHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields tokenAddress = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequest.java index c211d469d3..f46cd51611 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequest.java @@ -144,9 +144,9 @@ public void setDuration(int duration) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeEzspNetworkScanType(scanType); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponse.java index 3f3a2a14ad..79b4af428c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponse.java @@ -39,9 +39,9 @@ public class EzspStartScanResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspStartScanResponse(int[] inputBuffer) { + public EzspStartScanResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanRequest.java index 3effe25063..c9e09a2f9d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanRequest.java @@ -38,9 +38,9 @@ public EzspStopScanRequest() { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields return serializer.getPayload(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanResponse.java index 018aad3e57..0b97eb8cef 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStopScanResponse.java @@ -34,9 +34,9 @@ public class EzspStopScanResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspStopScanResponse(int[] inputBuffer) { + public EzspStopScanResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields status = deserializer.deserializeEmberStatus(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSwitchNetworkKeyHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSwitchNetworkKeyHandler.java index a656f0c60a..84eb67e47a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSwitchNetworkKeyHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSwitchNetworkKeyHandler.java @@ -35,9 +35,9 @@ public class EzspSwitchNetworkKeyHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspSwitchNetworkKeyHandler(int[] inputBuffer) { + public EzspSwitchNetworkKeyHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields sequenceNumber = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspTrustCenterJoinHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspTrustCenterJoinHandler.java index f70076dbdd..f00531de17 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspTrustCenterJoinHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspTrustCenterJoinHandler.java @@ -66,9 +66,9 @@ public class EzspTrustCenterJoinHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspTrustCenterJoinHandler(int[] inputBuffer) { + public EzspTrustCenterJoinHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields newNodeId = deserializer.deserializeUInt16(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequest.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequest.java index 086cc9eba6..4867a3e3a5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequest.java @@ -70,9 +70,9 @@ public void setDesiredProtocolVersion(int desiredProtocolVersion) { } @Override - public int[] serialize() { + public int[] serialize(int ezspVersion) { // Serialize the header - serializeHeader(serializer); + serializeHeader(ezspVersion, serializer); // Serialize the fields serializer.serializeUInt8(desiredProtocolVersion); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponse.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponse.java index ef42800e40..bf6b276230 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponse.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponse.java @@ -49,9 +49,9 @@ public class EzspVersionResponse extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspVersionResponse(int[] inputBuffer) { + public EzspVersionResponse(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields protocolVersion = deserializer.deserializeUInt8(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspZigbeeKeyEstablishmentHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspZigbeeKeyEstablishmentHandler.java index 9907efbcda..21ec285616 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspZigbeeKeyEstablishmentHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspZigbeeKeyEstablishmentHandler.java @@ -44,9 +44,9 @@ public class EzspZigbeeKeyEstablishmentHandler extends EzspFrameResponse { /** * Response and Handler constructor */ - public EzspZigbeeKeyEstablishmentHandler(int[] inputBuffer) { + public EzspZigbeeKeyEstablishmentHandler(int ezspVersion, int[] inputBuffer) { // Super creates deserializer and reads header fields - super(inputBuffer); + super(ezspVersion, inputBuffer); // Deserialize the fields partner = deserializer.deserializeEmberEui64(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberNetworkInitialisation.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberNetworkInitialisation.java index c11e6edd61..bd2c06703d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberNetworkInitialisation.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EmberNetworkInitialisation.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Random; +import com.zsmartsystems.zigbee.dongle.ember.ZigBeeDongleEzsp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,6 +62,8 @@ public class EmberNetworkInitialisation { */ private static final int WAIT_FOR_LEAVE = 5000; + private ZigBeeDongleEzsp zigBeeDongleEzsp; + /** * The frame handler used to send the EZSP frames to the NCP */ @@ -74,7 +77,8 @@ public class EmberNetworkInitialisation { /** * @param protocolHandler the {@link EzspProtocolHandler} used to communicate with the NCP */ - public EmberNetworkInitialisation(EzspProtocolHandler protocolHandler) { + public EmberNetworkInitialisation(ZigBeeDongleEzsp zigBeeDongleEzsp, EzspProtocolHandler protocolHandler) { + this.zigBeeDongleEzsp = zigBeeDongleEzsp; this.protocolHandler = protocolHandler; } @@ -109,11 +113,11 @@ public ZigBeeStatus formNetwork(EmberNetworkParameters networkParameters, ZigBee logger.debug("Initialising Ember network with configuration {}", networkParameters); - EmberNcp ncp = new EmberNcp(protocolHandler); - // Leave the current network so we can initialise a new network ensureNetworkLeft(); + EmberNcp ncp = zigBeeDongleEzsp.getEmberNcp(); + if (networkParameters.getRadioChannel() == ZigBeeChannel.UNKNOWN.getChannel()) { // Perform an energy scan to find a clear channel Integer quietestChannel = doEnergyScan(ncp, scanDuration); @@ -198,7 +202,7 @@ public void rejoinNetwork() { * @return true if the NCP is not on a network. false if the network leave was unsuccessful. */ private boolean ensureNetworkLeft() { - EmberNcp ncp = new EmberNcp(protocolHandler); + EmberNcp ncp = zigBeeDongleEzsp.getEmberNcp(); // If the current network state isn't NO NETWORK, or LEAVING NETWORK, then we leave the current network EmberNetworkStatus currentNetworkState = ncp.getNetworkState(); @@ -248,7 +252,7 @@ private Integer doEnergyScan(EmberNcp ncp, int scanDuration) { scanDuration); if (channels == null) { - logger.debug("Error during energy scan: {}", ncp.getLastStatus()); + logger.debug("Error during energy scan"); return null; } @@ -344,7 +348,7 @@ private boolean setSecurityState(ZigBeeKey linkKey, ZigBeeKey networkKey) { return false; } - EmberNcp ncp = new EmberNcp(protocolHandler); + EmberNcp ncp = zigBeeDongleEzsp.getEmberNcp(); if (networkKey != null && networkKey.hasOutgoingFrameCounter()) { EzspSerializer serializer = new EzspSerializer(); serializer.serializeUInt32(networkKey.getOutgoingFrameCounter()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EzspFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EzspFrameHandler.java index 5ac5639fe3..8468c5a0ac 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EzspFrameHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/EzspFrameHandler.java @@ -17,6 +17,13 @@ * */ public interface EzspFrameHandler { + + /** + * Return the EZSP version currently used by this frame handler + * @return + */ + int getEzspVersion(); + /** * Passes received asynchronous frames from the ASH handler to the EZSP layer * diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameData.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameData.java index 881d0676b1..0dfe3b6bdd 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameData.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameData.java @@ -21,11 +21,12 @@ public class AshFrameData extends AshFrame { /** * Constructor to create an ASH Data frame for sending. * + * @param ezspVersion the EZSP version used * @param ezspRequestFrame the {@link EzspFrameRequest} to send */ - public AshFrameData(EzspFrameRequest ezspRequestFrame) { + public AshFrameData(int ezspVersion, EzspFrameRequest ezspRequestFrame) { frameType = FrameType.DATA; - dataBuffer = ezspRequestFrame.serialize(); + dataBuffer = ezspRequestFrame.serialize(ezspVersion); } /** diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java index 3112e8aedf..aeb74eb562 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameHandler.java @@ -307,7 +307,7 @@ public void run() { // Get the EZSP frame EzspFrameResponse response = EzspFrame - .createHandler(dataPacket.getDataBuffer()); + .createHandler(frameHandler.getEzspVersion(), dataPacket.getDataBuffer()); logger.trace("ASH RX EZSP: {}", response); if (response == null) { logger.debug("ASH: No frame handler created for {}", packet); @@ -518,7 +518,7 @@ private synchronized boolean sendNextFrame() { // Encapsulate the EZSP frame into the ASH packet logger.trace("TX ASH EZSP: {}", nextFrame); - AshFrameData ashFrame = new AshFrameData(nextFrame); + AshFrameData ashFrame = new AshFrameData(frameHandler.getEzspVersion(), nextFrame); retries = 0; sendFrame(ashFrame); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java index 2f8780a75f..5a02535d94 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/internal/spi/SpiFrameHandler.java @@ -427,7 +427,7 @@ private boolean isEzspNoCallbacksResponse(int[] ezspPacketData) { private void processSpiEzsp(int[] packetData) { // Get the EZSP frame - EzspFrameResponse response = EzspFrame.createHandler(packetData); + EzspFrameResponse response = EzspFrame.createHandler(frameHandler.getEzspVersion(), packetData); if (response == null) { logger.debug("No frame handler created for {}", frameToString(packetData)); return; @@ -537,7 +537,7 @@ private synchronized boolean sendNextFrame() { } // Encapsulate the EZSP frame into the SPI packet - int[] serializedData = nextFrame.serialize(); + int[] serializedData = nextFrame.serialize(frameHandler.getEzspVersion()); int[] outputData = new int[serializedData.length + 2]; outputData[0] = SPI_CMD_EZSP; outputData[1] = serializedData.length; diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java index c589cd7ec7..49eb2e6ca8 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/EmberNcpTest.java @@ -66,11 +66,13 @@ */ public class EmberNcpTest { private ArgumentCaptor ezspTransactionCapture = ArgumentCaptor.forClass(EzspTransaction.class); + private ZigBeeDongleEzsp zigBeeDongleEzsp; private EzspProtocolHandler handler; private EmberNcp getEmberNcp(EzspFrameResponse response) { + zigBeeDongleEzsp = Mockito.mock(ZigBeeDongleEzsp.class); handler = Mockito.mock(EzspProtocolHandler.class); - EmberNcp ncp = new EmberNcp(handler); + EmberNcp ncp = new EmberNcp(zigBeeDongleEzsp); EzspTransaction transaction = Mockito.mock(EzspTransaction.class); Mockito.when(transaction.getResponse()).thenReturn(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java index 7438a0dca3..66f5c46206 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzspTest.java @@ -106,26 +106,6 @@ public void setZigBeePanId() { assertEquals(0x1234, dongle.getZigBeePanId()); } - @Test - public void testEzspVersions() { - System.out.println("--- " + Thread.currentThread().getStackTrace()[1].getMethodName()); - EzspFrame.setEzspVersion(4); - assertEquals(4, EzspFrame.getEzspVersion()); - assertFalse(EzspFrame.setEzspVersion(3)); - assertEquals(4, EzspFrame.getEzspVersion()); - assertTrue(EzspFrame.setEzspVersion(4)); - assertEquals(4, EzspFrame.getEzspVersion()); - assertTrue(EzspFrame.setEzspVersion(5)); - assertEquals(5, EzspFrame.getEzspVersion()); - assertTrue(EzspFrame.setEzspVersion(7)); - assertEquals(7, EzspFrame.getEzspVersion()); - assertTrue(EzspFrame.setEzspVersion(8)); - assertEquals(8, EzspFrame.getEzspVersion()); - assertFalse(EzspFrame.setEzspVersion(9)); - assertEquals(8, EzspFrame.getEzspVersion()); - EzspFrame.setEzspVersion(4); - } - @Test public void setTcJoinModeV4() throws Exception { System.out.println("--- " + Thread.currentThread().getStackTrace()[1].getMethodName()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java index fd08cf5b15..0b1e3d9b0c 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameRequestTest.java @@ -25,57 +25,44 @@ public class EzspFrameRequestTest { @Test public void testRequestV4() { - EzspFrame.setEzspVersion(4); - EzspFrameRequest request = Mockito.mock(EzspFrameRequest.class, Mockito.CALLS_REAL_METHODS); EzspSerializer serializer = new EzspSerializer(); - request.serializeHeader(serializer); + request.serializeHeader(4, serializer); assertTrue(Arrays.equals(new int[] { 0x00, 0x00, 0x00 }, serializer.getPayload())); - EzspFrame.setEzspVersion(4); } @Test public void testRequestV5() { - EzspFrame.setEzspVersion(5); - EzspFrameRequest request = Mockito.mock(EzspFrameRequest.class, Mockito.CALLS_REAL_METHODS); EzspSerializer serializer = new EzspSerializer(); - request.serializeHeader(serializer); + request.serializeHeader(5, serializer); assertTrue(Arrays.equals(new int[] { 0x00, 0x00, 0xFF, 0x00, 0x00 }, serializer.getPayload())); - EzspFrame.setEzspVersion(4); } @Test public void testRequestV8() { - EzspFrame.setEzspVersion(8); - EzspFrameRequest request = Mockito.mock(EzspFrameRequest.class, Mockito.CALLS_REAL_METHODS); EzspSerializer serializer = new EzspSerializer(); - request.serializeHeader(serializer); + request.serializeHeader(8, serializer); assertTrue(Arrays.equals(new int[] { 0x00, 0x00, 0x01, 0x00, 0x00 }, serializer.getPayload())); - EzspFrame.setEzspVersion(4); } @Test public void testRequestV8NetworkId() { - EzspFrame.setEzspVersion(8); - EzspFrameRequest request = Mockito.mock(EzspFrameRequest.class, Mockito.CALLS_REAL_METHODS); request.setNetworkId(1); EzspSerializer serializer = new EzspSerializer(); - request.serializeHeader(serializer); + request.serializeHeader(8, serializer); assertTrue(Arrays.equals(new int[] { 0x00, 0x20, 0x01, 0x00, 0x00 }, serializer.getPayload())); request.setNetworkId(3); serializer = new EzspSerializer(); - request.serializeHeader(serializer); + request.serializeHeader(8, serializer); assertTrue(Arrays.equals(new int[] { 0x00, 0x60, 0x01, 0x00, 0x00 }, serializer.getPayload())); - - EzspFrame.setEzspVersion(4); } } \ No newline at end of file diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java index 81266f6d3b..05df50ef64 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameResponseTest.java @@ -25,8 +25,7 @@ public class EzspFrameResponseTest { @Test public void testResponseV4() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse response = new EzspVersionResponse(new int[] { 0x01, 0x80, 0x00, 0x04, 0x02, 0x00, 0x59 }); + EzspVersionResponse response = new EzspVersionResponse(4, new int[] { 0x01, 0x80, 0x00, 0x04, 0x02, 0x00, 0x59 }); System.out.println(response); assertEquals(4, response.getProtocolVersion()); @@ -35,8 +34,7 @@ public void testResponseV4() { @Test public void testResponseV5() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse response = new EzspVersionResponse( + EzspVersionResponse response = new EzspVersionResponse(4, new int[] { 0x01, 0x80, 0xFF, 0x00, 0x00, 0x05, 0x02, 0x10, 0x5A }); System.out.println(response); @@ -46,8 +44,7 @@ public void testResponseV5() { @Test public void testResponseV8() { - EzspFrame.setEzspVersion(8); - EzspVersionResponse response = new EzspVersionResponse( + EzspVersionResponse response = new EzspVersionResponse(8, new int[] { 0x01, 0x80, 0x01, 0x00, 0x00, 0x08, 0x02, 0x00, 0x67 }); System.out.println(response); @@ -55,7 +52,7 @@ public void testResponseV8() { assertEquals(0x6700, response.getStackVersion()); assertEquals(0, response.getNetworkId()); - response = new EzspVersionResponse( + response = new EzspVersionResponse(8, new int[] { 0x01, 0xC0, 0x01, 0x00, 0x00, 0x08, 0x02, 0x00, 0x67 }); System.out.println(response); @@ -66,12 +63,11 @@ public void testResponseV8() { @Test public void testResponse() { - EzspFrame.setEzspVersion(4); - EzspNoCallbacksResponse response = new EzspNoCallbacksResponse(new int[] { 0x2C, 0x88, 0x07 }); + EzspNoCallbacksResponse response = new EzspNoCallbacksResponse(4, new int[] { 0x2C, 0x88, 0x07 }); System.out.println(response); assertFalse(response.isCallbackPending()); - response = new EzspNoCallbacksResponse(new int[] { 0x2C, 0x8C, 0x07 }); + response = new EzspNoCallbacksResponse(4, new int[] { 0x2C, 0x8C, 0x07 }); System.out.println(response); assertTrue(response.isCallbackPending()); } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java index 17ec1a8fbc..3f40cb88b2 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/EzspFrameTest.java @@ -31,8 +31,8 @@ protected int[] getPacketData(String stringData) { @Test public void createHandler() { - assertNull(EzspFrame.createHandler(new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 })); - assertNull(EzspFrame.createHandler(new int[] { 0 })); - assertNull(EzspFrame.createHandler(new int[] { 0, 67, 33 })); + assertNull(EzspFrame.createHandler(4, new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 })); + assertNull(EzspFrame.createHandler(4, new int[] { 0 })); + assertNull(EzspFrame.createHandler(4, new int[] { 0, 67, 33 })); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java index 4d673e0886..21e2d93c68 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointRequestTest.java @@ -25,7 +25,6 @@ public class EzspAddEndpointRequestTest extends EzspFrameTest { @Test public void testAddEndpointRequest() throws Exception { - EzspFrame.setEzspVersion(4); int[] clusters = new int[] { 0, 1, 6 }; EzspAddEndpointRequest request = new EzspAddEndpointRequest(); request.setAppFlags(0); @@ -38,12 +37,11 @@ public void testAddEndpointRequest() throws Exception { System.out.println(request); assertTrue(Arrays.equals(getPacketData("02 00 02 01 04 01 00 00 00 03 03 00 00 01 00 06 00 00 00 01 00 06 00"), - request.serialize())); + request.serialize(4))); } @Test public void testAddEndpointRequestNoClusters() throws Exception { - EzspFrame.setEzspVersion(4); int[] clusters = new int[] {}; EzspAddEndpointRequest request = new EzspAddEndpointRequest(); request.setDeviceId(0); @@ -54,6 +52,6 @@ public void testAddEndpointRequestNoClusters() throws Exception { TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 170); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("AA 00 02 01 04 01 00 00 00 00 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("AA 00 02 01 04 01 00 00 00 00 00"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java index 5fc793bcdb..610a7ac867 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAddEndpointResponseTest.java @@ -24,8 +24,7 @@ public class EzspAddEndpointResponseTest extends EzspFrameTest { @Test public void testVersionError() { - EzspFrame.setEzspVersion(4); - EzspAddEndpointResponse response = new EzspAddEndpointResponse(getPacketData("02 80 02 36")); + EzspAddEndpointResponse response = new EzspAddEndpointResponse(4, getPacketData("02 80 02 36")); System.out.println(response); assertEquals(2, response.getSequenceNumber()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java index 27a601b90f..a811fb140b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspAesMmoHashRequestTest.java @@ -27,7 +27,6 @@ public class EzspAesMmoHashRequestTest extends EzspFrameTest { @Test public void test() throws Exception { - EzspFrame.setEzspVersion(4); EmberAesMmoHashContext context = new EmberAesMmoHashContext(); context.setResult(new int[16]); EzspAesMmoHashRequest request = new EzspAesMmoHashRequest(); @@ -39,6 +38,6 @@ public void test() throws Exception { assertTrue(Arrays.equals(getPacketData( "AA 00 6F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 11 22 33 44 55 66 77"), - request.serialize())); + request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java index 06005eb2a0..ef0d927f94 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspChildJoinHandlerTest.java @@ -25,8 +25,7 @@ public class EzspChildJoinHandlerTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspChildJoinHandler handler = new EzspChildJoinHandler( + EzspChildJoinHandler handler = new EzspChildJoinHandler(4, getPacketData("0B 90 23 00 00 95 87 F9 41 F6 02 00 4B 12 00 04")); System.out.println(handler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java index 69c35f2de9..e2952a4224 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyRequestTest.java @@ -26,12 +26,11 @@ public class EzspGetKeyRequestTest extends EzspFrameTest { @Test public void testAddEndpointRequest() throws Exception { - EzspFrame.setEzspVersion(4); EzspGetKeyRequest request = new EzspGetKeyRequest(); request.setKeyType(EmberKeyType.EMBER_APPLICATION_LINK_KEY); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 2); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("02 00 6A 05"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("02 00 6A 05"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java index f86d459710..bed3cae3b5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyResponseTest.java @@ -28,8 +28,7 @@ public class EzspGetKeyResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspGetKeyResponse response = new EzspGetKeyResponse(getPacketData( + EzspGetKeyResponse response = new EzspGetKeyResponse(4, getPacketData( "60 80 FF 00 6A 00 03 00 03 AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA 24 10 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java index 3769b0ffeb..fbfa6a5953 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryRequestTest.java @@ -25,12 +25,11 @@ public class EzspGetKeyTableEntryRequestTest extends EzspFrameTest { @Test public void testAddEndpointRequest() throws Exception { - EzspFrame.setEzspVersion(4); EzspGetKeyTableEntryRequest request = new EzspGetKeyTableEntryRequest(); request.setIndex(0); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 2); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("02 00 71 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("02 00 71 00"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java index 192dd56928..1b20008ec5 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetKeyTableEntryResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetKeyTableEntryResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; @@ -24,8 +23,7 @@ public class EzspGetKeyTableEntryResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspGetKeyTableEntryResponse response = new EzspGetKeyTableEntryResponse(getPacketData( + EzspGetKeyTableEntryResponse response = new EzspGetKeyTableEntryResponse(4, getPacketData( "8A 80 FF 00 71 B6 00 00 06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 00 00 00 6C F2 00 20 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java index 2bffce25cd..b1e615730f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNeighborResponseTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import com.zsmartsystems.zigbee.IeeeAddress; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetNeighborResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNeighborTableEntry; @@ -27,8 +26,7 @@ public class EzspGetNeighborResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspGetNeighborResponse response = new EzspGetNeighborResponse( + EzspGetNeighborResponse response = new EzspGetNeighborResponse(4, getPacketData("29 80 79 00 9E 72 FF 01 01 03 CC 43 6B 05 00 6F 0D 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java index 4e070cc340..602397e454 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetNetworkParametersResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetNetworkParametersResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberJoinMethod; @@ -27,8 +26,7 @@ public class EzspGetNetworkParametersResponseTest extends EzspFrameTest { @Test public void testVersionError() { - EzspFrame.setEzspVersion(4); - EzspGetNetworkParametersResponse response = new EzspGetNetworkParametersResponse( + EzspGetNetworkParametersResponse response = new EzspGetNetworkParametersResponse(4, getPacketData("05 80 28 00 01 EF CB B1 57 A8 CC C6 D7 05 C8 00 0B 00 00 00 00 00 F8 FF 07")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java index bd0c6dd34b..ceec9ca855 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGetRouteTableEntryResponseTest.java @@ -12,7 +12,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetRouteTableEntryResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberRouteTableEntry; @@ -26,8 +25,7 @@ public class EzspGetRouteTableEntryResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspGetRouteTableEntryResponse response = new EzspGetRouteTableEntryResponse( + EzspGetRouteTableEntryResponse response = new EzspGetRouteTableEntryResponse(4, getPacketData("28 80 7B 00 FF FF 00 00 03 00 00 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java index 14e66fc3cf..d7a79b6a5d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspGpepIncomingMessageHandlerTest.java @@ -12,7 +12,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; @@ -23,8 +22,7 @@ public class EzspGpepIncomingMessageHandlerTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspGpepIncomingMessageHandler incomingMessageHandler = new EzspGpepIncomingMessageHandler( + EzspGpepIncomingMessageHandler incomingMessageHandler = new EzspGpepIncomingMessageHandler(4, getPacketData( "90 01 C5 7F D7 54 00 14 8A 70 01 14 8A 70 01 54 02 01 00 00 54 07 00 00 65 2C 15 E8 75 FF 00")); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java index 2fd4fc91f9..678abeb086 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingMessageHandlerTest.java @@ -19,7 +19,6 @@ import com.zsmartsystems.zigbee.aps.ZigBeeApsFrame; import com.zsmartsystems.zigbee.dongle.ember.ZigBeeDongleEzsp; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberIncomingMessageType; import com.zsmartsystems.zigbee.transport.ZigBeeTransportReceive; @@ -45,8 +44,7 @@ private ZigBeeDongleEzsp getDongle() { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler( + EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler(4, getPacketData("00 94 45 00 00 01 00 00 00 00 00 00 00 00 58 FF 00 00 00 FF FF 01 00")); System.out.println(incomingMessageHandler); @@ -57,10 +55,9 @@ public void testReceive1() { @Test public void testReceive2() { - EzspFrame.setEzspVersion(4); // This tests a number of stages - not just this class // We process the received frame, make sure the dongle sends it to the networkManager - EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler(getPacketData( + EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler(4, getPacketData( "01 90 45 00 00 00 01 80 00 00 40 00 00 00 EE FF 00 00 00 FF FF 0C 00 81 F0 F0 00 20 00 00 00 00 00 01")); System.out.println(incomingMessageHandler); @@ -94,9 +91,7 @@ public void testReceive2() { @Test public void testReceive3() { - EzspFrame.setEzspVersion(4); - - EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler(getPacketData( + EzspIncomingMessageHandler incomingMessageHandler = new EzspIncomingMessageHandler(4, getPacketData( "01 90 45 00 00 00 02 80 00 00 40 00 00 00 44 FF 00 00 00 FF FF 11 00 00 00 00 00 40 8F CD AB 52 80 00 41 2A 80 00 00")); System.out.println(incomingMessageHandler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java index 47379e3e4d..6f1e316aac 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingRouteRecordHandlerTest.java @@ -12,7 +12,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspIncomingRouteRecordHandler; @@ -23,8 +22,7 @@ public class EzspIncomingRouteRecordHandlerTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspIncomingRouteRecordHandler incomingMessageHandler = new EzspIncomingRouteRecordHandler( + EzspIncomingRouteRecordHandler incomingMessageHandler = new EzspIncomingRouteRecordHandler(4, getPacketData("90 90 59 82 A2 53 C1 01 02 01 88 17 00 FF B0 02 0F 47 6B 82")); System.out.println(incomingMessageHandler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java index d1c813dc35..ecb74117aa 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspIncomingSenderEui64HandlerTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import com.zsmartsystems.zigbee.IeeeAddress; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspIncomingSenderEui64Handler; @@ -23,8 +22,7 @@ public class EzspIncomingSenderEui64HandlerTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspIncomingSenderEui64Handler incomingMessageHandler = new EzspIncomingSenderEui64Handler( + EzspIncomingSenderEui64Handler incomingMessageHandler = new EzspIncomingSenderEui64Handler(4, getPacketData("1B 94 FF 00 62 E0 45 BE 0B 00 6F 0D 00")); System.out.println(incomingMessageHandler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java index 919ee34232..130addf6ab 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdRequestTest.java @@ -25,12 +25,11 @@ public class EzspLookupEui64ByNodeIdRequestTest extends EzspFrameTest { @Test public void testLookupAddress() throws Exception { - EzspFrame.setEzspVersion(4); EzspLookupEui64ByNodeIdRequest request = new EzspLookupEui64ByNodeIdRequest(); request.setNodeId(0); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 5); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("05 00 61 00 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("05 00 61 00 00"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java index 53f7557f82..57021ba017 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspLookupEui64ByNodeIdResponseTest.java @@ -12,7 +12,6 @@ import org.junit.Test; import com.zsmartsystems.zigbee.IeeeAddress; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspLookupEui64ByNodeIdResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; @@ -25,8 +24,7 @@ public class EzspLookupEui64ByNodeIdResponseTest extends EzspFrameTest { @Test public void testVersionError() { - EzspFrame.setEzspVersion(4); - EzspLookupEui64ByNodeIdResponse response = new EzspLookupEui64ByNodeIdResponse( + EzspLookupEui64ByNodeIdResponse response = new EzspLookupEui64ByNodeIdResponse(4, getPacketData("05 80 61 00 BF 32 17 00 00 A3 22 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java index 1643fa1d49..b100ac45e9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMacFilterMatchMessageHandlerTest.java @@ -14,7 +14,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspMacFilterMatchMessageHandler; @@ -26,9 +25,7 @@ public class EzspMacFilterMatchMessageHandlerTest extends EzspFrameTest { @Test public void testReceive() { - EzspFrame.setEzspVersion(4); - - EzspMacFilterMatchMessageHandler response = new EzspMacFilterMatchMessageHandler(getPacketData( + EzspMacFilterMatchMessageHandler response = new EzspMacFilterMatchMessageHandler(4, getPacketData( "0F 90 46 01 80 C1 B8 21 01 C8 4A FF FF FF FF 9C 05 23 3F FF E7 0F 00 FF FF 0B 00 0B 00 10 5E C0 11 00 00 20 02 5C 37 02 12")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java index 3e72d7f541..7ff756be37 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspMessageSentHandlerTest.java @@ -13,7 +13,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspMessageSentHandler; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberApsFrame; @@ -28,8 +27,7 @@ public class EzspMessageSentHandlerTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspMessageSentHandler messageSentHandler = new EzspMessageSentHandler( + EzspMessageSentHandler messageSentHandler = new EzspMessageSentHandler(4, getPacketData("01 90 3F 00 00 00 00 01 00 00 00 00 00 01 00 00 45 00 00 00")); System.out.println(messageSentHandler); @@ -40,8 +38,7 @@ public void testReceive1() { @Test public void testReceive2() { - EzspFrame.setEzspVersion(4); - EzspMessageSentHandler messageSentHandler = new EzspMessageSentHandler( + EzspMessageSentHandler messageSentHandler = new EzspMessageSentHandler(4, getPacketData("04 90 3F 00 00 00 00 00 04 00 00 00 40 11 00 00 78 04 00 00")); System.out.println(messageSentHandler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java index 9d61ba3c70..52d4037ed1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNeighborCountResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspNeighborCountResponse; @@ -23,8 +22,7 @@ public class EzspNeighborCountResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspNeighborCountResponse response = new EzspNeighborCountResponse(getPacketData("28 80 7A 01")); + EzspNeighborCountResponse response = new EzspNeighborCountResponse(4, getPacketData("28 80 7A 01")); System.out.println(response); assertEquals(true, response.isResponse()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java index a7683bf1b5..326522e696 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspNetworkFoundHandlerTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import com.zsmartsystems.zigbee.ExtendedPanId; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; /** @@ -24,9 +23,7 @@ public class EzspNetworkFoundHandlerTest extends EzspFrameTest { @Test public void testReceive() { - EzspFrame.setEzspVersion(4); - - EzspNetworkFoundHandler handler = new EzspNetworkFoundHandler( + EzspNetworkFoundHandler handler = new EzspNetworkFoundHandler(4, getPacketData("56 90 FF 00 1B 11 8B D9 63 08 1D DC 2D C4 F2 46 00 02 01 FF C3")); System.out.println(handler); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java index 8454d884de..ad0c339c98 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspScanCompleteHandlerTest.java @@ -12,7 +12,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; @@ -24,9 +23,7 @@ public class EzspScanCompleteHandlerTest extends EzspFrameTest { @Test public void testReceive() { - EzspFrame.setEzspVersion(4); - - EzspScanCompleteHandler handler = new EzspScanCompleteHandler(getPacketData("4E 90 FF 00 1C FF 00")); + EzspScanCompleteHandler handler = new EzspScanCompleteHandler(4, getPacketData("4E 90 FF 00 1C FF 00")); System.out.println(handler); assertEquals(0x1C, handler.getFrameId()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java index c2fb4a019a..ce890e695d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendBroadcastTest.java @@ -59,7 +59,7 @@ public void testSendPermitJoining() throws Exception { emberBroadcast.setMessageContents(payload); emberBroadcast.setRadius(31); - int[] messageToSend = emberBroadcast.serialize(); + int[] messageToSend = emberBroadcast.serialize(4); String out = ""; for (int c : messageToSend) { diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java index 1bf601e148..d2a7d5ed4f 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSendUnicastTest.java @@ -33,8 +33,7 @@ public class EzspSendUnicastTest extends EzspFrameTest { @Test public void testReceive1() { - EzspFrame.setEzspVersion(4); - EzspSendUnicastResponse response = new EzspSendUnicastResponse(getPacketData("02 80 34 00 9E")); + EzspSendUnicastResponse response = new EzspSendUnicastResponse(4, getPacketData("02 80 34 00 9E")); System.out.println(response); assertEquals(0x34, response.getFrameId()); @@ -44,7 +43,6 @@ public void testReceive1() { @Test public void testSendPermitJoining() throws Exception { - EzspFrame.setEzspVersion(4); ManagementPermitJoiningRequest permitJoining = new ManagementPermitJoiningRequest(60, false); permitJoining.setDestinationAddress(new ZigBeeEndpointAddress(0x401C)); @@ -74,7 +72,7 @@ public void testSendPermitJoining() throws Exception { emberUnicast.setIndexOrDestination(permitJoining.getDestinationAddress().getAddress()); emberUnicast.setMessageContents(payload); - int[] messageToSend = emberUnicast.serialize(); + int[] messageToSend = emberUnicast.serialize(4); System.out.println(emberUnicast.toString()); System.out.println(Arrays.toString(messageToSend)); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java index 787cf7e3ca..b706b92fb4 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConcentratorRequestTest.java @@ -26,7 +26,6 @@ public class EzspSetConcentratorRequestTest extends EzspFrameTest { @Test public void testEnabled() throws Exception { - EzspFrame.setEzspVersion(4); EzspSetConcentratorRequest request = new EzspSetConcentratorRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 52); request.setConcentratorType(EmberConcentratorType.EMBER_HIGH_RAM_CONCENTRATOR); @@ -38,12 +37,11 @@ public void testEnabled() throws Exception { request.setRouteErrorThreshold(8); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("34 00 10 01 F9 FF 3C 00 10 0E 08 08 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("34 00 10 01 F9 FF 3C 00 10 0E 08 08 00"), request.serialize(4))); } @Test public void testDisabled() throws Exception { - EzspFrame.setEzspVersion(4); EzspSetConcentratorRequest request = new EzspSetConcentratorRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 52); request.setConcentratorType(EmberConcentratorType.EMBER_LOW_RAM_CONCENTRATOR); @@ -55,6 +53,6 @@ public void testDisabled() throws Exception { request.setRouteErrorThreshold(8); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("34 00 10 00 F8 FF 3C 00 10 0E 08 08 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("34 00 10 00 F8 FF 3C 00 10 0E 08 08 00"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java index 1a80d9d509..687da5de3d 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueRequestTest.java @@ -27,13 +27,12 @@ public class EzspSetConfigurationValueRequestTest extends EzspFrameTest { @Test public void testVersion() throws Exception { - EzspFrame.setEzspVersion(4); EzspSetConfigurationValueRequest request = new EzspSetConfigurationValueRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 2); request.setConfigId(EzspConfigId.EZSP_CONFIG_APPLICATION_ZDO_FLAGS); request.setValue(EmberZdoConfigurationFlags.EMBER_APP_RECEIVES_SUPPORTED_ZDO_REQUESTS.getKey()); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("02 00 53 2A 01 00"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("02 00 53 2A 01 00"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java index c0e4dadc13..2670845456 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetConfigurationValueResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspSetConfigurationValueResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspStatus; @@ -24,9 +23,7 @@ public class EzspSetConfigurationValueResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - - EzspSetConfigurationValueResponse response = new EzspSetConfigurationValueResponse( + EzspSetConfigurationValueResponse response = new EzspSetConfigurationValueResponse(4, getPacketData("02 80 53 00")); System.out.println(response); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java index 2784753507..477f317946 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetInitialSecurityStateRequestTest.java @@ -29,8 +29,6 @@ public class EzspSetInitialSecurityStateRequestTest extends EzspFrameTest { @Test public void testSecurityStateRequest() throws Exception { - EzspFrame.setEzspVersion(4); - EmberKeyData keyData; EzspSetInitialSecurityStateRequest request = new EzspSetInitialSecurityStateRequest(); EmberInitialSecurityState state = new EmberInitialSecurityState(); @@ -49,6 +47,6 @@ public void testSecurityStateRequest() throws Exception { assertTrue(Arrays.equals(getPacketData( "07 00 68 00 00 BB 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BB AA 00 00 00 00 00 00 00 00 00 00 00 00 00 00 AA 00 EF CD AB 90 78 56 34 12"), - request.serialize())); + request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java index 2095a69978..3ef4c61a87 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspSetValueRequestTest.java @@ -26,13 +26,12 @@ public class EzspSetValueRequestTest extends EzspFrameTest { @Test public void testSetValue() throws Exception { - EzspFrame.setEzspVersion(4); EzspSetValueRequest request = new EzspSetValueRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 2); request.setValueId(EzspValueId.EZSP_VALUE_APS_FRAME_COUNTER); request.setValue(new int[] { 1, 2, 3, 4 }); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("02 00 AB 24 04 01 02 03 04"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("02 00 AB 24 04 01 02 03 04"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java index 45a05c30dd..8b1f845ffa 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStackStatusHandlerResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspStackStatusHandler; import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberStatus; @@ -24,9 +23,7 @@ public class EzspStackStatusHandlerResponseTest extends EzspFrameTest { @Test public void testStackHandler() { - EzspFrame.setEzspVersion(4); - - EzspStackStatusHandler response = new EzspStackStatusHandler(getPacketData("03 90 19 90")); + EzspStackStatusHandler response = new EzspStackStatusHandler(4, getPacketData("03 90 19 90")); System.out.println(response); assertEquals(EzspStackStatusHandler.FRAME_ID, response.getFrameId()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java index f8eab7749e..b933565c6a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanRequestTest.java @@ -27,7 +27,6 @@ public class EzspStartScanRequestTest extends EzspFrameTest { @Test public void testVersion() throws Exception { - EzspFrame.setEzspVersion(4); EzspStartScanRequest request = new EzspStartScanRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 3); request.setScanType(EzspNetworkScanType.EZSP_ENERGY_SCAN); @@ -35,6 +34,6 @@ public void testVersion() throws Exception { request.setDuration(1); System.out.println(request); - assertTrue(Arrays.equals(getPacketData("03 00 1A 00 00 F8 FF 07 01"), request.serialize())); + assertTrue(Arrays.equals(getPacketData("03 00 1A 00 00 F8 FF 07 01"), request.serialize(4))); } } diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java index 5a9214e22e..a8d266462a 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspStartScanResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspStartScanResponse; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; @@ -25,8 +24,7 @@ public class EzspStartScanResponseTest extends EzspFrameTest { @Test public void testVersion() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse version = new EzspVersionResponse(getPacketData("03 80 00 04 02 00 58")); + EzspVersionResponse version = new EzspVersionResponse(4, getPacketData("03 80 00 04 02 00 58")); System.out.println(version); assertEquals(3, version.getSequenceNumber()); @@ -39,7 +37,7 @@ public void testVersion() { @Test public void testVersionError() { - EzspStartScanResponse response = new EzspStartScanResponse(getPacketData("03 80 1A 35")); + EzspStartScanResponse response = new EzspStartScanResponse(4, getPacketData("03 80 1A 35")); assertEquals(3, response.getSequenceNumber()); assertEquals(true, response.isResponse()); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java index ab5a024dbe..6dc71d1e33 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionRequestTest.java @@ -25,34 +25,31 @@ public class EzspVersionRequestTest extends EzspFrameTest { @Test public void testVersion4() throws Exception { - EzspFrame.setEzspVersion(4); EzspVersionRequest version = new EzspVersionRequest(); version.setDesiredProtocolVersion(4); TestUtilities.setField(EzspFrame.class, version, "sequenceNumber", 0); System.out.println(version); - assertTrue(Arrays.equals(getPacketData("00 00 00 04"), version.serialize())); + assertTrue(Arrays.equals(getPacketData("00 00 00 04"), version.serialize(4))); } @Test public void testVersion5() throws Exception { - EzspFrame.setEzspVersion(5); EzspVersionRequest version = new EzspVersionRequest(); version.setDesiredProtocolVersion(5); TestUtilities.setField(EzspFrame.class, version, "sequenceNumber", 0); System.out.println(version); - assertTrue(Arrays.equals(getPacketData("00 00 FF 00 00 05"), version.serialize())); + assertTrue(Arrays.equals(getPacketData("00 00 FF 00 00 05"), version.serialize(5))); } @Test public void testVersion6() throws Exception { - EzspFrame.setEzspVersion(6); EzspVersionRequest version = new EzspVersionRequest(); version.setDesiredProtocolVersion(6); TestUtilities.setField(EzspFrame.class, version, "sequenceNumber", 0); System.out.println(version); - assertTrue(Arrays.equals(getPacketData("00 00 FF 00 00 06"), version.serialize())); + assertTrue(Arrays.equals(getPacketData("00 00 FF 00 00 06"), version.serialize(6))); } } \ No newline at end of file diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java index 5bdeb9150f..3d7351dce1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ezsp/command/EzspVersionResponseTest.java @@ -11,7 +11,6 @@ import org.junit.Test; -import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrame; import com.zsmartsystems.zigbee.dongle.ember.ezsp.EzspFrameTest; import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse; @@ -23,8 +22,7 @@ public class EzspVersionResponseTest extends EzspFrameTest { @Test public void testVersion58() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse version = new EzspVersionResponse(getPacketData("03 80 00 04 02 00 58")); + EzspVersionResponse version = new EzspVersionResponse(4, getPacketData("03 80 00 04 02 00 58")); System.out.println(version); // Version 5.8.0 - EZSP 4 @@ -38,8 +36,7 @@ public void testVersion58() { @Test public void testVersion581() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse version = new EzspVersionResponse(getPacketData("01 80 00 04 02 10 58")); + EzspVersionResponse version = new EzspVersionResponse(4, getPacketData("01 80 00 04 02 10 58")); System.out.println(version); // Version 5.8.1 - EZSP 4 @@ -53,8 +50,7 @@ public void testVersion581() { @Test public void testVersion5A1() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse version = new EzspVersionResponse(getPacketData("01 80 FF 00 00 05 02 10 5A")); + EzspVersionResponse version = new EzspVersionResponse(4, getPacketData("01 80 FF 00 00 05 02 10 5A")); System.out.println(version); // Version 5.10.1 - EZSP 5 @@ -68,8 +64,7 @@ public void testVersion5A1() { @Test public void testVersion600() { - EzspFrame.setEzspVersion(4); - EzspVersionResponse version = new EzspVersionResponse(getPacketData("01 80 FF 00 00 06 02 00 60")); + EzspVersionResponse version = new EzspVersionResponse(4, getPacketData("01 80 FF 00 00 06 02 00 60")); System.out.println(version); // Version 6.0.0 - EZSP 6 diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java index b85922d4dc..ee790933f1 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/ash/AshFrameDataTest.java @@ -32,14 +32,14 @@ public void testAshFrameData() throws Exception { EzspVersionRequest request = new EzspVersionRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 1); request.setDesiredProtocolVersion(4); - frame = new AshFrameData(request); + frame = new AshFrameData(4, request); System.out.println(frame); assertTrue(Arrays.equals(new int[] { 0, 67, 33, 168, 80, 155, 152, 126 }, frame.getOutputBuffer())); request = new EzspVersionRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 2); request.setDesiredProtocolVersion(4); - frame = new AshFrameData(request); + frame = new AshFrameData(4, request); frame.setAckNum(3); frame.setFrmNum(4); System.out.println(frame); @@ -48,7 +48,7 @@ public void testAshFrameData() throws Exception { request = new EzspVersionRequest(); TestUtilities.setField(EzspFrame.class, request, "sequenceNumber", 3); request.setDesiredProtocolVersion(4); - frame = new AshFrameData(request); + frame = new AshFrameData(4, request); frame.setAckNum(6); frame.setFrmNum(2); frame.setReTx(); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java index 1c53da6be4..33451fcd1e 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspMultiResponseTransactionTest.java @@ -46,23 +46,23 @@ public void testResponseMatches() { EzspMultiResponseTransaction transaction = new EzspMultiResponseTransaction(request, EzspScanCompleteHandler.class, relatedResponses); - EzspStartScanResponse scanResponse = new EzspStartScanResponse(getPacketData("39 80 1A 00")); + EzspStartScanResponse scanResponse = new EzspStartScanResponse(4, getPacketData("39 80 1A 00")); System.out.println(scanResponse); assertFalse(transaction.isMatch(scanResponse)); - EzspEnergyScanResultHandler scanResult = new EzspEnergyScanResultHandler(getPacketData("39 8C 48 0B C1")); + EzspEnergyScanResultHandler scanResult = new EzspEnergyScanResultHandler(4, getPacketData("39 8C 48 0B C1")); System.out.println(scanResult); assertFalse(transaction.isMatch(scanResult)); - scanResult = new EzspEnergyScanResultHandler(getPacketData("3A 8C 48 0E C6")); + scanResult = new EzspEnergyScanResultHandler(4, getPacketData("3A 8C 48 0E C6")); System.out.println(scanResult); assertFalse(transaction.isMatch(scanResult)); - scanResult = new EzspEnergyScanResultHandler(getPacketData("3B 8C 48 0F B4")); + scanResult = new EzspEnergyScanResultHandler(4, getPacketData("3B 8C 48 0F B4")); System.out.println(scanResult); assertFalse(transaction.isMatch(scanResult)); - scanResult = new EzspEnergyScanResultHandler(getPacketData("3B 8C 48 10 AA")); + scanResult = new EzspEnergyScanResultHandler(4, getPacketData("3B 8C 48 10 AA")); assertFalse(transaction.isMatch(scanResult)); - scanResult = new EzspEnergyScanResultHandler(getPacketData("3C 8C 48 12 B3")); + scanResult = new EzspEnergyScanResultHandler(4, getPacketData("3C 8C 48 12 B3")); assertFalse(transaction.isMatch(scanResult)); - EzspScanCompleteHandler scanComplete = new EzspScanCompleteHandler(getPacketData("3F 88 1C 02 00")); + EzspScanCompleteHandler scanComplete = new EzspScanCompleteHandler(4, getPacketData("3F 88 1C 02 00")); System.out.println(scanComplete); assertTrue(transaction.isMatch(scanComplete)); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java index 79e7287801..ee9111363b 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspScanTransactionTest.java @@ -38,7 +38,6 @@ public class EzspScanTransactionTest extends EzspFrameTest { @Test public void testScanTransaction() throws Exception { - EzspFrame.setEzspVersion(4); EzspStartScanRequest energyScan = new EzspStartScanRequest(); energyScan.setChannelMask(ZigBeeChannelMask.CHANNEL_MASK_2GHZ); energyScan.setDuration(1); @@ -53,26 +52,26 @@ public void testScanTransaction() throws Exception { EzspFrameResponse response; // Start Scan Response - response = new EzspStartScanResponse(getPacketData("03 80 1A 00")); + response = new EzspStartScanResponse(4, getPacketData("03 80 1A 00")); assertFalse(scanTransaction.isMatch(response)); - response = new EzspEnergyScanResultHandler(getPacketData("03 90 48 0B 9D")); + response = new EzspEnergyScanResultHandler(4, getPacketData("03 90 48 0B 9D")); assertEquals(11, ((EzspEnergyScanResultHandler) response).getChannel()); assertEquals(-99, ((EzspEnergyScanResultHandler) response).getMaxRssiValue()); assertFalse(scanTransaction.isMatch(response)); - response = new EzspEnergyScanResultHandler(getPacketData("03 90 48 0C 9D")); + response = new EzspEnergyScanResultHandler(4, getPacketData("03 90 48 0C 9D")); assertFalse(scanTransaction.isMatch(response)); - response = new EzspEnergyScanResultHandler(getPacketData("03 90 48 0D AB")); + response = new EzspEnergyScanResultHandler(4, getPacketData("03 90 48 0D AB")); assertEquals(13, ((EzspEnergyScanResultHandler) response).getChannel()); assertEquals(-85, ((EzspEnergyScanResultHandler) response).getMaxRssiValue()); assertFalse(scanTransaction.isMatch(response)); - response = new EzspEnergyScanResultHandler(getPacketData("03 90 48 0E 9D")); + response = new EzspEnergyScanResultHandler(4, getPacketData("03 90 48 0E 9D")); assertFalse(scanTransaction.isMatch(response)); - response = new EzspScanCompleteHandler(getPacketData("03 90 1C 0B 00")); + response = new EzspScanCompleteHandler(4, getPacketData("03 90 1C 0B 00")); assertEquals(EmberStatus.EMBER_SUCCESS, ((EzspScanCompleteHandler) response).getStatus()); assertTrue(scanTransaction.isMatch(response)); diff --git a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java index c251a73c98..af8ba3bea9 100644 --- a/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java +++ b/com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/internal/transaction/EzspSingleResponseTransactionTest.java @@ -35,7 +35,7 @@ public void testResponseMatches() throws Exception { EzspTransaction versionTransaction = new EzspSingleResponseTransaction(version, EzspVersionResponse.class); - EzspVersionResponse versionResponse = new EzspVersionResponse(getPacketData("03 80 00 04 02 00 58")); + EzspVersionResponse versionResponse = new EzspVersionResponse(4, getPacketData("03 80 00 04 02 00 58")); assertTrue(versionTransaction.isMatch(versionResponse)); @@ -53,7 +53,7 @@ public void testResponseMatchFails() throws Exception { EzspTransaction versionTransaction = new EzspSingleResponseTransaction(version, EzspVersionResponse.class); - EzspVersionResponse versionResponse = new EzspVersionResponse(getPacketData("03 80 00 04 02 00 58")); + EzspVersionResponse versionResponse = new EzspVersionResponse(4, getPacketData("03 80 00 04 02 00 58")); assertFalse(versionTransaction.isMatch(versionResponse)); assertNull(versionTransaction.getResponse());