fix: mc2 mixer protocol

olzzon · Nov 17, 2020 · 0602048 · 0602048
1 parent e4e427a
commit 0602048
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/client/assets/css/Channel.css b/client/assets/css/Channel.css
@@ -16,6 +16,10 @@
     flex-direction: column;
     align-items: center;
 }
+.channel-body > .channel-props {
+    display: flex;
+    flex-direction: column;
+}
 .channel-body > .channel-props,
 .channel-body > .out-control,
 .channel-body > .channel-control {

diff --git a/server/constants/mixerProtocols/LawoMC2.ts b/server/constants/mixerProtocols/LawoMC2.ts
@@ -47,6 +47,8 @@ export const LawoMC2: IMixerProtocol = {
                         min: -128,
                         max: 12,
                         zero: 0,
+                        maxLabel: 12,
+                        minLabel: -128,
                     },
                 ],
                 CHANNEL_INPUT_SELECTOR: [
@@ -109,12 +111,14 @@ export const LawoMC2: IMixerProtocol = {
                 CHANNEL_INPUT_GAIN: [
                     {
                         mixerMessage:
-                            'Channels.Inputs.${channel}.Signal Processing.Input Mixer.Input Gain',
+                            'Channels.Inputs.${channel}.Signal Processing.Digital Amplifier.DigiAmp Level',
                         value: 0,
                         type: 'int',
                         min: -128,
                         max: 12,
                         zero: 0,
+                        maxLabel: 12,
+                        minLabel: -128,
                     },
                 ],
                 CHANNEL_INPUT_SELECTOR: [

diff --git a/server/utils/mixerConnections/EmberMixerConnection.ts b/server/utils/mixerConnections/EmberMixerConnection.ts
@@ -364,7 +364,7 @@ export class EmberMixerConnection {
                 store.dispatch(
                     storeSetPfl(
                         channel.assignedFader,
-                        (node.contents as Model.Parameter).value !== 0
+                        (node.contents as Model.Parameter).value as boolean
                     )
                 )
                 global.mainThreadHandler.updatePartialStore(
@@ -481,9 +481,12 @@ export class EmberMixerConnection {
                     storeCapability(
                         channel.assignedFader,
                         'hasInputSelector',
-                        (node.contents as Model.Parameter).value === 1
+                        (node.contents as Model.Parameter).value as boolean
                     )
                 )
+                global.mainThreadHandler.updatePartialStore(
+                    channel.assignedFader
+                )
             }
         )
         // subscribe to input selectors
@@ -561,7 +564,9 @@ export class EmberMixerConnection {
                         storeCapability(
                             channel.assignedFader,
                             'hasAMix',
-                            (node.contents as Model.Parameter).value !== 15 // 15 is no unassigned
+                            (node.contents as Model.Parameter).value !==
+                                ((node.contents as Model.Parameter).maximum ||
+                                    63) // max is unassigned, max = 63 in firmware 6.4
                         )
                     )
                     global.mainThreadHandler.updatePartialStore(
@@ -585,7 +590,7 @@ export class EmberMixerConnection {
                 store.dispatch(
                     storeSetAMix(
                         channel.assignedFader,
-                        (node.contents as Model.Parameter).value === 1
+                        (node.contents as Model.Parameter).value as boolean
                     )
                 )
                 global.mainThreadHandler.updatePartialStore(