Merge branch 'feat/sisyfos-bbc-enhancements' into release52

package.json

@@ -16,6 +16,7 @@
     "build:main": "cd packages/timeline-state-resolver && yarn build",
     "lint": "lerna exec yarn lint -- --",
     "test": "lerna exec yarn test",
+    "test:changed": "lerna run --since origin/master --include-dependents test",
     "unit": "lerna exec yarn unit",
     "unitci": "lerna exec yarn unitci",
     "watch": "lerna run --parallel build:main -- --watch --preserveWatchOutput",

packages/quick-tsr/src/index.ts

@@ -144,6 +144,12 @@ function reloadInput(changed?: { path: string; stats: fs.Stats }) {
 				currentInput.mappings = clone(newInput.mappings)
 				currentInput.timeline = clone(newInput.timeline)
 
+				// Check that layers are correct.
+				newInput.timeline.forEach((obj) => {
+					if (!newInput.mappings[obj.layer])
+						console.error(`Object ${obj.id} refers to a layer/mapping that does not exist: "${obj.layer}"`)
+				})
+
 				tsr.setTimelineAndMappings(newInput.timeline, newInput.mappings)
 			}
 			if (!_.isEqual(newInput.datastore, currentInput.datastore)) {

packages/timeline-state-resolver-types/src/generated/sisyfos.ts

@@ -34,11 +34,17 @@ export enum MappingSisyfosType {
 
 export type SomeMappingSisyfos = MappingSisyfosChannel | MappingSisyfosChannelByLabel | MappingSisyfosChannels
 
+export interface SetSisyfosChannelStatePayload {
+	channel: number
+}
+
 export enum SisyfosActions {
-	Reinit = 'reinit'
+	Reinit = 'reinit',
+	SetSisyfosChannelState = 'setSisyfosChannelState'
 }
 export interface SisyfosActionExecutionResults {
-	reinit: () => void
+	reinit: () => void,
+	setSisyfosChannelState: (payload: SetSisyfosChannelStatePayload) => void
 }
 export type SisyfosActionExecutionPayload<A extends keyof SisyfosActionExecutionResults> = Parameters<
 	SisyfosActionExecutionResults[A]

packages/timeline-state-resolver-types/src/integrations/sisyfos.ts

@@ -1,5 +1,10 @@
 import { DeviceType } from '..'
 
+/*
+ * TRIGGERVALUE is used to SET_CHANNEL in Sisyfos
+ * When value is changed to a new value (e.g. Date.now()) Sisyfos will set the channel to
+ * the Current TSR State using setSisyfosChannel()
+ */
 export enum TimelineContentTypeSisyfos {
 	CHANNEL = 'channel',
 	CHANNELS = 'channels',
@@ -22,6 +27,9 @@ export interface SisyfosChannelOptions {
 	label?: string
 	visible?: boolean
 	fadeTime?: number
+	muteOn?: boolean
+	inputGain?: number
+	inputSelector?: number
 }
 
 export interface TimelineContentSisyfosTriggerValue extends TimelineContentSisyfos {
@@ -33,6 +41,7 @@ export interface TimelineContentSisyfosChannel extends TimelineContentSisyfos, S
 	type: TimelineContentTypeSisyfos.CHANNEL
 	resync?: boolean
 	overridePriority?: number // defaults to 0
+	triggerValue?: string
 }
 export interface TimelineContentSisyfosChannels extends TimelineContentSisyfos {
 	type: TimelineContentTypeSisyfos.CHANNELS

packages/timeline-state-resolver/src/integrations/sisyfos/$schemas/actions.json

@@ -6,6 +6,22 @@
 			"name": "Reinitialize",
 			"destructive": false,
 			"timeout": 5000
+		},
+		{
+			"id": "setSisyfosChannelState",
+			"name": "SetSisyfosChannelState",
+			"payload": {
+				"type": "object",
+				"properties": {
+					"channel": {
+						"type": "number"
+					}
+				},
+				"additionalProperties": false,
+				"required": ["channel"]
+			},
+			"destructive": false,
+			"timeout": 5000
 		}
 	]
-}
+}