From 80ded328dbe867ad9fe326c2e16cc80779971449 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sun, 9 Jul 2023 16:59:30 +1000
Subject: [PATCH] fix regression adding subscriptions

confusingly named argument labels should be fixed: parameters where we need to
use reflection to determine parameter count from field count, paramter where
there is a single parameter
---
 .../ControlClasses/Managers/SubscriptionManager.swift  |  8 ++++----
 .../SwiftOCA/OCC/ControlClasses/Root+Commands.swift    |  6 +++---
 .../Workers/BlocksAndMatrices/Block.swift              | 10 +++++-----
 .../Workers/BlocksAndMatrices/Matrix.swift             |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Sources/SwiftOCA/OCC/ControlClasses/Managers/SubscriptionManager.swift b/Sources/SwiftOCA/OCC/ControlClasses/Managers/SubscriptionManager.swift
index abd755b8..d2a21309 100644
--- a/Sources/SwiftOCA/OCC/ControlClasses/Managers/SubscriptionManager.swift
+++ b/Sources/SwiftOCA/OCC/ControlClasses/Managers/SubscriptionManager.swift
@@ -54,7 +54,7 @@ public class OcaSubscriptionManager: OcaManager {
             notificationDeliveryMode: notificationDeliveryMode,
             destinationInformation: destinationInformation
         )
-        try await sendCommandRrq(methodID: OcaMethodID("3.1"), parameter: params)
+        try await sendCommandRrq(methodID: OcaMethodID("3.1"), parameters: params)
     }
 
     func removeSubscription(event: OcaEvent, subscriber: OcaMethod) async throws {
@@ -64,7 +64,7 @@ public class OcaSubscriptionManager: OcaManager {
         }
 
         let params = RemoveSubscriptionParameters(event: event, subscriber: subscriber)
-        try await sendCommandRrq(methodID: OcaMethodID("3.2"), parameter: params)
+        try await sendCommandRrq(methodID: OcaMethodID("3.2"), parameters: params)
     }
 
     func disableNotifications() async throws {
@@ -100,7 +100,7 @@ public class OcaSubscriptionManager: OcaManager {
             notificationDeliveryMode: notificationDeliveryMode,
             destinationInformation: destinationInformation
         )
-        try await sendCommandRrq(methodID: OcaMethodID("3.5"), parameter: params)
+        try await sendCommandRrq(methodID: OcaMethodID("3.5"), parameters: params)
     }
 
     func removePropertyChangeSubscription(
@@ -119,7 +119,7 @@ public class OcaSubscriptionManager: OcaManager {
             property: property,
             subscriber: subscriber
         )
-        try await sendCommandRrq(methodID: OcaMethodID("3.6"), parameter: params)
+        try await sendCommandRrq(methodID: OcaMethodID("3.6"), parameters: params)
     }
 
     func getMaximumSubscriberContextLength() async throws -> OcaUint16 {
diff --git a/Sources/SwiftOCA/OCC/ControlClasses/Root+Commands.swift b/Sources/SwiftOCA/OCC/ControlClasses/Root+Commands.swift
index feb1f1cf..67b04b22 100644
--- a/Sources/SwiftOCA/OCC/ControlClasses/Root+Commands.swift
+++ b/Sources/SwiftOCA/OCC/ControlClasses/Root+Commands.swift
@@ -269,17 +269,17 @@ extension OcaRoot {
 
     func sendCommandRrq<T: Encodable, U: Decodable>(
         methodID: OcaMethodID,
-        parameter: T
+        parameters: T
     ) async throws -> U {
         var responseParameterData = Data()
 
         try await sendCommandRrq(
             methodID: methodID,
             parameterCount: OcaUint8(
-                Mirror(reflecting: parameter).children
+                Mirror(reflecting: parameters).children
                     .count
             ),
-            parameters: [parameter],
+            parameters: [parameters],
             responseParameterCount: responseParameterCount(U.self),
             responseParameters: &responseParameterData
         )
diff --git a/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Block.swift b/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Block.swift
index 06a5e012..a86e24dc 100644
--- a/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Block.swift
+++ b/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Block.swift
@@ -76,14 +76,14 @@ public class OcaBlock: OcaWorker {
     func constructMember(factory factoryONo: OcaONo) async throws -> OcaONo {
         try await sendCommandRrq(
             methodID: OcaMethodID("3.3"),
-            parameter: factoryONo
+            parameters: factoryONo
         )
     }
 
     func delete(member objectNumber: OcaONo) async throws {
         try await sendCommandRrq(
             methodID: OcaMethodID("3.4"),
-            parameter: objectNumber
+            parameters: objectNumber
         )
     }
 
@@ -94,7 +94,7 @@ public class OcaBlock: OcaWorker {
     func add(signalPath path: OcaSignalPath) async throws -> OcaUint16 {
         try await sendCommandRrq(
             methodID: OcaMethodID("3.7"),
-            parameter: path
+            parameters: path
         )
     }
 
@@ -147,7 +147,7 @@ public class OcaBlock: OcaWorker {
             resultFlags: resultFlags
         )
 
-        return try await sendCommandRrq(methodID: OcaMethodID("3.17"), parameter: params)
+        return try await sendCommandRrq(methodID: OcaMethodID("3.17"), parameters: params)
     }
 
     func findRecursive(
@@ -163,7 +163,7 @@ public class OcaBlock: OcaWorker {
             resultFlags: resultFlags
         )
 
-        return try await sendCommandRrq(methodID: OcaMethodID("3.18"), parameter: params)
+        return try await sendCommandRrq(methodID: OcaMethodID("3.18"), parameters: params)
     }
 
     // 3.19
diff --git a/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Matrix.swift b/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Matrix.swift
index 02955c02..ac204710 100644
--- a/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Matrix.swift
+++ b/Sources/SwiftOCA/OCC/ControlClasses/Workers/BlocksAndMatrices/Matrix.swift
@@ -69,7 +69,7 @@ public class OcaMatrix: OcaWorker {
 
     func get(x: OcaMatrixCoordinate, y: OcaMatrixCoordinate) async throws -> OcaONo {
         let xy = OcaVector2D(x: x, y: y)
-        return try await sendCommandRrq(methodID: OcaMethodID("3.7"), parameter: xy)
+        return try await sendCommandRrq(methodID: OcaMethodID("3.7"), parameters: xy)
     }
 
     func set(x: OcaMatrixCoordinate, y: OcaMatrixCoordinate, memberONo: OcaONo) async throws {