replace notImplemented with MOMPanel.CommandNotHandled

PADL · Jul 31, 2023 · aa7945e · aa7945e
1 parent b29f99d
commit aa7945e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Sources/MOMOCABridge/ControlClasses/MOMButton.swift b/Sources/MOMOCABridge/ControlClasses/MOMButton.swift
@@ -80,7 +80,7 @@ class MOMButton: SwiftOCADevice.OcaBooleanActuator, MOMKeyProtocol {
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             switch command.methodID {
             case OcaMethodID("2.8"):
                 guard let bridge else { throw Ocp1Error.status(.deviceError) }

diff --git a/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift b/Sources/MOMOCABridge/ControlClasses/MOMExternalKey.swift
@@ -42,7 +42,7 @@ class MOMExternalKey: SwiftOCADevice.OcaBooleanActuator, MOMKeyProtocol {
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             switch command.methodID {
             case OcaMethodID("2.8"):
                 guard let bridge else { throw Ocp1Error.status(.deviceError) }

diff --git a/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift b/Sources/MOMOCABridge/ControlClasses/MOMGainControl.swift
@@ -46,7 +46,7 @@ class MOMSteppedGainControl: SwiftOCADevice.OcaGain, MOMPanelControl {
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             switch command.methodID {
             case OcaMethodID("4.2"):
                 try await ensureWritableAndConnectedToDadMan(controller)

diff --git a/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift b/Sources/MOMOCABridge/ControlClasses/MOMIdentificationSensor.swift
@@ -39,7 +39,7 @@ class MOMIdentificationSensor: SwiftOCADevice.OcaIdentificationSensor, MOMPanelC
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             return try await super.handleCommand(command, from: controller)
         }
     }

diff --git a/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift b/Sources/MOMOCABridge/ControlClasses/MOMLayerIndicator.swift
@@ -42,7 +42,7 @@ class MOMLayerIndicator: SwiftOCADevice.OcaUint8Sensor, MOMPanelControl {
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             return try await super.handleCommand(command, from: controller)
         }
     }

diff --git a/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift b/Sources/MOMOCABridge/ControlClasses/MOMPanel.swift
@@ -51,7 +51,7 @@ extension MOMPanelControl {
             try await ensureWritable(by: controller)
             fallthrough
         default:
-            throw Ocp1Error.notImplemented
+            throw MOMPanel.CommandNotHandled()
         }
     }
 
@@ -82,6 +82,8 @@ class MOMPanel: SwiftOCADevice.OcaBlock<SwiftOCADevice.OcaWorker>, MOMPanelContr
     var layer: MOMLayerIndicator
     var identificationSensor: MOMIdentificationSensor
 
+    struct CommandNotHandled: Error {}
+
     init(bridge: MOMOCABridge) async throws {
         self.bridge = bridge
 
@@ -108,7 +110,7 @@ class MOMPanel: SwiftOCADevice.OcaBlock<SwiftOCADevice.OcaWorker>, MOMPanelContr
     ) async throws -> Ocp1Response {
         do {
             return try await handleCommonMomCommand(command, from: controller)
-        } catch Ocp1Error.status(.notImplemented) {
+        } catch is MOMPanel.CommandNotHandled {
             return try await super.handleCommand(command, from: controller)
         }
     }