feat: Vista - 2 way protocol - initial fader level support for mono c…

…hannels
olzzon · May 9, 2020 · d856688 · d856688
1 parent 10513f5
commit d856688
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 106 deletions.
diff --git a/server/constants/mixerProtocols/StuderVistaEmber.ts b/server/constants/mixerProtocols/StuderVistaEmber.ts
@@ -49,8 +49,7 @@ export const StuderVistaMaster: IMixerProtocol = {
                 */
                 CHANNEL_OUT_GAIN: [
                     {
-                        mixerMessage:
-                            'a1 25 31 23 a1 21 31 1f a1 1d 31 1b a1 19 31 17 {channel} 15 31 13 a1 11 31 0f a2 0d 31 0b e1 09 31 07 63 {level}',
+                        mixerMessage: 'a1 a1 a1 {channel} a1 a2',
                         value: 0,
                         type: 'real',
                         min: -90,

diff --git a/server/utils/mixerConnections/StuderVistaMixerConnection.ts b/server/utils/mixerConnections/StuderVistaMixerConnection.ts
@@ -76,29 +76,6 @@ export class StuderVistaMixerConnection {
             logger.verbose('Received Ember message: ' + message, {})
 
             if (
-                this.checkEmberCommand(
-                    message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_VU[0]
-                        .mixerMessage
-                )
-            ) {
-                let { channel, value, argument } = this.convertEmberCommand(
-                    message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_VU[0]
-                        .mixerMessage
-                )
-                store.dispatch({
-                    type: SET_VU_LEVEL,
-                    channel:
-                        state.channels[0].channel[channel - 1].assignedFader,
-                    level: message,
-                })
-                socketServer.emit(SOCKET_SET_VU, {
-                    faderIndex:
-                        state.channels[0].channel[channel - 1].assignedFader,
-                    level: message,
-                })
-            } else if (
                 this.checkEmberCommand(
                     message,
                     this.mixerProtocol.channelTypes[0].fromMixer
@@ -107,8 +84,8 @@ export class StuderVistaMixerConnection {
             ) {
                 let { channel, value, argument } = this.convertEmberCommand(
                     message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_VU[0]
-                        .mixerMessage
+                    this.mixerProtocol.channelTypes[0].fromMixer
+                        .CHANNEL_OUT_GAIN[0].mixerMessage
                 )
                 let assignedFaderIndex =
                     state.channels[0].channel[channel - 1].assignedFader
@@ -174,68 +151,6 @@ export class StuderVistaMixerConnection {
                         )
                     }
                 }
-            } else if (
-                this.checkEmberCommand(
-                    message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.AUX_LEVEL[0]
-                        .mixerMessage
-                )
-            ) {
-                let { channel, value, argument } = this.convertEmberCommand(
-                    message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_VU[0]
-                        .mixerMessage
-                )
-                let commandArray: string[] = this.mixerProtocol.channelTypes[0].fromMixer.AUX_LEVEL[0].mixerMessage.split(
-                    '/'
-                )
-                let messageArray: string[] = [] // message.address.split('/')
-                let auxIndex = 0
-
-                commandArray.forEach((commandPart: string, index: number) => {
-                    if (commandPart === '{channel}') {
-                        channel = parseFloat(messageArray[index])
-                    } else if (commandPart === '{argument}') {
-                        auxIndex = parseFloat(messageArray[index]) - 1
-                    }
-                })
-                if (
-                    state.channels[0].channel[channel - 1].auxLevel[auxIndex] >
-                    -1
-                ) {
-                    logger.verbose(
-                        'Aux Message Channel : ' +
-                            channel +
-                            '  Aux Index :' +
-                            auxIndex +
-                            ' Level : ' +
-                            message
-                    )
-                    store.dispatch({
-                        type: SET_AUX_LEVEL,
-                        channel: channel - 1,
-                        auxIndex: auxIndex,
-                        level: message,
-                    })
-                    global.mainThreadHandler.updateFullClientStore()
-                }
-            } else if (
-                this.checkEmberCommand(
-                    message,
-                    this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_NAME[0]
-                        .mixerMessage
-                )
-            ) {
-                let channel = 0 // message.address.split('/')[this.cmdChannelIndex]
-                store.dispatch({
-                    type: SET_CHANNEL_LABEL,
-                    channel:
-                        state.channels[0].channel[channel - 1].assignedFader,
-                    label: message,
-                })
-                global.mainThreadHandler.updatePartialStore(
-                    state.channels[0].channel[channel - 1].assignedFader
-                )
             } else if (
                 this.checkEmberCommand(
                     message,
@@ -278,33 +193,53 @@ export class StuderVistaMixerConnection {
             return false
         }
 
-        let messageArray = message.split(' ')
-        let protocolArray = protocolMessage.split(' ')
-        let index = 0
-        let test = protocolArray.every((value: string) => {
-            if (value === '{channel}' || value === '{aux}') {
-                index += 1
-            } else if (value === '{level}') {
-                index += 6
-            } else {
-                if (value === messageArray[index]) {
-                    test = true
+        let messageArray = message.split('31 ')
+        if (messageArray.length > 1) {
+            let protocolArray = protocolMessage.split(' ')
+            let index = 0
+            let test = protocolArray.every((value: string) => {
+                if (value === '{channel}' || value === '{aux}') {
                     index += 1
                 } else {
-                    return false
+                    if (value === messageArray[index + 1].split(' ')[1]) {
+                        test = true
+                        index += 1
+                    } else {
+                        return false
+                    }
                 }
-            }
-            return true
-        })
-        return test
+                return true
+            })
+            return test
+        } else {
+            return false
+        }
     }
 
     convertEmberCommand(
         message: string,
         protocolMessage: string
     ): { channel: number; value: number; argument: string } {
+        let messageArray = message.split('31 ')
+        let protocolArray = protocolMessage.split(' ')
+
+        let channel: number = 0
+        let value: number = 0
+        let argument: string = ''
+
+        // Extract Channel type: (mone, st, 5.1)
+
+        // Extract Channel number:
+        protocolArray.forEach((value: string, index: number) => {
+            if (value === '{channel}') {
+                channel =
+                    parseInt(messageArray[index + 1].split(' ')[1], 16) - 160
+            }
+        })
+        // Extract value:
+
         return {
-            channel: 0,
+            channel: channel,
             value: 0,
             argument: '',
         }