From 2f7e9e7c289bdb3e15a00b2159c7d38b51c82c65 Mon Sep 17 00:00:00 2001
From: riviera <rivierataylor97@gmail.com>
Date: Wed, 22 May 2024 23:25:12 +0200
Subject: [PATCH] modified tidal files

---
 TidalBoot.hs  |  2 +-
 TidalBoot.hs~ | 56 ---------------------------------------------------
 may-22.tidal  | 14 +++++++------
 3 files changed, 9 insertions(+), 63 deletions(-)
 delete mode 100644 TidalBoot.hs~

diff --git a/TidalBoot.hs b/TidalBoot.hs
index fb359b7..98f4aa7 100644
--- a/TidalBoot.hs
+++ b/TidalBoot.hs
@@ -34,7 +34,7 @@ hSetEncoding stdout utf8
                         OSC "/{device}/{action}" $ ArgList [("action", Just $ VS "f")],
                         OSC "/{device}/mode" $ ArgList [("mode", Just $ VI 1)],
                         OSC "/{device}/steps" $ ArgList [("steps", Just $ VF 0)],
-                        OSC "/{device}/rpm" $ ArgList [("rpm", Just $ VF 0)]]
+                        OSC "/{device}/rpm" $ ArgList [("rpm", Just $ VF 48)]]
                         -- OSC "/stopall" $ ArgList [("stop", Just $ VS "printer")]]
                        -- ("speed", Just $ VI 0),
                        -- ("action", Just $ VS "r")
diff --git a/TidalBoot.hs~ b/TidalBoot.hs~
deleted file mode 100644
index e2a30b2..0000000
--- a/TidalBoot.hs~
+++ /dev/null
@@ -1,56 +0,0 @@
--- printer-jam.hs
-:set -package hosc
-:set -package bytestring
-:set -XOverloadedStrings
-:set prompt ""
-
-import qualified Data.ByteString.Char8 as ByteString.Char8 {- bytestring -}
-import Sound.Tidal.Context
-import Sound.Osc.Fd as O
-
--- type Ascii = ByteString.Char8.ByteString
-
--- :{
---   ascii_to_controlPattern :: O.Ascii -> ControlPattern
---    ascii_to_controlPattern = 
--- :}
-import System.IO (hSetEncoding, stdout, utf8)
-hSetEncoding stdout utf8
-
-:{
-  let printerTarget =
-        Target {oName = "printer",   -- A friendly name for the target
-                oAddress = "192.168.1.171", -- The target's network address
-                oPort = 10000,           -- The network port the target is listening on
-                oLatency = 0.15,         -- smooth out network jitter
-                oSchedule = Live,       -- The scheduling method
-                oWindow = Nothing,      -- Not yet used
-                oHandshake = False,     -- SuperDirt specific
-                oBusPort = Nothing      -- Also SuperDirt specific
-               }
-        
-      printerFormats = [OSC "/{device}/{motor}/{action}" $ ArgList [("action", Just $ VS "f")],
-                        OSC "/{device}/{motor}/speed" $ ArgList [("speed", Just $ VF 0)]]
-                        -- OSC "/stopall" $ ArgList [("stop", Just $ VS "printer")]]
-                       -- ("speed", Just $ VI 0),
-                       -- ("action", Just $ VS "r")
-
-      action = pS "action"
-      device = pS "device"
-      motor = pS "motor"
-      speed = pF "speed"
-      oscmap = [(printerTarget, printerFormats)]
-:}
-  
-
-tidal <- startStream (defaultConfig {cCtrlAddr = "0.0.0.0", cCtrlPort = 6060}) oscmap
- 
-:{
-  let p1 = streamReplace tidal 1
-      p2 = streamReplace tidal 2
-      p3 = streamReplace tidal 3
-      p4 = streamReplace tidal 4
-:}
-
-:set prompt "tidal> "
-:set prompt-cont "" 
diff --git a/may-22.tidal b/may-22.tidal
index 451a35a..c327341 100644
--- a/may-22.tidal
+++ b/may-22.tidal
@@ -1,11 +1,13 @@
-p1 $ slow 0.5
-  $ action "f!8 b!8"
+p1 $ iter 8
+  $ fast 4
+  $ action "f!8 r!4 b!8 r!4"
   # device "stepper"
-  # steps 10
-  # rpm 20
-  # mode 3
+  # steps 4
+  # rpm 48
+  # mode 2
 
-p2 $ action "f b"
+p2 $ action "f b f b"
   # speed 200
   # device "black"
   # motor "feed"
+