Merge pull request #16 from Gartom/Preset-updates

Updated PTZ preset functionality
bitfocus · Apr 5, 2021 · 0a78c6a · 0a78c6a
2 parents 0f2923b + b64011b
commit 0a78c6a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/index.js b/index.js
@@ -40,8 +40,8 @@ var SHUTTER = [
 ];
 
 var PRESET = [];
-for (var i = 0; i < 64; ++i) {
-	PRESET.push({ id: ('0' + i.toString(16)).substr(-2,2), label: 'Preset ' + i });
+for (var i = 0; i < 256; ++i) {
+	PRESET.push({ id: ('0' + i.toString(16)).substr(-2,2), label: i });
 }
 
 var SPEED = [
@@ -754,13 +754,13 @@ instance.prototype.init_presets = function () {
 	];
 
 var save;
-for (save = 0; save < 63; save++) {
+for (save = 0; save < 256; save++) {
 	presets.push({
 		category: 'Save Preset',
-		label: 'Save Preset '+ parseInt(save+1) ,
+		label: 'Save Preset '+ parseInt(save) ,
 		bank: {
 			style: 'text',
-			text: 'SAVE\\nPSET\\n' + parseInt(save+1) ,
+			text: 'SAVE\\nPSET\\n' + parseInt(save) ,
 			size: '14',
 			color: '16777215',
 			bgcolor: self.rgb(0,0,0),
@@ -769,21 +769,21 @@ for (save = 0; save < 63; save++) {
 			{
 				action: 'savePset',
 				options: {
-				val: ('0' + save.toString(16).toUpperCase()).substr(-2,2),
+				val: ('0' + save.toString(16)).substr(-2,2),
 				}
 			}
 		]
 	});
 }
 
 var recall;
-for (recall = 0; recall < 63; recall++) {
+for (recall = 0; recall < 256; recall++) {
 	presets.push({
 		category: 'Recall Preset',
-		label: 'Recall Preset '+ parseInt(recall+1) ,
+		label: 'Recall Preset '+ parseInt(recall) ,
 		bank: {
 			style: 'text',
-			text: 'Recall\\nPSET\\n' + parseInt(recall+1) ,
+			text: 'Recall\\nPSET\\n' + parseInt(recall) ,
 			size: '14',
 			color: '16777215',
 			bgcolor: self.rgb(0,0,0),
@@ -792,7 +792,7 @@ for (recall = 0; recall < 63; recall++) {
 			{
 				action: 'recallPset',
 				options: {
-				val: ('0' + recall.toString(16).toUpperCase()).substr(-2,2),
+				val: ('0' + recall.toString(16)).substr(-2,2),
 				}
 			}
 		]
@@ -1220,7 +1220,7 @@ instance.prototype.action = function(action) {
 			break;
 
 		case 'speedPset':
-			cmd ='\x81\x01\x7E\x01\x0B' + String.fromCharCode(parseInt(opt.val,16) & 0xFF) + String.fromCharCode(parseInt(opt.speed,16) & 0xFF) + '\xFF';
+			cmd ='\x81\x01\x06\x01' + String.fromCharCode(parseInt(opt.val,16) & 0xFF) + String.fromCharCode(parseInt(opt.speed,16) & 0xFF) + '\xFF';
 			self.sendVISCACommand(cmd);
 			break;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ptzoptics-visca",
-	"version": "1.1.5",
+	"version": "1.1.6",
 	"api_version": "1.0.0",
 	"keywords": [
 		"Protocol",