# HG changeset patch
# User Roderick Selfridge <r.selfridge@qmul.ac.uk>
# Date 1430146012 -3600
# Node ID 9413880b0957f53cfe85c40a94f00a612eaac698
# Parent  88c650a4adad3da1d56cdfc8d1021ec6b17d631b
More edits to improve

diff -r 88c650a4adad -r 9413880b0957 prototype2.pd
--- a/prototype2.pd	Wed Apr 22 21:03:05 2015 +0100
+++ b/prototype2.pd	Mon Apr 27 15:46:52 2015 +0100
@@ -1,8 +1,8 @@
-#N canvas 65 94 1202 653 10;
+#N canvas 45 23 1215 713 10;
 #X obj 979 46 hsl 128 15 0 31 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6600 1;
+-1 -1 4916 1;
 #X obj 408 -11 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 400 1;
+-262144 -1 -1 3369 1;
 #X floatatom 334 56 10 0 0 0 - - -;
 #X text 992 27 Wind Speed (m/s);
 #X text 432 -33 Diameter (m);
@@ -109,7 +109,7 @@
 #X obj 128 3 r baseSpeed;
 #X obj 128 26 / 2;
 #X obj 149 -76 loadbang;
-#N canvas 247 201 624 513 pro1 0;
+#N canvas 697 81 624 513 pro1 0;
 #X obj 230 118 * 1.225;
 #X obj 244 145 *;
 #X obj 244 171 / 1.81e-05;
@@ -153,7 +153,7 @@
 #X obj 88 173 throw~ R;
 #X obj -44 15 min 20000;
 #X obj -27 59 r qValue2;
-#N canvas 103 204 481 424 thisQ 0;
+#N canvas 103 204 781 476 thisQ 0;
 #X obj 125 47 < 5000;
 #X floatatom 20 289 8 0 0 0 - - -;
 #X obj 92 72 spigot;
@@ -188,7 +188,7 @@
 #X obj 92 262 + 100;
 #X obj 180 297 * 50;
 #X obj 336 307 * 20;
-#X obj 92 21 r rey1;
+#X obj 92 17 r rey1;
 #X obj 180 19 r rey1;
 #X obj 337 22 r rey1;
 #X obj 387 68 r rey1;
@@ -238,10 +238,10 @@
 #X connect 32 0 40 0;
 #X connect 33 0 30 0;
 #X connect 33 0 21 0;
+#X connect 34 0 2 0;
 #X connect 34 0 0 0;
-#X connect 34 0 2 0;
+#X connect 35 0 4 0;
 #X connect 35 0 3 0;
-#X connect 35 0 4 0;
 #X connect 36 0 16 0;
 #X connect 36 0 17 0;
 #X connect 37 0 20 0;
@@ -969,31 +969,52 @@
 #X floatatom 726 382 10 0 0 0 - - -;
 #X obj 726 362 r outFreq4;
 #X obj 1075 152 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1900 1;
+-1 -1 10300 1;
 #X obj 1075 294 / 127;
 #X obj 998 323 *~ 0.4;
 #X obj 1043 323 *~ 0.4;
 #X obj 595 342 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 2400 1;
+-262144 -1 -1 1814 1;
 #X obj 195 336 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 700 1;
+-262144 -1 -1 2333 1;
 #X obj 399 154 hsl 128 15 0.01 0.5 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 800 1;
+-262144 -1 -1 518 1;
 #X msg 1092 124 40;
 #X obj 1092 99 loadbang;
 #X text 1099 195 Output Gain;
 #X obj 278 -61 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 600 1;
+-1 -1 2728 1;
 #X obj 495 267 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1900 1;
+-1 -1 7951 1;
 #X obj 269 110 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 500 1;
+-1 -1 624 1;
 #X obj 138 247 vsl 25 100 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 300 1;
+-1 -1 7406 1;
 #X obj 495 380 s gain4;
 #X obj 278 52 s gain1;
 #X obj 269 224 s gain2;
 #X obj 138 362 s gain3;
+#X obj 592 302 r diam4;
+#X obj 405 -53 r diam1;
+#X obj 192 294 r diam3;
+#X obj 396 112 r diam2;
+#X obj 229 -59 r gn1;
+#X obj 495 231 r gn4;
+#X obj 138 214 r gn3;
+#X obj 219 116 r gn2;
+#X obj 871 515 unpack f f f f f f f f f;
+#X obj 871 706 s diam1;
+#X obj 976 567 s diam4;
+#X obj 941 614 s diam3;
+#X obj 906 660 s diam2;
+#X obj 888 683 s gn1;
+#X obj 923 638 s gn2;
+#X obj 959 591 s gn3;
+#X obj 994 545 s gn4;
+#X obj 1034 544 s wS;
+#X obj 942 24 r wS;
+#X msg 833 417 0.14 35 0.03 8 0.1 95 0.08 102 23;
+#X msg 874 445 0.14 35 0.03 8 0.1 95 0.08 102 12;
 #X connect 0 0 10 0;
 #X connect 1 0 12 0;
 #X connect 1 0 12 1;
@@ -1042,3 +1063,23 @@
 #X connect 87 0 90 0;
 #X connect 88 0 92 0;
 #X connect 89 0 93 0;
+#X connect 94 0 80 0;
+#X connect 95 0 1 0;
+#X connect 96 0 81 0;
+#X connect 97 0 82 0;
+#X connect 98 0 86 0;
+#X connect 99 0 87 0;
+#X connect 100 0 89 0;
+#X connect 101 0 88 0;
+#X connect 102 0 103 0;
+#X connect 102 1 107 0;
+#X connect 102 2 106 0;
+#X connect 102 3 108 0;
+#X connect 102 4 105 0;
+#X connect 102 5 109 0;
+#X connect 102 6 104 0;
+#X connect 102 7 110 0;
+#X connect 102 8 111 0;
+#X connect 112 0 0 0;
+#X connect 113 0 102 0;
+#X connect 114 0 102 0;