Skip to content

Commit

Permalink
feature: preparing EmberPlus support. Learning the protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
olzzon committed Jun 25, 2019
1 parent 9213f50 commit 5b5f203
Show file tree
Hide file tree
Showing 6 changed files with 407 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"contributors": [
{
"name": "Jan Starzak",
"email": "[email protected]",
"url": "https://superfly.tv"
"name": "Jan Starzak",
"email": "[email protected]",
"url": "https://superfly.tv"
}
],
"keywords": [
Expand All @@ -36,14 +36,14 @@
"package-linux": "electron-packager . sisyfos-audio-controller --overwrite --asar=true --platform=linux --arch=x64 --prune=true --out=builds",
"package-win": "electron-packager . sisyfos-audio-controller --overwrite --asar=true --platform=win32 --arch=x64 --prune=true --out=builds",
"package-release": "yarn package && yarn package-win && yarn package-linux"

},
"dependencies": {
"@types/hoist-non-react-statics": "^3.3.1",
"@types/react-redux": "^7.0.9",
"@types/react-select": "^2.0.19",
"casparcg-connection": "^4.7.0",
"classnames": "^2.2.6",
"emberplus": "https://github.com/nrkno/tv-automation-emberplus-connection.git",
"osc": "https://github.com/PieceMeta/osc.js/tarball/master",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
1 change: 1 addition & 0 deletions src/@types/emberplus/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module 'emberplus';
4 changes: 3 additions & 1 deletion src/constants/MixerProtocolPresets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ReaperMaster } from './mixerProtocols/reaperMaster';
import { BehringerXrMaster } from './mixerProtocols/behringerXrMaster';
import { MidasMaster } from './mixerProtocols/midasMaster';
import { GenericMidi } from './mixerProtocols/genericMidi';
import { LawoMaster } from './mixerProtocols/EmberLawo';
import { CasparCGMaster } from './mixerProtocols/casparCGMaster';

export interface IMixerProtocolGeneric {
Expand Down Expand Up @@ -116,7 +117,8 @@ export const MixerProtocolPresets: { [key: string]: IMixerProtocolGeneric } = Ob
reaperMaster: ReaperMaster,
behringerxrmaster: BehringerXrMaster,
midasMaster: MidasMaster,
genericMidi: GenericMidi
genericMidi: GenericMidi,
lawoMaster: LawoMaster,
}, CasparCGMaster !== undefined ? {
casparCGMaster: CasparCGMaster
} : {});
Expand Down
62 changes: 62 additions & 0 deletions src/constants/mixerProtocols/EmberLawo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { IMixerProtocol } from '../MixerProtocolPresets';

export const LawoMaster: IMixerProtocol = {
protocol: 'EMBER',
label: 'Ember+ Lawo',
mode: "master", //master (ignores mixers faderlevel, and use faderlevel as gain preset),
//client (use feedback from mixers fader level)
leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
pingCommand: [
{
oscMessage: "/note_in_use",
value: 0,
type: "f"
}
],
pingTime: 0, //Bypass ping when pingTime is zero
initializeCommands: [
{
oscMessage: "/note_in_use",
value: 0,
type: "f"
}
],
fromMixer: {
CHANNEL_FADER_LEVEL: 'none',
CHANNEL_OUT_GAIN: '0, {channel}, 0',
CHANNEL_VU: '/track/{channel}/vu',
CHANNEL_NAME: '/track/{channel}/name',
GRP_OUT_GAIN: '/dca/{channel}/fader',
GRP_VU: 'none',
GRP_NAME: '/dca/{channel}/config/name',
PFL: 'todo'
},
toMixer: {
CHANNEL_FADER_LEVEL: 'none',
CHANNEL_OUT_GAIN: '/track/{channel}/volume',
GRP_OUT_GAIN: '/dca/{channel}/fader',
PFL_ON: {
oscMessage: "/track/{channel}/solo",
value: 1,
type: "i"
},
PFL_OFF: {
oscMessage: "/track/{channel}/solo",
value: 0,
type: "i"
}
},
fader: {
min: 0,
max: 1,
zero: 0.75,
step: 0.01,
fadeTime: 40, //Total time for a fade in ms.
},
meter: {
min: 0,
max: 1,
zero: 0.75,
test: 0.6,
},
}
Loading

0 comments on commit 5b5f203

Please sign in to comment.