From 21cc06571a43a0915cfb1f3710467f4c772a214f Mon Sep 17 00:00:00 2001
From: Joseph Adams <josephdadams@gmail.com>
Date: Thu, 22 Aug 2024 20:59:34 -0400
Subject: [PATCH] zoom speed fix

---
 package.json   |  2 +-
 src/actions.js | 18 +++++++++---------
 src/choices.js |  2 +-
 src/presets.js |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index dbf0f54..5d3fb44 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "canon-ptz",
-	"version": "2.2.2",
+	"version": "2.2.3",
 	"main": "src/index.js",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
diff --git a/src/actions.js b/src/actions.js
index 906cab2..867c62c 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -648,14 +648,14 @@ module.exports = {
 						label: 'Zoom Speed Setting',
 						id: 'speed',
 						default: 8,
-						choices: c.CHOICES_ZOOM_SPEED,
+						choices: c.CHOICES_ZOOM_SPEED(),
 					},
 				],
 				callback: async (action) => {
 					self.zSpeed = action.options.speed
 					var idx = -1
-					for (var i = 0; i < c.CHOICES_ZOOM_SPEED.length; ++i) {
-						if (c.CHOICES_ZOOM_SPEED[i].id == self.zSpeed) {
+					for (var i = 0; i < c.CHOICES_ZOOM_SPEED().length; ++i) {
+						if (c.CHOICES_ZOOM_SPEED()[i].id == self.zSpeed) {
 							idx = i
 							break
 						}
@@ -663,7 +663,7 @@ module.exports = {
 					if (idx > -1) {
 						self.zSpeedIndex = idx
 					}
-					self.zSpeed = c.CHOICES_ZOOM_SPEED[self.zSpeedIndex].id
+					self.zSpeed = c.CHOICES_ZOOM_SPEED()[self.zSpeedIndex].id
 					self.data.zoomSpeed = self.zSpeed;
 					self.getCameraInformation_Delayed();
 				}
@@ -678,7 +678,7 @@ module.exports = {
 					} else if (self.zSpeedIndex > 0) {
 						self.zSpeedIndex--
 					}
-					self.zSpeed = c.CHOICES_ZOOM_SPEED[self.zSpeedIndex].id
+					self.zSpeed = c.CHOICES_ZOOM_SPEED()[self.zSpeedIndex].id
 					self.data.zoomSpeed = self.zSpeed;
 					self.getCameraInformation_Delayed();
 				}
@@ -688,12 +688,12 @@ module.exports = {
 				name: 'Lens - Zoom Speed Down',
 				options: [],
 				callback: async (action) => {
-					if (self.zSpeedIndex == c.CHOICES_ZOOM_SPEED.length) {
-						self.zSpeedIndex = c.CHOICES_ZOOM_SPEED.length
-					} else if (self.zSpeedIndex < c.CHOICES_ZOOM_SPEED.length) {
+					if (self.zSpeedIndex == c.CHOICES_ZOOM_SPEED().length) {
+						self.zSpeedIndex = c.CHOICES_ZOOM_SPEED().length
+					} else if (self.zSpeedIndex < c.CHOICES_ZOOM_SPEED().length) {
 						self.zSpeedIndex++
 					}
-					self.zSpeed = c.CHOICES_ZOOM_SPEED[self.zSpeedIndex].id
+					self.zSpeed = c.CHOICES_ZOOM_SPEED()[self.zSpeedIndex].id
 					self.data.zoomSpeed = self.zSpeed;
 					self.getCameraInformation_Delayed();
 				}
diff --git a/src/choices.js b/src/choices.js
index ef131e4..8eca660 100644
--- a/src/choices.js
+++ b/src/choices.js
@@ -17,7 +17,7 @@ module.exports = {
 
 	CHOICES_ZOOM_SPEED: function () {
 		var p = []
-		for (var i = 0; i <= 127; ++i) {
+		for (var i = 0; i <= 127; i++) {
 			p.push({ id: i, label: 'Speed ' + i })
 		}
 		return p
diff --git a/src/presets.js b/src/presets.js
index 9dff334..88bc78a 100644
--- a/src/presets.js
+++ b/src/presets.js
@@ -943,7 +943,7 @@ module.exports = {
 							{
 								actionId: 'zSpeedS',
 								options: {
-									speed: 15
+									speed: 127
 								}
 							}
 						],
@@ -970,7 +970,7 @@ module.exports = {
 							{
 								actionId: 'zSpeedS',
 								options: {
-									speed: 8
+									speed: 63
 								}
 							}
 						],