diff June/Gen2_D1.pd @ 117:3f2588a64b25

merged

--- a/June/Gen2_D1.pd	Sat Aug 01 05:47:45 2015 +0100
+++ b/June/Gen2_D1.pd	Sat Aug 01 05:48:03 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 62 23 839 696 10;
+#N canvas 6 225 990 777 10;
 #N canvas 236 158 426 423 windspeed 0;
 #X obj 3 -19 +~ 1;
 #X obj 3 76 +~;
@@ -84,13 +84,12 @@
 #X obj 46 419 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 109 419 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 200 419 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 600 1;
+-1 -1 0 1;
 #X text 229 438 Gain;
-#X msg 200 383 25;
 #X obj 200 355 loadbang;
-#X obj 250 28 delwrite~ varwind 3000;
+#X obj 250 68 delwrite~ varwind 3000;
 #X obj 333 -124 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8000 1;
+-1 -1 2900 1;
 #X obj 293 -21 snapshot~;
 #X obj 293 -46 metro 100;
 #X obj 293 -68 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
@@ -139,82 +138,97 @@
 #X obj 619 -71 vd~ varwind 2000;
 #X obj 407 14 makeDia;
 #X obj 634 -16 makeDia;
-#X obj 392 125 thisFreq;
 #X obj 496 -60 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
--262144 -1 -1 900 1;
-#X obj 522 -60 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 1100 1;
-#X obj 465 79 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2700 1;
-#X floatatom 522 9 5 0 0 0 - - -;
-#X floatatom 487 111 5 0 0 0 - - -;
-#X obj 727 -81 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
--262144 -1 -1 800 1;
-#X obj 771 -73 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 400 1;
+-262144 -1 -1 1400 1;
+#X obj 521 -32 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 1000 1;
+#X obj 475 80 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2000 1;
+#X floatatom 521 37 5 0 0 0 - - -;
+#X floatatom 497 112 5 0 0 0 - - -;
+#X obj 726 -77 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
+-262144 -1 -1 0 1;
+#X obj 754 -52 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 0 1;
 #X obj 709 41 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3200 1;
-#X floatatom 771 -4 5 0 0 0 - - -;
+-1 -1 0 1;
+#X floatatom 754 17 5 0 0 0 - - -;
 #X floatatom 731 73 5 0 0 0 - - -;
 #X floatatom 518 369 10 0 0 0 - - -;
 #X text 478 494 Frequency (Hz);
 #X floatatom 489 469 10 0 0 0 - - -;
 #X obj 504 339 makeDia;
 #X obj 587 278 vsl 20 50 0.005 0.99 0 0 empty empty empty 0 -9 0 10
--262144 -1 -1 1200 1;
-#X obj 641 286 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
--1 -1 300 1;
+-262144 -1 -1 0 1;
+#X obj 612 303 vsl 20 50 100 1 1 0 empty empty empty 0 -9 0 10 -262144
+-1 -1 0 1;
 #X obj 582 400 hsl 50 20 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 3100 1;
-#X floatatom 641 355 5 0 0 0 - - -;
+-262144 -1 -1 0 1;
+#X floatatom 612 372 5 0 0 0 - - -;
 #X floatatom 601 432 5 0 0 0 - - -;
 #X msg 456 260 100;
 #X msg 489 260 500;
 #X msg 521 260 1200;
 #X obj 489 288 vd~ varwind \$1;
+#X obj 293 -93 loadbang;
+#X msg 200 383 5;
+#X text 477 -80 Diameter;
+#X text 714 -106 Diameter;
+#X text 573 253 Diameter;
+#X text 543 -18 Distance;
+#X text 781 -31 Distance;
+#X text 634 310 Distance;
+#X text 535 85 Azimuth;
+#X text 770 48 Azimuth;
+#X text 639 400 Azimuth;
+#X text 290 24 Wind Speed;
+#X obj 392 125 thisFreq;
+#X msg 400 91 1;
+#X msg 399 67 0;
+#X obj 489 437 thisFreq;
 #X obj 619 78 thisFreq;
-#X obj 489 437 thisFreq;
-#X connect 0 0 26 0;
-#X connect 16 0 34 0;
-#X connect 18 0 16 0;
-#X connect 19 0 18 0;
-#X connect 21 0 26 1;
-#X connect 21 0 27 1;
-#X connect 22 0 25 0;
+#X connect 0 0 25 0;
+#X connect 16 0 33 0;
+#X connect 18 0 66 0;
+#X connect 20 0 25 1;
+#X connect 20 0 26 1;
+#X connect 21 0 24 0;
+#X connect 22 0 21 0;
 #X connect 23 0 22 0;
-#X connect 24 0 23 0;
-#X connect 26 0 27 0;
-#X connect 27 0 20 0;
-#X connect 27 0 22 0;
-#X connect 32 0 43 0;
-#X connect 34 0 14 0;
-#X connect 34 1 15 0;
-#X connect 40 0 67 0;
-#X connect 41 0 33 0;
-#X connect 41 0 43 1;
-#X connect 42 0 37 0;
-#X connect 42 0 67 1;
-#X connect 43 0 36 0;
-#X connect 44 0 41 0;
-#X connect 45 0 43 2;
-#X connect 45 0 47 0;
-#X connect 46 0 43 3;
-#X connect 46 0 48 0;
-#X connect 49 0 42 0;
-#X connect 50 0 52 0;
-#X connect 50 0 67 2;
-#X connect 51 0 53 0;
-#X connect 51 0 67 3;
-#X connect 57 0 54 0;
-#X connect 57 0 68 1;
-#X connect 58 0 57 0;
-#X connect 59 0 61 0;
-#X connect 59 0 68 2;
-#X connect 60 0 62 0;
-#X connect 60 0 68 3;
-#X connect 63 0 66 0;
-#X connect 64 0 66 0;
-#X connect 65 0 66 0;
-#X connect 66 0 68 0;
-#X connect 67 0 39 0;
-#X connect 68 0 56 0;
+#X connect 25 0 26 0;
+#X connect 26 0 19 0;
+#X connect 26 0 21 0;
+#X connect 31 0 77 0;
+#X connect 33 0 14 0;
+#X connect 33 1 15 0;
+#X connect 40 0 32 0;
+#X connect 40 0 77 3;
+#X connect 41 0 36 0;
+#X connect 41 0 81 1;
+#X connect 42 0 40 0;
+#X connect 43 0 45 0;
+#X connect 43 0 77 4;
+#X connect 44 0 46 0;
+#X connect 44 0 77 5;
+#X connect 47 0 41 0;
+#X connect 48 0 50 0;
+#X connect 48 0 81 2;
+#X connect 49 0 51 0;
+#X connect 49 0 81 3;
+#X connect 55 0 52 0;
+#X connect 55 0 80 1;
+#X connect 56 0 55 0;
+#X connect 57 0 59 0;
+#X connect 57 0 80 2;
+#X connect 58 0 60 0;
+#X connect 58 0 80 3;
+#X connect 61 0 64 0;
+#X connect 62 0 64 0;
+#X connect 63 0 64 0;
+#X connect 65 0 23 0;
+#X connect 66 0 16 0;
+#X connect 77 0 35 0;
+#X connect 78 0 77 1;
+#X connect 79 0 77 1;
+#X connect 80 0 54 0;
+#X connect 81 0 38 0;