Pulling mapping data and channel data to create a dummy universe

Co-authored-by: Julian Waller <[email protected]>

packages/quick-tsr/input/mappings.ts

@@ -12,7 +12,7 @@ export const input: TSRInput = {
 				universe: 0,
 				featureChannels: {
 					// Maps dimmer to channel 1:
-					"dimmer": 1,
+					"dimmer": 1
 				}
 			},
 		}),

packages/quick-tsr/input/timeline.ts

@@ -43,6 +43,21 @@ export const input: TSRInput = {
 				}
 			}
 		}),
+		literal<TSRTimelineObj<TimelineContentArtNetAny>>({
+			id: 'colour',
+			enable: {
+				start: Date.now(),
+				duration: 20 * 1000
+			},
+			layer: 'rgb0',
+			content: {
+				deviceType: DeviceType.ARTNET,
+				type: TimelineContentTypeArtNet.VALUES,
+				values: {
+					dimmer: 127
+				}
+			}
+		}),
 		// literal<TSRTimelineObj<TimelineContentArtNetAny>>({
 		// 	id: 'artnet11',
 		// 	enable: {

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

@@ -17,7 +17,7 @@ export interface ArtNetOptions {
 		 * This interface was referenced by `undefined`'s JSON-Schema definition
 		 * via the `patternProperty` "([a-z]\w*)|(\d+:\d+)".
 		 */
-		[k: string]: 'invert' | 'last' | 'highest' | 'lowest'
+		[k: string]: 'highest' | 'lowest' | 'last' | 'invert'
 	}
 }
 

packages/timeline-state-resolver/src/integrations/artnet/$schemas/options.json

@@ -32,7 +32,7 @@
 			"patternProperties": {
 				"([a-z]\\w*)|(\\d+:\\d+)": {
 					"type": "string",
-					"enum": ["invert", "last", "highest", "lowest"]
+					"enum": ["highest", "lowest", "last", "invert"]
 				}
 			},
 			"additionalProperties": false

packages/timeline-state-resolver/src/integrations/artnet/index.ts

@@ -8,7 +8,10 @@ import {
 	ArtNetOptions,
 	StatusCode,
 	ActionExecutionResult,
-	ArtNetDeviceCommand
+	ArtNetDeviceCommand,
+	Mappings,
+	MappingArtnetChannels,
+	Mapping
 } from 'timeline-state-resolver-types'
 import { CommandWithContext, Device } from '../../service/device'
 // import * as artnet from 'artnet'
@@ -25,19 +28,19 @@ export interface ArtNetDeviceStateNew {
 	data: channelData
 }
 
-interface channelData {
-	channel: number
-	value: number
-	modifier: ChannelModifier
-}
-
-enum ChannelModifier {
+enum channelBehaviour {
 	HIGHEST = 'highest',
 	LOWEST = 'lowest',
 	LAST = 'last',
 	INVERT = 'invert',
 }
 
+interface channelData {
+	channel: number
+	value: number
+	behavious: channelBehaviour
+}
+
 export interface ArtNetDeviceState {
 	[address: string]: ArtNetDeviceStateContent
 }
@@ -122,27 +125,53 @@ export class ArtNetDevice extends Device<ArtNetOptions, ArtNetDeviceState, ArtNe
 	}
 
 	// still under work
-	convertTimelineStateToDeviceState(state: Timeline.TimelineState<TSRTimelineContent>): ArtNetDeviceState {
+	convertTimelineStateToDeviceState(
+			state: Timeline.TimelineState<TSRTimelineContent>,
+			mappings: Mappings
+		): ArtNetDeviceState {
+
+			// hello!
 
 		// TODO: Convert the timeline state into your own (internal) ArtNetState
 		// Tip: This is where you put the logic for "highest takes precedence"
-		const addrToArtNetMessage: ArtNetDeviceState = {
 
+		const addrToArtNetMessage: ArtNetDeviceState = {
+
 		}
+
+		let updateValues: newData[] = []
 
-		this.sendArtNetUniverse("127.0.0.1")
+		Object.values<Timeline.ResolvedTimelineObjectInstance<TSRTimelineContent>>(state.layers).forEach((layer) => {
 
-		// const artNetGroup = state.id
-		// console.log("layer:", artNetGroup)
-		// console.log(addrToArtNetMessage)
 
-		Object.values<Timeline.ResolvedTimelineObjectInstance<TSRTimelineContent>>(state.layers).forEach((layer) => {
-			if (layer.content.deviceType === DeviceType.ARTNET) {
-
-				// console.log(layer)
+			const map = mappings[layer.layer] as Mapping<MappingArtnetChannels> | undefined
+
+			if (layer.content.deviceType === DeviceType.ARTNET && map) {
+
+				let newValues = layer.content.values // { dimmer: 42 }
+				let channelMapping = map.options.featureChannels // { dimmer: [1], RGB: [2,3,4] }
+
+				Object.entries(channelMapping).forEach(([key, artnetChannels]) => {
+					const channelValues = newValues[key] // 42
+					if (channelValues == null) return // Skip if no values
+
+					// TODO: parse channels to create apporpriate data types, of number or array etc.
+					// const channelNumbers :number[]= parseChannels(artnetChannels)
+
+
+
+
+					updateValues.push({channel: artnetChannels as number, value:channelValues as number})
+				})
+
 			}
 		})
+		// const artNetGroup = state.id
+		// console.log("layer:", artNetGroup)
+		// console.log(addrToArtNetMessage)
 
+		// TODO: this should be moved elsewhere
+		this.sendArtNetUniverse(updateValues, this.options.host)
 		return addrToArtNetMessage
 	}
 
@@ -210,7 +239,7 @@ export class ArtNetDevice extends Device<ArtNetOptions, ArtNetDeviceState, ArtNe
 	// 	// updates sendArtnet with new values only
 	// }
 
-	private async sendArtNetUniverse(host: string, fps: number = 44, mode: string = 'full') {
+	private async sendArtNetUniverse(newValues: newData[], host: string, fps: number = 44, mode: string = 'full') {
 
 		let newUniverse:ArtNetUniverse = {
 			host: host,
@@ -226,22 +255,16 @@ export class ArtNetDevice extends Device<ArtNetOptions, ArtNetDeviceState, ArtNe
 			dataChanged: []
 		}
 
-		newUniverse.data[511] = 1
+		// newUniverse.data[511] = 1
 		newUniverse.data.fill(0,0,512)
 
-		let updateValues: newData[] = [
-			{channel: 22, value: 255},
-			{channel: 45, value: 255},
-			{channel: 101, value: 127}
-		]
-
-		updateValues.forEach(element => {
+		newValues.forEach(element => {
 			newUniverse.data[element.channel - 1] = element.value
 		});
 
-		console.log(newUniverse.host)
+		// console.log(newUniverse.host)
 
-		console.log(newUniverse.data.length)
+		// console.log(newUniverse.data.length)
 		console.log(newUniverse.data)
 		// sends entire artnet universe data with appropriate parameters