upgrades and Variables fixes

Author: MeestorX

TF Parameters-1.txt

@@ -106,6 +106,6 @@ OK prminfo 102 "MIXER:Current/St/PanMode" 2 0 0 1 0 "" integer any r 1
 -- prminfo 105 "MIXER:Current/St/Role" 2 0 0 7 0 "" binary any r 1
 OK prminfo 106 "MIXER:Current/FxRtnCh/Label/Category" 4 0 0 6 0 "" binary any r 1
 OK prminfo 107 "MIXER:Current/MuteMaster/Label/Name" 6 0 0 8 "MUTE 1" "" string any r 1
-OK scninfo 1000 "MIXER:Lib/Bank/Scene" 1 2 0 100 0 "" integer any rw 1
+OK scninfo 1000 "MIXER:Lib/Bank/Scene/Recall" 1 2 0 100 0 "" integer any rw 1
 OK scninfo 1001 "MIXER:Lib/Scene/RecallInc" 0 0 0 0 0 "" string any rw 1
 OK scninfo 1002 "MIXER:Lib/Scene/RecallDec" 0 0 0 0 0 "" string any rw 1

index.js

@@ -340,7 +340,7 @@ class instance extends InstanceBase {
 				return data
 			}
 
-			if (cmd.Address.startsWith('MIXER:Lib/Scene')) return
+			if (cmd.Address.startsWith('MIXER:Lib')) return
 
 			if (this.reqStack.length == 0) {
 				this.reqStack.push({Address: cmd.Address, X: cmd.options.X, Y: cmd.options.Y})

package.json

@@ -20,7 +20,7 @@
 		"@companion-module/tools": "^1.0.0"
 	},
 	"dependencies": {
-		"@companion-module/base": "~1.2.0"
+		"@companion-module/base": "~1.2.1"
 	},
 	"prettier": "@companion-module/tools/.prettierrc.json"
 }

upgrade.js

@@ -41,52 +41,53 @@ module.exports = [
 		}
 
 		console.log('Yamaha-RCP Upgrade: Config Ok, Getting Parameters...')
-
 		var rcpCommands = paramFuncs.getParams({config: context.currentConfig})
-
 		console.log('\n')
 
 		let checkUpgrade = (action, isAction) => {
-//console.log('Yamaha-RCP Upgrade: Checking action/feedback: ', action)
+console.log('Yamaha-RCP Upgrade: Checking action/feedback: ', action)
 
+			let changed = false
 			let rcpCmd = undefined
+			let newAction = JSON.parse(JSON.stringify(action))
 			let actionAddress = isAction ? action.actionId : action.feedbackId
 
+			if (actionAddress.startsWith('MIXER_Lib')) {
+				actionAddress = 'MIXER_Lib/Scene/Recall'
+				newAction.options.Val = action.options.X
+				newAction.options.X = 0
+				changed = true
+			}
+
+			if (actionAddress.startsWith('scene')) {
+				actionAddress = 'MIXER_Lib/Bank/Scene/Recall'
+				newAction.options.Val = action.options.X
+				newAction.options.X = 0
+				newAction.options.Y = action.options.Y == 'a' ? 1 : 2
+			}
+
 			rcpCmd = rcpCommands.find((i) => i.Address.replace(/:/g, '_') == actionAddress)
 //console.log('Yamaha-RCP Upgrade: rcpCmd:', rcpCmd)
 
 			if (rcpCmd !== undefined) {
-				let newAction = JSON.parse(JSON.stringify(action))
-				let changed = false
-
-				switch (actionAddress) {
-					case 'MIXER_Lib/Scene': {
-						if (isAction) {
-							newAction.actionId = 'MIXER_Lib/Scene/Recall'
-						} else {
-							newAction.feedbackId = 'MIXER_Lib/Scene/Recall'
-						}
-						newAction.options.Val = action.options.X
-						newAction.options.X = 0
-						changed = true
-					}
-				}
 
 				if (rcpCmd.Type == 'integer' || rcpCmd.Type == 'binary') {
-					newAction.options.Val = action.options.Val == rcpCmd.Min ? '-Inf' : action.options.Val / rcpCmd.Scale
+					newAction.options.Val = newAction.options.Val == rcpCmd.Min ? '-Inf' : newAction.options.Val / rcpCmd.Scale
 					changed = true
 				}
 
 				if (changed) {
-					console.log(`Yamaha-RCP Upgrade: Updating ${isAction ? "Action '" + actionAddress + "' -> '" + newAction.actionId : "Feedback '" + actionAddress + "' -> '" + newAction.feedbackId}' ...`)
+					console.log(`Yamaha-RCP Upgrade: Updating ${isAction ? "Action '" + newAction.actionId + "' -> '" + actionAddress : "Feedback '" + newAction.feedbackId + "' -> '" + actionAddress}' ...`)
 					console.log(`X: ${action.options.X} -> ${newAction.options.X}, Y: ${action.options.Y} -> ${newAction.options.Y}, Val: ${action.options.Val} -> ${newAction.options.Val}\n`)
 
-/* 					if (isAction) {
+					if (isAction) {
+						newAction.actionId = actionAddress
 						updates.updatedActions.push(newAction) 
 					} else {
+						newAction.feedbackId = actionAddress
 						updates.updatedFeedbacks.push(newAction)
 					}
- */				}
+ 				}
 
 				return
 			}

variables.js

@@ -60,15 +60,19 @@ module.exports = {
 			case 'ssrecall_ex':
 				break
 			case 'sscurrent_ex':
-				instance.setVariableValues({ curScene: msg.X })
 				// Request Current Scene Info once we know what scene we have
-				let infoMsg = (instance.config.model == "TF") ? `${msg.X} ${msg.Y}` : msg.X
-				instance.sendCmd(`ssinfo_ex MIXER:Lib/Scene ${infoMsg}`) 
+				if (instance.config.model == 'TF') {
+					instance.setVariableValues({ curScene: `${ msg.Address.toUpperCase().slice(-1) }${ msg.X.toString().padStart(2, "0") }`})
+					instance.sendCmd(`ssinfo_ex ${msg.Address} ${msg.X }`)
+				} else {
+					instance.setVariableValues({ curScene: msg.X })
+					instance.sendCmd(`ssinfo_ex MIXER:Lib/Scene ${msg.X }`)
+				}
 				break
 			case 'sscurrentt_ex':
 				instance.setVariableValues({ curScene: msg.X })
 				// Request Current Scene Info once we know what scene we have
-				instance.sendCmd(`ssinfot_ex MIXER:Lib/Scene "${msg.X}"`)
+				instance.sendCmd(`ssinfot_ex MIXER:Lib/Scene "${ msg.X }"`)
 				break
 			case 'ssinfo_ex':
 			case 'ssinfot_ex':
@@ -128,12 +132,6 @@ module.exports = {
 		let varToAdd = { variableId: varName, name: varName }
 		let varIndex = instance.variables.findIndex((i) => i.variableId === varToAdd.variableId)
 
-/* 		// Remove
-		if (!cmd.options.createVariable && varIndex != -1) {
-			instance.variables.splice(varIndex, 1)
-			instance.setVariableDefinitions(instance.variables)
-		}
- */
 		// Add
 		if (cmd.options.createVariable) {
 			if (varIndex == -1) {