From 5527ba5ba0fb4b1b5701c371f5f4eeeaf88c1f87 Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Mon, 16 Oct 2023 01:25:43 +0100
Subject: [PATCH] fix: more typos

---
 lib/Internal/Controller.js | 4 ++--
 lib/Internal/Variables.js  | 2 +-
 lib/Service/EmberPlus.js   | 2 +-
 lib/Service/Rosstalk.js    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Internal/Controller.js b/lib/Internal/Controller.js
index b078a3b2f..aa3dc03e6 100644
--- a/lib/Internal/Controller.js
+++ b/lib/Internal/Controller.js
@@ -59,7 +59,7 @@ export default class InternalController extends CoreBase {
 		for (const [controlId, control] of allControls.entries()) {
 			// Discover feedbacks to process
 			if (control.feedbacks && control.feedbacks.feedbacks) {
-				for (const feedback of control.feedbacks.feedbacks) {
+				for (let feedback of control.feedbacks.feedbacks) {
 					if (feedback.instance_id === 'internal') {
 						if (control.feedbacks.feedbackReplace) {
 							const newFeedback = this.feedbackUpgrade(feedback, controlId)
@@ -81,7 +81,7 @@ export default class InternalController extends CoreBase {
 				for (const action of actions) {
 					if (action.instance === 'internal') {
 						// Try and run an upgrade
-						const newAction = this.actionUpgrade(action)
+						const newAction = this.actionUpgrade(action, controlId)
 						if (newAction) {
 							control.actionReplace(newAction)
 						}
diff --git a/lib/Internal/Variables.js b/lib/Internal/Variables.js
index cb5e7b083..0f3e67f46 100644
--- a/lib/Internal/Variables.js
+++ b/lib/Internal/Variables.js
@@ -163,7 +163,7 @@ export default class Variables extends CoreBase {
 			try {
 				const res = this.instance.variable.parseExpression(feedback.options.expression, 'boolean')
 
-				this.#variableSubscriptions[feedback.id] = res.variableIds
+				this.#variableSubscriptions[feedback.id] = Array.from(res.variableIds)
 
 				return res.value
 			} catch (e) {
diff --git a/lib/Service/EmberPlus.js b/lib/Service/EmberPlus.js
index a12a1fa29..8a41edc62 100644
--- a/lib/Service/EmberPlus.js
+++ b/lib/Service/EmberPlus.js
@@ -238,7 +238,7 @@ class ServiceEmberPlus extends ServiceBase {
 			if (isNaN(page) || isNaN(bank) || isNaN(node)) return false
 			if (page < 0 || page > 100) return false
 
-			const controlId = CreateBankControlId(page, bank)
+			const controlId = this.page.getControlIdAtOldBankIndex(page, bank)
 
 			switch (node) {
 				case NODE_STATE: {
diff --git a/lib/Service/Rosstalk.js b/lib/Service/Rosstalk.js
index 39429c397..04428f067 100644
--- a/lib/Service/Rosstalk.js
+++ b/lib/Service/Rosstalk.js
@@ -70,7 +70,7 @@ class ServiceRosstalk extends ServiceTcpBase {
 			if (!xy) return
 
 			const controlId = this.page.getControlIdAt({
-				pageNumber: page,
+				pageNumber: pageNumber,
 				column: xy[0],
 				row: xy[1],
 			})