From dee5c0ccccc0d8199cc978e55db96fbf95e46b5c Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Fri, 14 Aug 2015 18:35:43 -0400
Subject: [PATCH] ported: "*final bugfixes on arduino objects" from pd-l2ork:
 385ceb89ca38b34ca0483d5b79d6c18b29b21805

---
 l2ork_addons/K12/arduino_analog_in.pd    | 38 +++++++------
 l2ork_addons/K12/arduino_connect-help.pd |  9 ++--
 l2ork_addons/K12/arduino_connect.pd      | 64 +++++++++++-----------
 l2ork_addons/K12/arduino_digital_in.pd   | 68 +++++++++++-------------
 4 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/l2ork_addons/K12/arduino_analog_in.pd b/l2ork_addons/K12/arduino_analog_in.pd
index 09bd986b0..ef7aa634e 100644
--- a/l2ork_addons/K12/arduino_analog_in.pd
+++ b/l2ork_addons/K12/arduino_analog_in.pd
@@ -1,7 +1,7 @@
-#N canvas 291 41 496 325 10;
+#N canvas 212 26 496 348 10;
 #X obj 110 64 outlet;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog_off.png
-1;
+#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog.png 1
+;
 #X obj 228 -60 loadbang;
 #X obj 58 -60 inlet;
 #X obj 240 -15 preset_node k12;
@@ -10,11 +10,11 @@
 #X obj 77 183 gate 1 0;
 #X obj 58 105 t b 1 f;
 #X obj 122 162 f, f 2;
-#X obj 224 160 change;
-#X msg 224 182 symbol arduino-\$1;
+#X obj 224 180 change;
+#X msg 224 202 symbol arduino-\$1;
 #X symbolatom 228 62 3 0 0 0 - - -, f 3;
 #X text 203 61 pin:;
-#N canvas 330 227 755 313 pin_parser 0;
+#N canvas 310 207 755 313 pin_parser 0;
 #X obj 18 18 inlet;
 #X obj 148 202 outlet;
 #X obj 306 275 outlet;
@@ -27,8 +27,7 @@
 #X obj 307 198 t b;
 #X obj 423 198 t b;
 #X msg 307 250 open @pd_extra/K12/objects/arduino_analog.png;
-#X msg 423 220 open @pd_extra/K12/objects/arduino_analog_off.png
-;
+#X msg 423 220 open @pd_extra/K12/objects/arduino_analog_off.png;
 #X obj 18 45 sel A0 A1 A2 A3 A4 A5, f 68;
 #X connect 0 0 13 0;
 #X connect 3 0 1 0;
@@ -56,33 +55,32 @@
 #X connect 13 6 10 0;
 #X restore 277 104 pd pin_parser;
 #X obj 110 41 route -1;
-#X msg 77 205 pinMode $f1 analog;
-#X obj 77 235 send, f 25;
+#X obj 77 258 send, f 25;
 #X obj 340 -15 loadbang;
 #X msg 340 7 symbol ---;
 #X text 209 45 INPUT;
-#X msg 228 -37 open @pd_extra/K12/objects/arduino_analog_off.png
-;
-#X connect 2 0 21 0;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_analog_off.png;
+#X msg 77 228 pinMode \$1 analog;
+#X connect 2 0 20 0;
 #X connect 3 0 6 0;
 #X connect 4 0 12 0;
 #X connect 5 0 15 0;
 #X connect 6 0 8 0;
 #X connect 6 1 5 0;
-#X connect 7 0 16 0;
+#X connect 7 0 21 0;
 #X connect 8 0 9 0;
 #X connect 8 1 7 0;
 #X connect 8 2 10 0;
 #X connect 9 0 7 1;
 #X connect 10 0 11 0;
-#X connect 11 0 17 1;
+#X connect 11 0 16 1;
 #X connect 12 0 14 0;
-#X connect 14 0 9 0;
 #X connect 14 0 15 1;
+#X connect 14 0 9 0;
 #X connect 14 1 1 0;
 #X connect 15 0 0 0;
-#X connect 16 0 17 0;
-#X connect 18 0 19 0;
-#X connect 19 0 12 0;
-#X connect 21 0 1 0;
+#X connect 17 0 18 0;
+#X connect 18 0 12 0;
+#X connect 20 0 1 0;
+#X connect 21 0 16 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/arduino_connect-help.pd b/l2ork_addons/K12/arduino_connect-help.pd
index da17dd586..8b029f619 100644
--- a/l2ork_addons/K12/arduino_connect-help.pd
+++ b/l2ork_addons/K12/arduino_connect-help.pd
@@ -1,10 +1,11 @@
-#N canvas 181 28 507 650 10;
+#N canvas 116 23 507 650 10;
 #X obj 348 51 cnv 15 250 117 empty empty empty 20 12 0 14 -233017 -66577
 0;
-#X obj 366 -26 preset_hub k12 %hidden% %node% 2 7 18 %preset% 0 0 %node%
-2 9 4 %preset% 0 a0 %node% 2 9 4 %preset% 0 a0 %node% 2 10 4 %preset%
+#X obj 366 -26 preset_hub k12 %hidden% %node% 2 7 17 %preset% 0 0 %node%
+2 9 4 %preset% 0 A0 %node% 2 9 4 %preset% 0 a0 %node% 2 10 4 %preset%
 0 2 %node% 2 11 4 %preset% 0 10 %node% 2 12 4 %preset% 0 4 %node% 2
-13 7 %node% 2 14 7 %node% 2 15 7 %node% 2 16 7 %node% 2 17 8;
+13 7 %preset% 0 0 %node% 2 14 7 %preset% 0 1 %node% 2 15 7 %preset%
+0 1 %node% 2 16 7 %preset% 0 0.197458 %node% 2 17 8;
 #X obj 124 218 cnv 15 479 320 empty empty empty 20 12 0 14 -233017
 -66577 0;
 #X obj 112 -3 cnv 3 501 3 empty empty empty 5 14 0 20 -260097 -191407
diff --git a/l2ork_addons/K12/arduino_connect.pd b/l2ork_addons/K12/arduino_connect.pd
index 690c4960d..568c93055 100644
--- a/l2ork_addons/K12/arduino_connect.pd
+++ b/l2ork_addons/K12/arduino_connect.pd
@@ -1,5 +1,5 @@
-#N canvas 370 194 655 420 10;
-#N canvas 350 118 527 287 buffer 0;
+#N canvas 353 97 655 420 10;
+#N canvas 340 108 527 287 buffer 0;
 #X obj 89 37 inlet;
 #X obj 74 124 f;
 #X obj 141 37 inlet;
@@ -55,7 +55,7 @@
 #X text 51 335 message structure:;
 #X text 51 347 digital = d <channel> <val>;
 #X text 51 358 analog = a <channel> <val>;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_off.png 1;
+#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_on.png 1;
 #X obj 298 59 loadbang;
 #X obj 332 37 select 0 1;
 #X obj 332 15 change;
@@ -64,9 +64,8 @@
 #X msg 325 175 info;
 #X obj 514 285 f \$0;
 #X msg 514 308 arduino \$1;
-#X text 513 338 used to inform its membersof the instance they arelinked
+#X text 500 338 used to inform its membersof the instance they arelinked
 with;
-#X obj 242 214 arduino/arduino 0;
 #X obj 285 -15 preset_node k12;
 #X obj 140 150 f;
 #X msg 140 175 open \$1 \, info;
@@ -76,46 +75,47 @@ with;
 #X obj 369 175 r arduino-\$0;
 #X text 195 51 Device:;
 #X obj 237 53 nbx 2 14 -1 7 0 1 empty empty empty 0 -8 0 10 -262144
--1 -1 -1 256 3;
+-1 -1 0 256 3;
 #X obj 300 276 route 0 1 2 3 4 5, f 21;
 #X text 450 175 receive from downstream objects;
 #X obj 99 175 inlet;
 #X msg 355 59 open @pd_extra/K12/objects/arduino_on.png;
 #X msg 332 80 open @pd_extra/K12/objects/arduino_off.png;
+#X obj 242 214 arduino/arduino -1;
 #X connect 0 0 3 0;
-#X connect 1 0 17 0;
+#X connect 1 0 31 0;
 #X connect 2 0 0 6;
 #X connect 2 0 10 0;
-#X connect 8 0 31 0;
-#X connect 9 0 31 0;
-#X connect 9 1 30 0;
+#X connect 8 0 30 0;
+#X connect 9 0 30 0;
+#X connect 9 1 29 0;
 #X connect 10 0 9 0;
 #X connect 11 0 12 0;
 #X connect 12 0 13 0;
 #X connect 12 0 14 0;
-#X connect 13 0 17 0;
+#X connect 13 0 31 0;
 #X connect 14 0 15 0;
 #X connect 15 0 3 0;
-#X connect 17 0 2 0;
-#X connect 17 0 22 0;
-#X connect 18 0 26 0;
-#X connect 19 0 20 0;
-#X connect 20 0 17 0;
-#X connect 20 0 22 0;
-#X connect 21 0 3 0;
-#X connect 22 0 21 0;
-#X connect 22 1 27 0;
-#X connect 23 0 19 0;
-#X connect 23 1 1 0;
-#X connect 24 0 17 0;
-#X connect 26 0 23 0;
-#X connect 27 0 0 0;
-#X connect 27 1 0 1;
-#X connect 27 2 0 2;
-#X connect 27 3 0 3;
-#X connect 27 4 0 4;
-#X connect 27 5 0 5;
-#X connect 29 0 17 0;
+#X connect 17 0 25 0;
+#X connect 18 0 19 0;
+#X connect 19 0 21 0;
+#X connect 19 0 31 0;
+#X connect 20 0 3 0;
+#X connect 21 0 20 0;
+#X connect 21 1 26 0;
+#X connect 22 0 18 0;
+#X connect 22 1 1 0;
+#X connect 23 0 31 0;
+#X connect 25 0 22 0;
+#X connect 26 0 0 0;
+#X connect 26 1 0 1;
+#X connect 26 2 0 2;
+#X connect 26 3 0 3;
+#X connect 26 4 0 4;
+#X connect 26 5 0 5;
+#X connect 28 0 31 0;
+#X connect 29 0 7 0;
 #X connect 30 0 7 0;
-#X connect 31 0 7 0;
+#X connect 31 0 21 0;
+#X connect 31 1 2 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/arduino_digital_in.pd b/l2ork_addons/K12/arduino_digital_in.pd
index a3c74b885..cd4912d91 100644
--- a/l2ork_addons/K12/arduino_digital_in.pd
+++ b/l2ork_addons/K12/arduino_digital_in.pd
@@ -1,63 +1,59 @@
-#N canvas 365 224 503 325 10;
+#N canvas 315 174 503 355 10;
 #X obj 110 64 outlet;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_digital_off.png
+#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_digital.png
 1;
 #X obj 228 -60 loadbang;
 #X obj 58 -60 inlet;
 #X obj 240 -15 preset_node k12;
-#X obj 110 8 route a;
 #X obj 58 -15 route arduino list;
 #X obj 77 183 gate 1 0;
 #X obj 58 105 t b 1 f;
 #X obj 122 162 f, f 2;
 #X obj 224 160 change;
 #X msg 224 182 symbol arduino-\$1;
-#N canvas 790 393 537 255 pin_parser 0;
+#N canvas 770 373 537 255 pin_parser 0;
 #X obj 171 23 inlet;
 #X obj 37 220 outlet;
 #X obj 198 220 outlet;
 #X obj 171 59 split 0 13;
 #X obj 171 81 t f b;
-#X msg 37 187 pinMode \$1 input;
 #X msg 199 136 open @pd_extra/K12/objects/arduino_digital.png;
-#X msg 228 112 open @pd_extra/K12/objects/arduino_digital_off.png
-;
+#X msg 228 112 open @pd_extra/K12/objects/arduino_digital_off.png;
 #X connect 0 0 3 0;
 #X connect 3 0 4 0;
-#X connect 3 1 7 0;
-#X connect 4 0 5 0;
-#X connect 4 1 6 0;
-#X connect 5 0 1 0;
+#X connect 3 1 6 0;
+#X connect 4 0 1 0;
+#X connect 4 1 5 0;
+#X connect 5 0 2 0;
 #X connect 6 0 2 0;
-#X connect 7 0 2 0;
 #X restore 277 104 pd pin_parser;
 #X obj 110 41 route -1;
-#X msg 77 205 pinMode $f1 analog;
-#X obj 77 235 send, f 25;
+#X obj 77 258 send, f 25;
 #X text 211 45 INPUT;
-#X msg 228 -37 open @pd_extra/K12/objects/arduino_digital_off.png
-;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_digital_off.png;
 #X text 206 61 pin:;
 #X obj 230 64 nbx 3 14 -1e+37 1e+37 0 1 empty empty empty 0 -8 0 10
--262144 -1 -1 -1 256 3;
-#X connect 2 0 17 0;
-#X connect 3 0 6 0;
-#X connect 4 0 19 0;
-#X connect 5 0 13 0;
-#X connect 6 0 8 0;
-#X connect 6 1 5 0;
-#X connect 7 0 14 0;
-#X connect 8 0 9 0;
-#X connect 8 1 7 0;
-#X connect 8 2 10 0;
-#X connect 9 0 7 1;
-#X connect 10 0 11 0;
-#X connect 11 0 15 1;
-#X connect 12 0 9 0;
-#X connect 12 0 13 1;
-#X connect 12 1 1 0;
-#X connect 13 0 0 0;
-#X connect 14 0 15 0;
-#X connect 17 0 1 0;
+-262144 -1 -1 2 256 3;
+#X msg 77 228 pinMode \$1 input;
+#X obj 110 8 route d;
+#X connect 2 0 15 0;
+#X connect 3 0 5 0;
+#X connect 4 0 17 0;
+#X connect 5 0 7 0;
+#X connect 5 1 19 0;
+#X connect 6 0 18 0;
+#X connect 7 0 8 0;
+#X connect 7 1 6 0;
+#X connect 7 2 9 0;
+#X connect 8 0 6 1;
+#X connect 9 0 10 0;
+#X connect 10 0 13 1;
+#X connect 11 0 8 0;
+#X connect 11 0 12 1;
+#X connect 11 1 1 0;
+#X connect 12 0 0 0;
+#X connect 15 0 1 0;
+#X connect 17 0 11 0;
+#X connect 18 0 13 0;
 #X connect 19 0 12 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
-- 
GitLab