diff options
| author | Thomas White <taw@physics.org> | 2022-06-28 08:35:06 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-06-28 08:35:06 +0200 |
| commit | 8f863c9b360f6e3593ff1a52da71cee6bfe20104 (patch) | |
| tree | f6dfe356cba48dbb3bef1c2972fe7bc19205d6c0 | |
| parent | 9f80dbf5c3b8ad17ea2d563e729af1171a3c6d86 (diff) | |
Fixture library: update remaining fixture definitions to new layout
| -rw-r--r-- | guile/starlet/fixture-library/robe/dl7s.scm (renamed from guile/starlet/fixture-library/robe/dl7s/mode1.scm) | 2 | ||||
| -rw-r--r-- | guile/starlet/fixture-library/robe/mmxspot.scm (renamed from guile/starlet/fixture-library/robe/mmxspot/mode1.scm) | 38 |
2 files changed, 19 insertions, 21 deletions
diff --git a/guile/starlet/fixture-library/robe/dl7s/mode1.scm b/guile/starlet/fixture-library/robe/dl7s.scm index 2a5eb46..f64de19 100644 --- a/guile/starlet/fixture-library/robe/dl7s/mode1.scm +++ b/guile/starlet/fixture-library/robe/dl7s.scm @@ -18,7 +18,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; -(define-module (starlet fixture-library robe dl7s mode1) +(define-module (starlet fixture-library robe dl7s) #:use-module (oop goops) #:use-module (starlet fixture) #:use-module (starlet colours) diff --git a/guile/starlet/fixture-library/robe/mmxspot/mode1.scm b/guile/starlet/fixture-library/robe/mmxspot.scm index 9fedde4..bd399be 100644 --- a/guile/starlet/fixture-library/robe/mmxspot/mode1.scm +++ b/guile/starlet/fixture-library/robe/mmxspot.scm @@ -18,34 +18,32 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; -(define-module (starlet fixture-library robe mmxspot mode1) +(define-module (starlet fixture-library robe mmxspot) #:use-module (oop goops) #:use-module (starlet fixture) #:use-module (starlet colours) #:export (<robe-mmxspot-mode1>)) -(define-class <robe-mmxspot-mode1> (<fixture>) - (attributes - #:init-form (list - (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)))) +(define-fixture + <robe-mmxspot-mode1> -(define-method (scanout-fixture (fixture <robe-mmxspot-mode1>) - get-attr set-chan8 set-chan16) + (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)) (set-chan16 37 (percent->dmxval16 (get-attr 'intensity))) |