From 9938b4c445778c03b5723c1c1d33700d5b791849 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Tue, 1 Aug 2023 23:37:31 +1000 Subject: [PATCH] update for latest SwiftOCA --- Package.resolved | 8 ++++---- Sources/MOMOCABridge/ControlClasses/MOMButton.swift | 4 ++-- Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift | 2 +- Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift | 2 +- .../ControlClasses/MOMIdentificationSensor.swift | 2 +- .../MOMOCABridge/ControlClasses/MOMLayerIndicator.swift | 2 +- Sources/MOMOCABridge/ControlClasses/MOMPanel.swift | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Package.resolved b/Package.resolved index 701300e..5ed1aa4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -21,10 +21,10 @@ { "identity" : "mom", "kind" : "remoteSourceControl", - "location" : "git@github.com:PADL/MOM.git", + "location" : "https://github.com/PADL/MOM.git", "state" : { "branch" : "main", - "revision" : "7279e08df56c540b05de18932fe2c2f1cba9f4f1" + "revision" : "4128aa9d0d915bf380c2fdd7e1040f8eec98193f" } }, { @@ -57,10 +57,10 @@ { "identity" : "swiftoca", "kind" : "remoteSourceControl", - "location" : "git@github.com:PADL/SwiftOCA.git", + "location" : "https://github.com/PADL/SwiftOCA.git", "state" : { "branch" : "main", - "revision" : "8fdb2c98bc4629621d76af94afe6d0780ea8f276" + "revision" : "310906ea50da1a14cb35d4913f1773919b7b781b" } } ], diff --git a/Sources/MOMOCABridge/ControlClasses/MOMButton.swift b/Sources/MOMOCABridge/ControlClasses/MOMButton.swift index 39ae416..6eb2048 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMButton.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMButton.swift @@ -28,7 +28,7 @@ protocol MOMKeyProtocol: MOMPanelControl { } extension MOMKeyProtocol { - func notifyKeyDownUp(from controller: AES70OCP1Controller) async { + func notifyKeyDownUp(from controller: AES70Controller) async { guard let bridge else { return } var params: [Int] = [MOMStatus.success.rawValue, keyID.rawValue, 0] params[2] = 1 // key down @@ -76,7 +76,7 @@ class MOMButton: SwiftOCADevice.OcaBooleanActuator, MOMKeyProtocol { override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller) diff --git a/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift b/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift index 5446eea..de31e62 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift @@ -38,7 +38,7 @@ class MOMExternalKey: SwiftOCADevice.OcaBooleanActuator, MOMKeyProtocol { override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller) diff --git a/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift b/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift index 4f5903c..ab3c200 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift @@ -42,7 +42,7 @@ class MOMSteppedGainControl: SwiftOCADevice.OcaGain, MOMPanelControl { override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller) diff --git a/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift b/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift index 8ebb1c0..f270926 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift @@ -35,7 +35,7 @@ class MOMIdentificationSensor: SwiftOCADevice.OcaIdentificationSensor, MOMPanelC override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller) diff --git a/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift b/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift index 5f2ecf4..8506a6d 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift @@ -38,7 +38,7 @@ class MOMLayerIndicator: SwiftOCADevice.OcaUint8Sensor, MOMPanelControl { override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller) diff --git a/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift b/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift index bb09f46..67af2fb 100644 --- a/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift +++ b/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift @@ -32,7 +32,7 @@ extension MOMPanelControl { } } - func ensureWritableAndConnectedToDadMan(_ controller: AES70OCP1Controller) async throws { + func ensureWritableAndConnectedToDadMan(_ controller: AES70Controller) async throws { guard let bridge else { return } try await ensureWritable(by: controller) try await bridge.ensureConnectedToDadMan() @@ -41,7 +41,7 @@ extension MOMPanelControl { // shared command implementations between MOM worker classes func handleCommonMomCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { switch command.methodID { case OcaMethodID("2.1"): // GetEnabled() @@ -104,7 +104,7 @@ class MOMPanel: SwiftOCADevice.OcaBlock, MOMPanelContr override open func handleCommand( _ command: Ocp1Command, - from controller: AES70OCP1Controller + from controller: AES70Controller ) async throws -> Ocp1Response { do { return try await handleCommonMomCommand(command, from: controller)