🆙 update composition

theapache64 · Mar 26, 2021 · a26c10e · a26c10e
1 parent 1574443
commit a26c10e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/main/kotlin/com/theapache64/klokk/main.kt b/src/main/kotlin/com/theapache64/klokk/main.kt
@@ -102,23 +102,29 @@ fun main() {
                         activeMovement = Movement.Trance(to = Movement.Trance.To.FLY) // then fly
                         delay(defaultWaitTime)
 
-                        // Show wave two times
-                        repeat(2){
-                            activeMovement = Movement.Wave(Movement.Wave.State.START)
-                            delay(mediumDelay)
+                        activeMovement = Movement.Wave(Movement.Wave.State.START)
+                        delay(mediumDelay)
 
-                            activeMovement = Movement.Wave(Movement.Wave.State.END)
-                            delay(mediumDelay)
-                        }
+                        activeMovement = Movement.Wave(Movement.Wave.State.END)
+                        delay(mediumDelay)
 
+                        // Ripple
                         activeMovement = Movement.Ripple(to = Movement.Ripple.To.START) // then ripple start
-                        delay(mediumDelay)
+                        delay(defaultWaitTime)
+
+                        activeMovement = Movement.Ripple(to = Movement.Ripple.To.END) // then ripple end
+                        delay(defaultWaitTime)
 
+                        // Time table
                         activeMovement = Movement.Ripple(to = Movement.Ripple.To.TIME_TABLE) // then ripple start
-                        delay(mediumDelay)
+                        delay(defaultWaitTime)
+
+                        // Ripple again
+                        activeMovement = Movement.Ripple(to = Movement.Ripple.To.START) // then ripple start
+                        delay(defaultWaitTime)
 
                         activeMovement = Movement.Ripple(to = Movement.Ripple.To.END) // then ripple end
-                        delay(mediumDelay)
+                        delay(defaultWaitTime)
 
                         activeMovement = Movement.Time() // then show time
                         delay(defaultWaitTime)

diff --git a/src/main/kotlin/com/theapache64/klokk/movement/core/Movement.kt b/src/main/kotlin/com/theapache64/klokk/movement/core/Movement.kt
@@ -27,6 +27,10 @@ sealed class Movement(
         override fun getMatrixGenerator(): MatrixGenerator<Movement> {
             return StandByMatrixGenerator(this)
         }
+
+        override fun toString(): String {
+            return "StandBy"
+        }
     }
 
     /**