summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-06-16 23:19:37 +0200
committerThomas White <taw@physics.org>2020-06-16 23:19:37 +0200
commit8806c67018cc7190887845f2a4456f5220d4647d (patch)
treef69349ddfe5a0648f06815016194e822e374f07b
parentdfcf44a02eb1a9759e1d29cd2a33a1f58d122de4 (diff)
Formatting
-rw-r--r--guile/nanolight/fixture.scm3
-rw-r--r--guile/nanolight/state.scm12
2 files changed, 6 insertions, 9 deletions
diff --git a/guile/nanolight/fixture.scm b/guile/nanolight/fixture.scm
index 58ec3b4..94c3cac 100644
--- a/guile/nanolight/fixture.scm
+++ b/guile/nanolight/fixture.scm
@@ -141,7 +141,7 @@
#:friendly-name friendly-name)))
(home-all-attributes new-fixture)
(unless output
- (set! output (make-output)))
+ (set! output (make-output))) ; Start output if not already running
(output 'add-fixture fixture-name new-fixture)
new-fixture))
@@ -149,7 +149,6 @@
(define (round-dmx a)
(min 255 (max 0 (round a))))
-
(define (percent->dmxval val)
(round-dmx (/ (* 256 val) 100)))
diff --git a/guile/nanolight/state.scm b/guile/nanolight/state.scm
index f6f0193..87c5af0 100644
--- a/guile/nanolight/state.scm
+++ b/guile/nanolight/state.scm
@@ -60,9 +60,8 @@
; which returns the highest value from the two inputs
; Otherwise, revert to LTP
(define (merge-rule-htp a b)
- (let (
- (funca (value-func a))
- (funcb (value-func b)))
+ (let ((funca (value-func a))
+ (funcb (value-func b)))
(if (eq? (attribute a) 'intensity)
(lambda () (max (funca) (funcb)))
funcb)))
@@ -103,10 +102,9 @@
(define (exec-state! state)
(for-each
(lambda (a)
- (assign-attr!
- (fixture a)
- (attribute a)
- (value-func a)))
+ (assign-attr! (fixture a)
+ (attribute a)
+ (value-func a)))
state))