Missed property name changes, fixed typos

bitfocus · Mar 12, 2023 · e79b38f · e79b38f
1 parent 486f182
commit e79b38f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/buildStripDefs.js b/buildStripDefs.js
@@ -1,3 +1,4 @@
+'use strict'
 import { defStrip } from './defStrip.js'
 import { combineRgb, Regex } from '@companion-module/base'
 import { pad0, unSlash, setToggle, fadeTo } from './helpers.js'
@@ -153,7 +154,7 @@ export function buildStripDefs(self) {
 							const opt = action.options
 							const nVal = opt.type == '/ch/' ? pad0(opt.num) : opt.num
 							const cmd =
-								action.actionId == 'lr' ? opt.type + nVal + '/mix/lr' : opt.type + nval + '/' + action.actionId + '/on'
+								action.actionId == 'lr' ? opt.type + nVal + '/mix/lr' : opt.type + nVal + '/' + action.actionId + '/on'
 							const arg = {
 								type: 'i',
 								value: setToggle(self.xStat[cmd].isOn, opt.set),
@@ -425,7 +426,7 @@ export function buildStripDefs(self) {
 							if (opt.type == '/ch/') {
 								nVal = pad0(nVal)
 							}
-							const strip = opt.type + nVal
+							let strip = opt.type + nVal
 							strip += opt.type == '/dca/' ? '/fader' : '/mix/fader'
 							fadeTo(action.actionId, strip, opt, self)
 						},
@@ -463,7 +464,7 @@ export function buildStripDefs(self) {
 							if (opt.type == '/ch/') {
 								nVal = pad0(nVal)
 							}
-							const strip = opt.type + nVal
+							let strip = opt.type + nVal
 							strip += opt.type == '/dca/' ? '/fader' : '/mix/fader'
 							let fVal = fadeTo(action.actionId, strip, opt, self)
 							const arg = {
@@ -526,8 +527,8 @@ export function buildStripDefs(self) {
 
 				fadeActions[fadeID + '_a'].options.push({
 					type: 'number',
-					tooltip: 'Move fader +/- percent.\nFader Percent:\n0 = -oo, 75 = 0db, 100 = +10db',
-					label: 'Adjust',
+					tooltip: 'Move fader +/- percent.',
+					label: 'Adjust By',
 					id: 'ticks',
 					min: -100,
 					max: 100,
@@ -671,9 +672,8 @@ export function buildStripDefs(self) {
 							nVal = parseInt(opt.chNum) + '/'
 						}
 						const bVal = pad0(opt.busNum)
-						const strip = opt.type + nval + 'mix/' + bVal + '/level'
-						let fVal = fadeTo(action.actionId, strip, opt, self)
-						self.sendOSC(strip, { type: 'f', value: fVal })
+						const strip = opt.type + nVal + 'mix/' + bVal + '/level'
+						fadeTo(action.actionId, strip, opt, self)
 					},
 				}
 
@@ -711,8 +711,8 @@ export function buildStripDefs(self) {
 						},
 						{
 							type: 'number',
-							title: 'Move fader +/- percent.\nFader percent:\n0 = -oo, 75 = 0db, 100 = +10db',
-							label: 'Adjust',
+							title: 'Move fader +/- percent.',
+							label: 'Adjust by',
 							id: 'ticks',
 							min: -100,
 							max: 100,
@@ -728,7 +728,7 @@ export function buildStripDefs(self) {
 							nVal = parseInt(opt.chNum) + '/'
 						}
 						const bVal = pad0(opt.busNum)
-						const strip = opt.type + nval + 'mix/' + bVal + '/level'
+						let strip = opt.type + nVal + 'mix/' + bVal + '/level'
 						let fVal = fadeTo(action.actionId, strip, opt, self)
 						self.sendOSC(strip, { type: 'f', value: fVal })
 					},
@@ -747,7 +747,7 @@ export function buildStripDefs(self) {
 				}
 
 				storeActions[sendID + '_s'] = {
-					label: 'Store Send Level',
+					name: 'Store Send Level',
 					options: [
 						{
 							type: 'dropdown',
@@ -787,7 +787,7 @@ export function buildStripDefs(self) {
 							choices: [
 								{
 									id: 'me',
-									label: 'Channel',
+									label: 'Channel Send',
 								},
 								...self.STORE_LOCATION,
 							],
@@ -802,13 +802,13 @@ export function buildStripDefs(self) {
 							nVal = parseInt(opt.chNum) + '/'
 						}
 						const bVal = pad0(opt.busNum)
-						const strip = opt.type + nval + 'mix/' + bVal + '/level'
+						const strip = opt.type + nVal + 'mix/' + bVal + '/level'
 						fadeTo(action.actionId, strip, opt, self)
 					},
 				}
 
 				storeActions[sendID + '_r'] = {
-					label: 'Recall Send Level',
+					name: 'Recall Send Level',
 					options: [
 						{
 							type: 'dropdown',
@@ -848,7 +848,7 @@ export function buildStripDefs(self) {
 							choices: [
 								{
 									id: 'me',
-									label: 'Channel',
+									label: 'Channel Send',
 								},
 								...self.STORE_LOCATION,
 							],
@@ -863,7 +863,7 @@ export function buildStripDefs(self) {
 							nVal = parseInt(opt.chNum) + '/'
 						}
 						const bVal = pad0(opt.busNum)
-						const strip = opt.type + nval + 'mix/' + bVal + '/level'
+						const strip = opt.type + nVal + 'mix/' + bVal + '/level'
 						let fVal = fadeTo(action.actionId, strip, opt, self)
 						self.sendOSC(strip, { type: 'f', value: fVal })
 					},

diff --git a/index.js b/index.js
@@ -30,6 +30,14 @@ class BAirInstance extends InstanceBase {
 		this.blinkingFB = {}
 		this.crossFades = {}
 
+		if (process.env.DEVELOPER) {
+			this.PollCount = 125
+			this.PollTimeout = 100
+		} else {
+			this.PollCount = 30
+			this.PollTimeout = 25
+		}
+
 		buildConstants(this)
 	}
 
@@ -55,8 +63,6 @@ class BAirInstance extends InstanceBase {
 
 		// cross-fade steps per second
 		this.fadeResolution = 20
-		this.PollCount = 30
-		this.PollTimeout = 25
 		this.needStats = true
 		this.hostResponse = false
 		this.blinkOn = false