diff options
Diffstat (limited to 'guile/starlet/fixture-library/robe/mmxspot.scm')
| -rw-r--r-- | guile/starlet/fixture-library/robe/mmxspot.scm | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/guile/starlet/fixture-library/robe/mmxspot.scm b/guile/starlet/fixture-library/robe/mmxspot.scm index bd399be..1f37299 100644 --- a/guile/starlet/fixture-library/robe/mmxspot.scm +++ b/guile/starlet/fixture-library/robe/mmxspot.scm @@ -21,6 +21,7 @@ (define-module (starlet fixture-library robe mmxspot) #:use-module (oop goops) #:use-module (starlet fixture) + #:use-module (starlet attributes) #:use-module (starlet colours) #:export (<robe-mmxspot-mode1>)) @@ -30,41 +31,42 @@ <robe-mmxspot-mode1> (fixture-attributes - (attr-continuous 'intensity '(0 100) 0) - (attr-continuous 'pan '(0 540) 270) - (attr-continuous 'tilt '(0 270) 135) - (attr-list 'colwheel '(#f red blue orange green amber uv) #f) - (attr-list 'prism '(#t #f) #f) - (attr-list 'strobe '(#f #t random zap) #f) - (attr-continuous 'strobe-speed '(0 100) 50) - (attr-colour 'colour white) - (attr-continuous 'iris '(0 100) 0) - (attr-continuous 'zoom '(0 100) 0) - (attr-continuous 'focus '(0 100) 0) - (attr-continuous 'hotspot '(0 100) 0) - (attr-continuous 'frost '(0 100) 0) - (attr-continuous 'cto '(3200 6900) 6900)) + (attr-continuous intensity '(0 100) 0) + (attr-continuous pan '(0 540) 270) + (attr-continuous tilt '(0 270) 135) + (attr-list colwheel '(#f red blue orange green amber uv) #f) + (attr-list prism '(#t #f) #f) + (attr-list strobe '(off on random zap) off) + (attr-continuous strobe-frequency '(0 100) 50) + (attr-colour colour white) + (attr-continuous iris '(0 100) 0) + (attr-continuous zoom '(0 100) 0) + (attr-continuous focus '(0 100) 0) + (attr-continuous hotspot '(0 100) 0) + (attr-continuous frost '(0 100) 0) + (attr-continuous cto '(3200 6900) 6900)) - (set-chan16 37 (percent->dmxval16 (get-attr 'intensity))) + (set-chan16 37 (percent->dmxval16 (get-attr intensity))) - (set-chan16 1 (scale-to-range (get-attr 'pan) '(0 540) '(0 65535))) + (set-chan16 1 (scale-to-range (get-attr pan) '(0 540) '(0 65535))) - (set-chan16 3 (scale-to-range (get-attr 'tilt) '(0 270) '(0 65535))) + (set-chan16 3 (scale-to-range (get-attr tilt) '(0 270) '(0 65535))) - (set-chan16 28 (scale-to-range (get-attr 'iris) '(0 100) '(0 45567))) - (set-chan16 30 (percent->dmxval16 (get-attr 'zoom))) - (set-chan16 32 (percent->dmxval16 (get-attr 'focus))) + (set-chan16 28 (scale-to-range (get-attr iris) '(0 100) '(0 45567))) + (set-chan16 30 (percent->dmxval16 (get-attr zoom))) + (set-chan16 32 (percent->dmxval16 (get-attr focus))) (set-chan8 36 - (let ((strb (get-attr 'strobe)) - (spd (get-attr 'strobe-speed))) + (let ((strb (get-attr strobe)) + (spd (get-attr strobe-speed))) (cond - ((eq? strb #t) (scale-to-range spd '(0 100) '(64 95))) + ;; FIXME: Check the frequencies + ((eq? strb 'on) (scale-to-range spd '(0 100) '(64 95))) ((eq? strb 'random) (scale-to-range spd '(0 100) '(192 223))) ((eq? strb 'zap) (scale-to-range spd '(0 100) '(160 191))) (else 255)))) - (set-chan8 25 (if (get-attr 'prism) 20 0)) + (set-chan8 25 (if (get-attr prism) 20 0)) (set-chan8 7 (assv-ref '((#f . 0) (red . 18) @@ -73,13 +75,13 @@ (green . 73) (amber . 91) (uv . 110)) - (get-attr 'colwheel))) + (get-attr colwheel))) - (let ((cmy (colour-as-cmy (get-attr 'colour)))) + (let ((cmy (colour-as-cmy (get-attr colour)))) (set-chan8 9 (percent->dmxval8 (car cmy))) (set-chan8 10 (percent->dmxval8 (cadr cmy))) (set-chan8 11 (percent->dmxval8 (caddr cmy)))) - (set-chan8 35 (percent->dmxval8 (get-attr 'hotspot))) - (set-chan8 12 (scale-to-range (get-attr 'cto) '(3200 6900) '(0 255))) - (set-chan8 27 (scale-to-range (get-attr 'frost) '(0 100) '(0 179)))) + (set-chan8 35 (percent->dmxval8 (get-attr hotspot))) + (set-chan8 12 (scale-to-range (get-attr cto) '(3200 6900) '(0 255))) + (set-chan8 27 (scale-to-range (get-attr frost) '(0 100) '(0 179)))) |