update for latest SwiftOCA

PADL · Aug 1, 2023 · 9938b4c · 9938b4c
1 parent a548ff0
commit 9938b4c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<SwiftOCADevice.OcaWorker>, MOMPanelContr
 
     override open func handleCommand(
         _ command: Ocp1Command,
-        from controller: AES70OCP1Controller
+        from controller: AES70Controller
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)