Merge pull request #85 from istnv/bug/vx600

Typo in config for VX Pro

Author: istnv

actions.js

@@ -132,6 +132,7 @@ export const getActions = function (instance) {
 			instance.sendMessage(element.cmd)
 		},
 	}
+
 	actions['set_brightness'] = {
 		name: 'Set Brightness',
 		options: [

choices.js

@@ -436,7 +436,7 @@ export const CONFIG_MODEL = {
 	j6: { id: 'j6', label: 'J6', displayModes: CHOICES_DISPLAYMODE_VX1000, presets: CHOICES_PRESETS_J6, workingModes: CHOICES_WORKINGMODE_J6 },
 
 	vxPro: {
-		id: 'vxpro', label: 'VX Pro', brightness: CHOICES_BRIGHTNESS_VX1000, displayModes: CHOICES_DISPLAYMODE_VX1000, inputs: CHOICES_INPUTS_VX1000, presets: CHOICES_PRESETS_VX1000,
+		id: 'vxPro', label: 'VX Pro', brightness: CHOICES_BRIGHTNESS_VX1000, displayModes: CHOICES_DISPLAYMODE_VX1000, inputs: CHOICES_INPUTS_VX1000, presets: CHOICES_PRESETS_VX1000,
 		pipOnOffs: CHOICES_PIP_ONOFF, layers: CHOICES_LAYERS_VX1000, cardNo: CHOICES_CARDNO_VX1000, layerPriority: CHOICES_LAYERPRIORITY_VX1000, connectorCode: CHOICES_CONNECTORCODE_VX1000
   },
 	// vxPro: {

index.js

@@ -128,18 +128,21 @@ class NovaStarInstance extends InstanceBase {
 	}
 
 	async init(config) {
+		if (config.modelID && nova_config.CONFIG_MODEL[config.modelID] == undefined) {
+			config.modelID = undefined
+		}
 		this.config = config
 
-		if (this.config.modelID !== undefined) {
+		if (this.config.modelID) {
 			this.model = nova_config.CONFIG_MODEL[this.config.modelID]
-		}
 
-		// this is not called by Companion directly, so we need to call this to load the actions into Companion
-		this.init_variables()
-		this.updateActions()
+			// this is not called by Companion directly, so we need to call this to load the actions into Companion
+			this.init_variables()
+			this.updateActions()
 
-		// start up the TCP socket and attmept to get connected to the NovaStar device
-		this.initTCP()
+			// start up the TCP socket and attmept to get connected to the NovaStar device
+			this.initTCP()
+		}
 	}
 
 	// calculates the checksum for dynamic commands
@@ -174,12 +177,10 @@ class NovaStarInstance extends InstanceBase {
 			this.updateStatus(InstanceStatus.Disconnected, 'disconnected')
 		}
 
-		if (this.config.port === undefined) {
-			// use TCP port 5200 by default
-			this.config.port = 5200
-		}
+		// use TCP port 5200 by default
+		this.config.port = 5200
 
-		if (this.config.modelID == 'vxpro') {
+		if (this.config.modelID == 'vxPro') {
 			this.config.port = 15200
 		}
 
@@ -369,7 +370,7 @@ class NovaStarInstance extends InstanceBase {
 		// and we need to re-connect the socket to the new address)
 		let resetConnection = false
 
-		if (this.config.host != config.host) {
+		if (this.config.host != config.host || this.config.modelID != config.modelID) {
 			resetConnection = true
 		}
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "novastar-controller",
-	"version": "2.6.1",
+	"version": "2.6.2",
 	"main": "index.js",
 	"type": "module",
 	"scripts": {