From 343e3cfcfabaf79b7f47f5f13d0d904dfbb705b3 Mon Sep 17 00:00:00 2001
From: margreetriphagen <margreetriphagen@gmail.comm>
Date: Fri, 24 Mar 2017 11:48:25 +0100
Subject: [PATCH 1/3] files

---
 floppies/.DS_Store          | Bin 6148 -> 6148 bytes
 floppies/margreet/.DS_Store | Bin 8196 -> 10244 bytes
 floppies/margreet/main.pd   |  51 +++++++++++++++++-------------------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/floppies/.DS_Store b/floppies/.DS_Store
index 21d80f8209961277d2ae0142a074c36f32d11c27..b2f3cde4dd64a9deb34e61824386901579f61270 100644
GIT binary patch
delta 69
zcmZoMXffDulZnIF+(Jje$iQIoL#8yQOpnPEnMEeYGIKNknr}L}pIMAAH$TNCrL-iO
Wf#C{7NQLph<O$58n@=)ZivR!@3KvHJ

delta 69
zcmZoMXffDulZnI7#8^kc(9C@DL#8yQNae{BnMEeYGIKNkoL4cqpIMAAH$TNCrL-iO
Wf#C{7NQH61<O$58n@=)ZivR!_BNui6

diff --git a/floppies/margreet/.DS_Store b/floppies/margreet/.DS_Store
index 2c7195aceecf853e86af5f1f6f4d17919837c988..daf0dbd0b46616960a3d4c70cb37caafc076cb27 100644
GIT binary patch
delta 744
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50C<@{*0{ILKehk43u0Tm62EC1i
z)7U3A@NQ=3VBru4so-VsVen*d2Fk-#O*RynDU410n1JqNet{>voD8`Pi42(xc_1?<
z{}GsuCNf7*dGlw1AB;?{EtB60NiiM$IGIye21Ka~%P}TQb`!qG&kod`&rr^g%8&#y
zW%DUP4#s*k!JKr%;N<+=0-!U2z_kTPpsC2scX3H6ElFlzxbpMpN3b#s6)6N%6lB0`
z0fi_-0*F8}WU{5mM06KV{wOS|kEX6HxF|0tKQA3<0x;wmco>3!;p)iX!r%)De^AH@
zVv1fD(Vna#a*t7F@<~yBW>A<KicUx3eHZoI%p}Unys@F5QIHwrK44UH0|{49bZ;#D
h&ODi4CQyV4k_a?F(m?ACK=kASnLZXEJv0No2mly>n~MMd

delta 170
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aKKDgcrP@);QX7=jsG8T1%R7%Dav
zPGg_gz`L29gN1`pVDbV%*~#gWeUldp+HBq|^n;Pfq;>LI5h<p5@{>=B$bhKlB65rl
zli5V?P4<_(x4BrFm06G(XfO~+a03ZfkcAryzcWwfR|(_*S_g6l!{m6LX^bVC3xKKt
DzxpL9

diff --git a/floppies/margreet/main.pd b/floppies/margreet/main.pd
index 5d4eef1..3dc42b3 100644
--- a/floppies/margreet/main.pd
+++ b/floppies/margreet/main.pd
@@ -1,15 +1,12 @@
 #N canvas 457 24 739 687 10;
+#X declare -lib net;
 #X declare -lib unpackOSC;
 #X text -22 232 #ikstem;
 #X text 55 233 #gestemd;
 #X obj -69 492 dac~;
 #X obj -37 134 unpack s s s;
 #X obj 441 -2 loadbang;
-#X obj -36 -28 import unpackOSC;
 #X msg 441 31 \; pd dsp 1;
-#X obj -37 40 mrpeach/udpreceive 127.0.0.1 4000;
-#X obj -37 66 mrpeach/unpackOSC;
-#X obj 191 87 unpackOSC;
 #X obj 191 64 udpreceive 127.0.0.1 4000;
 #X text 160 318 comment;
 #X obj 157 254 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
@@ -89,35 +86,35 @@
 #X text -69 250 triggers;
 #X text 142 233 both;
 #X text 146 410 monitor output on/off;
-#X text -41 5 apperently \, on OSX \, one sometimes needs to append
-mrpeach/ ...;
 #X text 190 45 normally \, this should suffice:;
 #X obj 101 286 osc~ 150;
 #X obj -69 286 osc~ 7000;
 #X obj 14 286 osc~ 500;
 #X text 174 296 sinewaves envelopes (triggered by incoming OSC) double
 click pd ..env objects to change envelopes;
-#X connect 3 1 15 0;
-#X connect 4 0 6 0;
-#X connect 7 0 8 0;
-#X connect 8 0 3 0;
-#X connect 10 0 9 0;
-#X connect 12 0 19 1;
-#X connect 13 0 23 1;
+#X obj -34 16 import net;
+#X obj -38 -30 import unpackOSC;
+#X obj 191 87 unpackOSC;
+#X connect 3 1 11 0;
+#X connect 4 0 5 0;
+#X connect 6 0 31 0;
+#X connect 8 0 15 1;
+#X connect 9 0 19 1;
+#X connect 11 0 12 0;
+#X connect 11 1 9 0;
+#X connect 11 2 8 0;
+#X connect 12 0 13 1;
+#X connect 13 0 2 0;
+#X connect 13 0 2 1;
 #X connect 15 0 16 0;
-#X connect 15 1 13 0;
-#X connect 15 2 12 0;
-#X connect 16 0 17 1;
-#X connect 17 0 2 0;
-#X connect 17 0 2 1;
-#X connect 19 0 20 0;
+#X connect 15 0 2 0;
+#X connect 15 0 2 1;
+#X connect 16 0 18 0;
+#X connect 17 0 16 0;
 #X connect 19 0 2 0;
 #X connect 19 0 2 1;
-#X connect 20 0 22 0;
-#X connect 21 0 20 0;
-#X connect 23 0 2 0;
-#X connect 23 0 2 1;
-#X connect 24 0 21 0;
-#X connect 30 0 19 0;
-#X connect 31 0 17 0;
-#X connect 32 0 23 0;
+#X connect 20 0 17 0;
+#X connect 25 0 15 0;
+#X connect 26 0 13 0;
+#X connect 27 0 19 0;
+#X connect 31 0 3 0;

From 2347f24d45ab1459de970b80d9c38d5d5e61164d Mon Sep 17 00:00:00 2001
From: kspreeuw <kimely.s@gmail.com>
Date: Fri, 24 Mar 2017 11:50:09 +0100
Subject: [PATCH 2/3] main.pd

---
 floppies/Kimmy_Rest/main.pd | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 floppies/Kimmy_Rest/main.pd

diff --git a/floppies/Kimmy_Rest/main.pd b/floppies/Kimmy_Rest/main.pd
old mode 100644
new mode 100755
index 8b1615c..26690e4
--- a/floppies/Kimmy_Rest/main.pd
+++ b/floppies/Kimmy_Rest/main.pd
@@ -57,12 +57,12 @@
 #X obj 500 368 > 60;
 #X obj 454 370 <= 60;
 #X obj 273 269 &&;
+#X msg 274 300 \$1 40;
 #X obj 271 238 > 60;
 #X obj 98 176 *~ 20;
 #X obj 324 238 <= 80;
 #X obj 318 523 vd~ fd 200;
 #X obj 288 552 *~ 0.95;
-#X msg 274 300 \$1 200;
 #X connect 0 0 2 0;
 #X connect 2 0 39 0;
 #X connect 3 0 1 0;
@@ -71,8 +71,8 @@
 #X connect 7 0 5 0;
 #X connect 8 0 1 0;
 #X connect 10 0 11 0;
-#X connect 10 0 54 0;
-#X connect 10 0 56 0;
+#X connect 10 0 55 0;
+#X connect 10 0 57 0;
 #X connect 12 0 7 0;
 #X connect 13 0 38 0;
 #X connect 15 0 1 0;
@@ -88,7 +88,7 @@
 #X connect 17 0 50 0;
 #X connect 17 0 51 0;
 #X connect 17 0 52 0;
-#X connect 18 0 57 0;
+#X connect 18 0 58 0;
 #X connect 20 0 30 0;
 #X connect 21 0 33 0;
 #X connect 22 0 40 0;
@@ -110,7 +110,7 @@
 #X connect 38 0 6 1;
 #X connect 38 0 32 0;
 #X connect 38 0 17 0;
-#X connect 39 0 55 0;
+#X connect 39 0 56 0;
 #X connect 40 0 30 0;
 #X connect 41 0 30 0;
 #X connect 42 0 30 0;
@@ -124,12 +124,12 @@
 #X connect 50 0 25 1;
 #X connect 51 0 25 0;
 #X connect 52 0 23 1;
-#X connect 53 0 59 0;
-#X connect 54 0 14 0;
-#X connect 54 0 53 0;
-#X connect 55 0 10 0;
-#X connect 55 0 15 0;
-#X connect 56 0 53 1;
-#X connect 57 0 58 0;
-#X connect 58 0 13 1;
-#X connect 59 0 16 0;
+#X connect 53 0 54 0;
+#X connect 54 0 16 0;
+#X connect 55 0 14 0;
+#X connect 55 0 53 0;
+#X connect 56 0 10 0;
+#X connect 56 0 15 0;
+#X connect 57 0 53 1;
+#X connect 58 0 59 0;
+#X connect 59 0 13 1;

From ae5ecc9e15edf79b57f56e786f7e1b92598a22e6 Mon Sep 17 00:00:00 2001
From: margreetriphagen <margreetriphagen@gmail.comm>
Date: Fri, 24 Mar 2017 11:59:34 +0100
Subject: [PATCH 3/3] files

---
 floppies/margreet/main.pd | 2 +-
 floppies/margreet/main.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/floppies/margreet/main.pd b/floppies/margreet/main.pd
index 3dc42b3..9748df2 100644
--- a/floppies/margreet/main.pd
+++ b/floppies/margreet/main.pd
@@ -94,7 +94,7 @@
 click pd ..env objects to change envelopes;
 #X obj -34 16 import net;
 #X obj -38 -30 import unpackOSC;
-#X obj 191 87 unpackOSC;
+#X obj 184 90 unpackOSC;
 #X connect 3 1 11 0;
 #X connect 4 0 5 0;
 #X connect 6 0 31 0;
diff --git a/floppies/margreet/main.py b/floppies/margreet/main.py
index 350ad53..d08b171 100644
--- a/floppies/margreet/main.py
+++ b/floppies/margreet/main.py
@@ -17,8 +17,8 @@ msg.setAddress("/twitter-ikstem")
 #msg.append('hello from python')
 #client.send(msg)
 
-#os.system('xzcat /media/floppy/twittersonification.csv.xz > /tmp/twittersonification.csv') #floppydisk
-os.system('xzcat twittersonification.csv.xz > /tmp/twittersonification.csv') #lokaal
+os.system('xzcat /media/floppy/twittersonification.csv.xz > /tmp/twittersonification.csv') #floppydisk
+#os.system('xzcat twittersonification.csv.xz > /tmp/twittersonification.csv') #lokaal