diff options
author | Thomas White <taw@bitwiz.me.uk> | 2021-01-11 17:49:52 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.me.uk> | 2021-01-11 17:49:52 +0100 |
commit | 27e29284b86f69a1eeb23138b29b0079972e41d2 (patch) | |
tree | 1d4aac73d68a8834cb073cf1161ffefe3eef19d5 /guile/starlet/fixture-library/robe.scm | |
parent | 7200a3802e06e9a3dadd6cad0d209387a0149f86 (diff) |
More consistent behaviour between 8-bit and 16-bit setters
Diffstat (limited to 'guile/starlet/fixture-library/robe.scm')
-rw-r--r-- | guile/starlet/fixture-library/robe.scm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/guile/starlet/fixture-library/robe.scm b/guile/starlet/fixture-library/robe.scm index 7ad12a6..5a19286 100644 --- a/guile/starlet/fixture-library/robe.scm +++ b/guile/starlet/fixture-library/robe.scm @@ -21,25 +21,25 @@ (define-method (scanout-fixture (fixture <robe-dl7s-mode1>) - get-attr set-chan set-chan-16bit) + get-attr set-chan8 set-chan16) - (set-chan-16bit 50 (get-attr 'intensity) 100) + (set-chan16 50 (percent->dmxval16 (get-attr 'intensity))) - (set-chan-16bit 1 (get-attr 'pan) 540) - (set-chan-16bit 3 (get-attr 'tilt) 270) + (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-chan 49 (if (get-attr 'strobe) 95 32)) + (set-chan8 49 (if (get-attr 'strobe) 95 32)) - (set-chan 28 (if (get-attr 'prism) 50 0)) + (set-chan8 28 (if (get-attr 'prism) 50 0)) - (set-chan 7 (assv-ref '((750 . 82) - (1000 . 88) - (1200 . 92) - (2000 . 97) - (2500 . 102) - (#f . 107)) - (get-attr 'tungsten-watts-emulation))) + (set-chan8 7 (assv-ref '((750 . 82) + (1000 . 88) + (1200 . 92) + (2000 . 97) + (2500 . 102) + (#f . 107)) + (get-attr 'tungsten-watts-emulation))) - (set-chan-16bit 9 (get-attr 'cyan) 100) - (set-chan-16bit 11 (get-attr 'magenta) 100) - (set-chan-16bit 13 (get-attr 'yellow) 100)) + (set-chan16 9 (percent->dmxval16 (get-attr 'cyan))) + (set-chan16 11 (percent->dmxval16 (get-attr 'magenta))) + (set-chan16 13 (percent->dmxval16 (get-attr 'yellow)))) |