diff options
author | Thomas White <taw@physics.org> | 2022-06-09 21:25:53 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2022-06-09 21:25:53 +0200 |
commit | 35062371f735d4ca157b87e1509695be0d1e2e22 (patch) | |
tree | 424da4717969cc4b394978319879817b017f88f6 | |
parent | 035d637d3720d2529f125cf99b24d0b51efe2372 (diff) |
Fixture library: update TadM LED definitions to new define-fixture syntax
-rw-r--r-- | guile/starlet/fixture-library/tadm/led-bar.scm | 18 | ||||
-rw-r--r-- | guile/starlet/fixture-library/tadm/led-foh.scm | 32 |
2 files changed, 23 insertions, 27 deletions
diff --git a/guile/starlet/fixture-library/tadm/led-bar.scm b/guile/starlet/fixture-library/tadm/led-bar.scm index a04ed5e..07ccff1 100644 --- a/guile/starlet/fixture-library/tadm/led-bar.scm +++ b/guile/starlet/fixture-library/tadm/led-bar.scm @@ -1,7 +1,7 @@ ;; ;; starlet/fixture-library/tadm/led-bar.scm ;; -;; Copyright © 2020-2021 Thomas White <taw@bitwiz.org.uk> +;; Copyright © 2020-2022 Thomas White <taw@bitwiz.org.uk> ;; ;; This file is part of Starlet. ;; @@ -19,21 +19,19 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; (define-module (starlet fixture-library tadm led-bar) - #:use-module (oop goops) + #:use-module (starlet scanout) #:use-module (starlet fixture) #:use-module (starlet colours) + #:use-module (starlet utils) #:export (<tadm-led-bar>)) +(define-fixture -(define-class <tadm-led-bar> (<fixture>) - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)))) + <tadm-led-bar> - -(define-method (scanout-fixture (fixture <tadm-led-bar>) - get-attr set-chan8 set-chan16) + (fixture-attributes + (attr-continuous 'intensity '(0 100) 0) + (attr-colour 'colour white)) (let ((intensity (get-attr 'intensity)) (rgb (colour-as-rgb (get-attr 'colour)))) diff --git a/guile/starlet/fixture-library/tadm/led-foh.scm b/guile/starlet/fixture-library/tadm/led-foh.scm index f947370..3e9a685 100644 --- a/guile/starlet/fixture-library/tadm/led-foh.scm +++ b/guile/starlet/fixture-library/tadm/led-foh.scm @@ -1,7 +1,7 @@ ;; ;; starlet/fixture-library/tadm/led-foh.scm ;; -;; Copyright © 2020-2021 Thomas White <taw@bitwiz.org.uk> +;; Copyright © 2020-2022 Thomas White <taw@bitwiz.org.uk> ;; ;; This file is part of Starlet. ;; @@ -19,28 +19,26 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; (define-module (starlet fixture-library tadm led-foh) - #:use-module (oop goops) + #:use-module (starlet scanout) #:use-module (starlet fixture) + #:use-module (starlet utils) #:use-module (starlet colours) #:export (<tadm-led-foh>)) +(define-fixture -(define-class <tadm-led-foh> (<fixture>) - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)))) + <tadm-led-foh> - -(define-method (scanout-fixture (fixture <tadm-led-foh>) - get-attr set-chan8 set-chan16) + (fixture-attributes + (attr-continuous 'intensity '(0 100) 0) + (attr-colour 'colour white)) (let ((intensity (get-attr 'intensity)) - (rgbw (colour-as-rgbw (get-attr 'colour)))) - (set-chan8 1 (percent->dmxval8 intensity)) - (set-chan8 2 255) - (set-chan8 3 (percent->dmxval8 (car rgbw))) - (set-chan8 4 (percent->dmxval8 (cadr rgbw))) - (set-chan8 5 (percent->dmxval8 (caddr rgbw))) - (set-chan8 6 (percent->dmxval8 (cadddr rgbw))))) + (rgbw (colour-as-rgbw (get-attr 'colour)))) + (set-chan8 1 (percent->dmxval8 intensity)) + (set-chan8 2 255) + (set-chan8 3 (percent->dmxval8 (car rgbw))) + (set-chan8 4 (percent->dmxval8 (cadr rgbw))) + (set-chan8 5 (percent->dmxval8 (caddr rgbw))) + (set-chan8 6 (percent->dmxval8 (cadddr rgbw))))) |