# HG changeset patch # User drewp@bigasterisk.com # Date 1717028881 25200 # Node ID 26f84fc67ab1e624b9afad68ad75ea87354ad32a # Parent e683b449506bfe857d8e80af43f8fc9eef08ba07 start 2024 show diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/URI --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/URI Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,1 @@ +http://light9.bigasterisk.com/show/dance2024 diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/ascoltami.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/ascoltami.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,6 @@ +@prefix : . +@prefix show: . +@prefix xsd: . + +:ascoltami :duration 167.93; :endOfSong false; :pausedSongTime 3.929535; :playing false; + :song show:song5 . diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/blender.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/blender.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,10 @@ +@prefix : . + + +:blenderControl a :Effect; :effectFunction ; + :publishAttr :strength; :setting . + :effectAttr :deviceSettings; + :value :blenderControlDevSets . + :device ; + :deviceAttr :color; :value "#000000" . +:blenderControlDevSets :setting . diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/deviceClass.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/deviceClass.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,65 @@ +@prefix : . +@prefix rdfs: . + +:color a :DeviceAttr; rdfs:label "color"; :dataType :color . +:brightness a :DeviceAttr; rdfs:label "brightness"; :dataType :scalar . +:white a :DeviceAttr; rdfs:label "white"; :dataType :scalar . +:strobe a :DeviceAttr; rdfs:label "strobe"; :dataType :scalar; + rdfs:comment "0=none, 1=fastest" . +:strobeSpeed a :DeviceAttr; rdfs:label "strobeSpeed"; :dataType :scalar . +:doNotUse a :DeviceAttr; rdfs:label "-"; :dataType :scalar . + + + +:MegaFlash a :DeviceClass; rdfs:label "Mega Flash" ; +:doc ; + :deviceAttr :brightness, :strobeSpeed; + :attr + [ :outputAttr :strobeSpeed; :dmxOffset 0 ], + [ :outputAttr :brightness; :dmxOffset 1 ] . + + +:SimpleDimmer a :DeviceClass; rdfs:label "SimpleDimmer"; + :deviceAttr :brightness; + :attr + [ :outputAttr :level; :dmxOffset 0 ] . + +:ChauvetColorStrip a :DeviceClass; rdfs:label "ChauvetColorStrip"; + :setup "SYS -> SdAd -> "; + :docs ; + :deviceAttr :color; + :attr + [ :outputAttr :mode; :dmxOffset 0 ], + [ :outputAttr :red; :dmxOffset 1 ], + [ :outputAttr :green; :dmxOffset 2 ], + [ :outputAttr :blue; :dmxOffset 3 ] . + +:Bar612601d a :DeviceClass; rdfs:label "LED Bar (mode d)"; + :deviceAttr :color; + :attr + [ :outputAttr :red; :dmxOffset 0 ], + [ :outputAttr :green; :dmxOffset 1 ], + [ :outputAttr :blue; :dmxOffset 2 ] . + +:LedPar90 a :DeviceClass; rdfs:label "LED Par 9x10W RGBW"; + :deviceAttr :color; + :attr + [ :outputAttr :master; :dmxOffset 0 ], + [ :outputAttr :red; :dmxOffset 1 ], + [ :outputAttr :green; :dmxOffset 2 ], + [ :outputAttr :blue; :dmxOffset 3 ], + [ :outputAttr :white; :dmxOffset 4 ], + [ :outputAttr :strobe; :dmxOffset 5 ], + [ :outputAttr :doNotUse; :dmxOffset 6 ], + [ :outputAttr :doNotUse; :dmxOffset 7 ] . + +:LedPar54 a :DeviceClass; rdfs:label "LED Par 54 RGBW"; + :deviceAttr :color, :white; + :attr + [ :outputAttr :master; :dmxOffset 0 ], + [ :outputAttr :red; :dmxOffset 1 ], + [ :outputAttr :green; :dmxOffset 2 ], + [ :outputAttr :blue; :dmxOffset 3 ], + [ :outputAttr :white; :dmxOffset 4 ], + [ :outputAttr :strobe; :dmxOffset 5 ], + [ :outputAttr :doNotUse; :dmxOffset 6 ] . diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/fade.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/fade.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,44 @@ +@prefix : . +@prefix effect: . +@prefix rdfs: . +@prefix show: . +@prefix xsd: . + +:grandMaster :value 1.00 . +:midiControl :map :midiControl0 . +:midiControl0 :inputs "mainSliders"; :midiDev "bcf2000"; :outputs show:fadePage1 . + +show:fadePage0 a :FadePage; rdfs:label "unnamed"; :fader show:fader0, show:fader1, show:fader2, show:fader3, show:fader4, show:fader5, show:fader6, show:fader7 . +show:fadePage1 a :FadePage; rdfs:label "unnamed"; :fader show:fader10, show:fader11, show:fader12, show:fader13, show:fader14, show:fader15, show:fader8, show:fader9 . +show:fader0 a :Fader; :column "1"; :setting show:faderset0 . +show:fader1 a :Fader; :column "2"; :setting show:faderset1 . +show:fader2 a :Fader; :column "3"; :setting show:faderset2 . +show:fader3 a :Fader; :column "4"; :setting show:faderset3 . +show:fader4 a :Fader; :column "5"; :setting show:faderset4 . +show:fader5 a :Fader; :column "6"; :setting show:faderset5 . +show:fader6 a :Fader; :column "7"; :setting show:faderset6 . +show:fader7 a :Fader; :column "8"; :setting show:faderset7 . +show:fader8 a :Fader; :column "1"; :setting show:faderset8 . +show:fader9 a :Fader; :column "2"; :setting show:faderset9 . +show:fader10 a :Fader; :column "3"; :setting show:faderset10 . +show:fader11 a :Fader; :column "4"; :setting show:faderset11 . +show:fader12 a :Fader; :column "5"; :setting show:faderset12 . +show:fader13 a :Fader; :column "6"; :setting show:faderset13 . +show:fader14 a :Fader; :column "7"; :setting show:faderset14 . +show:fader15 a :Fader; :column "8"; :setting show:faderset15 . +show:faderset0 :effectAttr :strength; :value 0.0 . +show:faderset1 :effectAttr :strength; :value 0.0 . +show:faderset2 :effectAttr :strength; :value 0.0 . +show:faderset3 :effectAttr :strength; :value 0.0 . +show:faderset4 :effectAttr :strength; :value 0.0 . +show:faderset5 :effectAttr :strength; :value 0.0 . +show:faderset6 :effectAttr :strength; :value 0.0 . +show:faderset7 :effectAttr :strength; :value 0.0 . +show:faderset8 :effectAttr :strength; :value 0.0 . +show:faderset9 :effectAttr :strength; :value 0.0 . +show:faderset10 :effectAttr :strength; :value 0.0 . +show:faderset11 :effectAttr :strength; :value 0.0 . +show:faderset12 :effectAttr :strength; :value 0.0 . +show:faderset13 :effectAttr :strength; :value 0.0 . +show:faderset14 :effectAttr :strength; :value 0.0 . +show:faderset15 :effectAttr :strength; :value 0.0 . diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/playlist.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/playlist.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,33 @@ +@prefix : . +@prefix show: . +@prefix sh: . +@prefix rdf: . +@prefix rdfs: . + +show:dance2024 :musicRoot "show/dance2024/music"; +:spectrogramUrlRoot "/show/dance2024/spectrogram" . + +show:dance2024 :playList ( + sh:song1 sh:song2 sh:song3 sh:song4 sh:song5 + sh:song6 sh:song7 sh:song8 sh:song9 sh:song10 + sh:song11 sh:song12 sh:song13 sh:song14 sh:song15 + sh:song16 sh:song17 +) . + +sh:song1 a :Song; rdfs:label "1 be our guest"; :songFilename "01-guest.wav" . +sh:song2 a :Song; rdfs:label "2 dancing happy"; :songFilename "02_dancing_happy.wav" . +sh:song3 a :Song; rdfs:label "3 bear"; :songFilename "03-bear.wav" . +sh:song4 a :Song; rdfs:label "4 disney swing"; :songFilename "04-disneyswing.wav" . +sh:song5 a :Song; rdfs:label "5 encanto"; :songFilename "05-encanto.wav" . +sh:song6 a :Song; rdfs:label "6 frozen"; :songFilename "06-frozen.wav" . +sh:song7 a :Song; rdfs:label "7 one jump"; :songFilename "07-onejump.wav" . +sh:song8 a :Song; rdfs:label "8 lion king"; :songFilename "08-lionking.wav" . +sh:song9 a :Song; rdfs:label "9 pianoman"; :songFilename "09-pianoman-mix.wav" . +sh:song10 a :Song; rdfs:label "10 tap"; :songFilename "10-disneytap.wav" . +sh:song11 a :Song; rdfs:label "11 club"; :songFilename "11-club.wav" . +sh:song12 a :Song; rdfs:label "12 sunny side"; :songFilename "12-sunnyside2.ogg" . +sh:song13 a :Song; rdfs:label "13 supercali"; :songFilename "13-supercali.wav" . +sh:song14 a :Song; rdfs:label "14 groove"; :songFilename "14-groove.wav" . +sh:song15 a :Song; rdfs:label "15 mermaid"; :songFilename "15-mermaid.wav" . +sh:song16 a :Song; rdfs:label "16 pop"; :songFilename "16-all.wav" . +sh:song17 a :Song; rdfs:label "17 parade"; :songFilename "17-parade-mix.wav" . diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/song1.blend Binary file show/dance2024/song1.blend has changed diff -r e683b449506b -r 26f84fc67ab1 show/dance2024/theaterLightConfig.n3 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/show/dance2024/theaterLightConfig.n3 Wed May 29 17:28:01 2024 -0700 @@ -0,0 +1,61 @@ +@prefix : . +@prefix dev: . +@prefix dmxA: . +@prefix effect: . +@prefix func: . +@prefix rdfs: . +@prefix show: . +@prefix xsd: . + +:EffectFunction rdfs:comment """ +Linked to a code function. That func's Inputs are +1) magic stuff like time, +2) the effectAttrs listed under (?effect :input ?) + +Outputs are always a DeviceSettings list which can affect arbitrary devices. +""" . + +######## effectFunction + +func:scale + a :EffectFunction; + rdfs:label "a submaster- scales :deviceSettings"; + :input + [ :effectAttr :strength; :defaultValue 0.0 ], + [ :effectAttr :deviceSettings; ] . # e.g. "parR2 at color=red; parR3 at color=white" + +func:strobe + a :EffectFunction; + rdfs:label "blink specified devices"; + :input + [ :effectAttr :strength; :defaultValue 0.0 ], + [ :effectAttr :period; :defaultValue 0.5 ], + [ :effectAttr :onTime; :defaultValue 0.1 ], + [ :effectAttr :deviceSettings ] . + +func:image + a :EffectFunction; + rdfs:label "sample image at x=time"; + :input + [ :effectAttr :strength; :defaultValue 0.0 ], + [ :effectAttr :period; :defaultValue 2.0 ], + [ :effectAttr :image; :defaultValue "specks.png" ], + [ :effectAttr :deviceSettings; rdfs:comment "these might have a :sort key or a :y value" ] . + + +dev:strip1 a :Bar612601d; rdfs:label "strip-r"; :dmxUniverse dmxA:; :dmxBase 175 . +dev:strip2 a :ChauvetColorStrip; rdfs:label "strip-c"; :dmxUniverse dmxA:; :dmxBase 12 . +dev:strip3 a :Bar612601d; rdfs:label "strip-l"; :dmxUniverse dmxA:; :dmxBase 178 . + +# dev:par90 a :LedPar90; :dmxUniverse dmxA:; :dmxBase 16 . + +dev:parFloorL a :LedPar54; rdfs:label "floor-l"; :dmxUniverse dmxA:; :dmxBase 84 . +dev:parFloorR a :LedPar54; rdfs:label "floor-r"; :dmxUniverse dmxA:; :dmxBase 168 . +dev:parL1 a :LedPar54;rdfs:label "l-1"; :dmxUniverse dmxA:; :dmxBase 105 . +dev:parL2 a :LedPar54;rdfs:label "l-2"; :dmxUniverse dmxA:; :dmxBase 161 . +dev:parL3 a :LedPar54;rdfs:label "l-3"; :dmxUniverse dmxA:; :dmxBase 147 . +dev:parR2 a :LedPar54;rdfs:label "r-2"; :dmxUniverse dmxA:; :dmxBase 1 . +dev:parR3 a :LedPar54;rdfs:label "r-3"; :dmxUniverse dmxA:; :dmxBase 21 . +dev:parR1 a :LedPar54;rdfs:label "r-1"; :dmxUniverse dmxA:; :dmxBase 154 . + +# dev:plain1 a :SimpleDimmer; :dmxUniverse dmxA:; :dmxBase 10 . diff -r e683b449506b -r 26f84fc67ab1 src/light9/midifade/pages.py --- a/src/light9/midifade/pages.py Wed May 29 15:06:51 2024 -0700 +++ b/src/light9/midifade/pages.py Wed May 29 17:28:01 2024 -0700 @@ -83,9 +83,9 @@ log.warn("lookupFader called when we had no current control->fader mapping") return { 'quneo': { - 44: L9['show/dance2023/fadePage1f0'], - 45: L9['show/dance2023/fadePage1f0'], - 46: L9['show/dance2023/fadePage1f0'], + 44: L9['show/dance2024/fadePage1f0'], + 45: L9['show/dance2024/fadePage1f0'], + 46: L9['show/dance2024/fadePage1f0'], }, 'bcf2000': self.currentFaders, }[dev][control] diff -r e683b449506b -r 26f84fc67ab1 web/show_specific.ts --- a/web/show_specific.ts Wed May 29 15:06:51 2024 -0700 +++ b/web/show_specific.ts Wed May 29 17:28:01 2024 -0700 @@ -1,2 +1,2 @@ -export const shortShow = "dance2023"; +export const shortShow = "dance2024"; export const showRoot = `http://light9.bigasterisk.com/show/${shortShow}`; \ No newline at end of file