From cec0f12229e78a5a73e8be9d466589fdf57da3ae Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Tue, 29 Jul 2014 14:56:31 -0400
Subject: [PATCH] *updated sarcduino abstractions to refer to digital and
 analog channels starting with channel 0

---
 l2ork_addons/K12/sarcduino_analog.pd  |  20 +--
 l2ork_addons/K12/sarcduino_connect.pd | 171 +++++++++++++-------------
 l2ork_addons/K12/sarcduino_digital.pd |  20 +--
 l2ork_addons/K12/sarcduino_piezo.pd   |  26 ++--
 4 files changed, 119 insertions(+), 118 deletions(-)

diff --git a/l2ork_addons/K12/sarcduino_analog.pd b/l2ork_addons/K12/sarcduino_analog.pd
index cc5c75cfc..5f293b694 100755
--- a/l2ork_addons/K12/sarcduino_analog.pd
+++ b/l2ork_addons/K12/sarcduino_analog.pd
@@ -3,23 +3,23 @@
 #X obj 228 45 ggee/image @pd_extra/K12/objects/sarcduino_analog.png
 1;
 #X obj 228 -60 loadbang;
-#X obj 240 44 nbx 2 14 1 16 0 0 empty empty channel: -48 8 0 11 -262144
--1 -1 1 256 3;
+#X obj 240 44 nbx 2 14 0 15 0 0 empty empty channel: -48 8 0 11 -262144
+-1 -1 0 256 3;
 #X obj 128 -60 inlet;
 #X obj 240 -15 preset_node k12;
 #X obj 128 9 route a;
-#X obj 128 32 route 1;
 #X obj 128 -14 route list;
 #X obj 188 63 nbx 4 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 20
 -262144 -1 -1 0 256 3;
 #X msg 228 -37 open @pd_extra/K12/objects/sarcduino_analog.png;
-#X connect 2 0 10 0;
+#X obj 128 32 route 0;
+#X connect 2 0 9 0;
 #X connect 3 0 5 0;
-#X connect 3 0 7 1;
-#X connect 4 0 8 0;
+#X connect 3 0 10 1;
+#X connect 4 0 7 0;
 #X connect 5 0 3 0;
-#X connect 6 0 7 0;
-#X connect 7 0 9 0;
-#X connect 8 0 6 0;
-#X connect 9 0 0 0;
+#X connect 6 0 10 0;
+#X connect 7 0 6 0;
+#X connect 8 0 0 0;
+#X connect 10 0 8 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/sarcduino_connect.pd b/l2ork_addons/K12/sarcduino_connect.pd
index c98ad18af..d6d2dfae6 100755
--- a/l2ork_addons/K12/sarcduino_connect.pd
+++ b/l2ork_addons/K12/sarcduino_connect.pd
@@ -14,7 +14,7 @@
 #X obj 426 301 +;
 #X obj 464 279 * 128;
 #X obj 464 301 +;
-#N canvas 190 44 723 359 digital 0;
+#N canvas 267 136 738 359 digital 0;
 #X obj 175 40 inlet;
 #X obj 39 147 & 1;
 #X obj 91 147 & 2;
@@ -39,12 +39,6 @@
 #X obj 304 213 != 1;
 #X obj 91 213 != 1;
 #X obj 39 212 != 1;
-#X obj 39 257 list prepend 1;
-#X obj 91 235 list prepend 2;
-#X obj 143 257 list prepend 3;
-#X obj 195 235 list prepend 4;
-#X obj 248 257 list prepend 5;
-#X obj 304 235 list prepend 6;
 #X obj 541 40 inlet;
 #X obj 405 147 & 1;
 #X obj 457 147 & 2;
@@ -69,14 +63,20 @@
 #X obj 670 213 != 1;
 #X obj 457 213 != 1;
 #X obj 405 212 != 1;
-#X obj 405 257 list prepend 1;
-#X obj 457 235 list prepend 2;
-#X obj 509 257 list prepend 3;
-#X obj 561 235 list prepend 4;
-#X obj 614 257 list prepend 5;
-#X obj 670 235 list prepend 6;
 #X obj 356 304 list prepend d;
 #X obj 356 327 outlet;
+#X obj 39 257 list prepend 0;
+#X obj 91 235 list prepend 1;
+#X obj 143 257 list prepend 2;
+#X obj 195 235 list prepend 3;
+#X obj 248 257 list prepend 4;
+#X obj 304 235 list prepend 5;
+#X obj 405 257 list prepend 6;
+#X obj 457 235 list prepend 7;
+#X obj 509 257 list prepend 8;
+#X obj 561 235 list prepend 9;
+#X obj 614 257 list prepend 10;
+#X obj 670 235 list prepend 11;
 #X connect 0 0 1 0;
 #X connect 0 0 2 0;
 #X connect 0 0 3 0;
@@ -97,59 +97,59 @@
 #X connect 12 0 20 0;
 #X connect 13 0 22 0;
 #X connect 14 0 15 0;
-#X connect 15 0 26 0;
+#X connect 15 0 52 0;
 #X connect 16 0 17 0;
-#X connect 17 0 27 0;
+#X connect 17 0 53 0;
 #X connect 18 0 19 0;
-#X connect 19 0 28 0;
+#X connect 19 0 54 0;
 #X connect 20 0 21 0;
-#X connect 21 0 29 0;
-#X connect 22 0 25 0;
-#X connect 23 0 24 0;
-#X connect 24 0 60 0;
-#X connect 25 0 60 0;
-#X connect 26 0 60 0;
-#X connect 27 0 60 0;
-#X connect 28 0 60 0;
-#X connect 29 0 60 0;
-#X connect 30 0 31 0;
-#X connect 30 0 32 0;
-#X connect 30 0 33 0;
-#X connect 30 0 34 0;
-#X connect 30 0 35 0;
+#X connect 21 0 55 0;
+#X connect 22 0 51 0;
+#X connect 23 0 50 0;
+#X connect 24 0 25 0;
+#X connect 24 0 26 0;
+#X connect 24 0 27 0;
+#X connect 24 0 28 0;
+#X connect 24 0 29 0;
+#X connect 24 0 30 0;
+#X connect 25 0 31 0;
+#X connect 26 0 32 0;
+#X connect 27 0 33 0;
+#X connect 28 0 34 0;
+#X connect 29 0 35 0;
 #X connect 30 0 36 0;
-#X connect 31 0 37 0;
-#X connect 32 0 38 0;
-#X connect 33 0 39 0;
+#X connect 31 0 47 0;
+#X connect 32 0 37 0;
+#X connect 33 0 38 0;
 #X connect 34 0 40 0;
-#X connect 35 0 41 0;
-#X connect 36 0 42 0;
-#X connect 37 0 53 0;
-#X connect 38 0 43 0;
-#X connect 39 0 44 0;
-#X connect 40 0 46 0;
-#X connect 41 0 48 0;
-#X connect 42 0 50 0;
-#X connect 43 0 52 0;
+#X connect 35 0 42 0;
+#X connect 36 0 44 0;
+#X connect 37 0 46 0;
+#X connect 38 0 39 0;
+#X connect 39 0 58 0;
+#X connect 40 0 41 0;
+#X connect 41 0 59 0;
+#X connect 42 0 43 0;
+#X connect 43 0 60 0;
 #X connect 44 0 45 0;
-#X connect 45 0 56 0;
-#X connect 46 0 47 0;
-#X connect 47 0 57 0;
+#X connect 45 0 61 0;
+#X connect 46 0 57 0;
+#X connect 47 0 56 0;
 #X connect 48 0 49 0;
-#X connect 49 0 58 0;
-#X connect 50 0 51 0;
-#X connect 51 0 59 0;
-#X connect 52 0 55 0;
-#X connect 53 0 54 0;
-#X connect 54 0 60 0;
-#X connect 55 0 60 0;
-#X connect 56 0 60 0;
-#X connect 57 0 60 0;
-#X connect 58 0 60 0;
-#X connect 59 0 60 0;
-#X connect 60 0 61 0;
+#X connect 50 0 48 0;
+#X connect 51 0 48 0;
+#X connect 52 0 48 0;
+#X connect 53 0 48 0;
+#X connect 54 0 48 0;
+#X connect 55 0 48 0;
+#X connect 56 0 48 0;
+#X connect 57 0 48 0;
+#X connect 58 0 48 0;
+#X connect 59 0 48 0;
+#X connect 60 0 48 0;
+#X connect 61 0 48 0;
 #X restore 206 278 pd digital;
-#N canvas 0 0 488 287 buffer 0;
+#N canvas 420 188 488 287 buffer 0;
 #X obj 89 37 inlet;
 #X obj 74 124 f;
 #X obj 141 37 inlet;
@@ -163,41 +163,41 @@
 #X obj 349 37 inlet;
 #X obj 334 124 f;
 #X obj 392 37 inlet;
-#X obj 74 168 list prepend 1;
-#X obj 126 146 list prepend 2;
-#X obj 178 168 list prepend 3;
-#X obj 230 146 list prepend 4;
-#X obj 282 168 list prepend 5;
-#X obj 334 146 list prepend 6;
 #X obj 230 238 list prepend a;
 #X obj 230 260 outlet;
 #X obj 392 60 metro 10;
+#X obj 74 168 list prepend 0;
+#X obj 126 146 list prepend 1;
+#X obj 178 168 list prepend 2;
+#X obj 230 146 list prepend 3;
+#X obj 282 168 list prepend 4;
+#X obj 334 146 list prepend 5;
 #X connect 0 0 1 1;
-#X connect 1 0 13 0;
+#X connect 1 0 16 0;
 #X connect 2 0 3 1;
-#X connect 3 0 14 0;
+#X connect 3 0 17 0;
 #X connect 4 0 5 1;
-#X connect 5 0 15 0;
+#X connect 5 0 18 0;
 #X connect 6 0 7 1;
-#X connect 7 0 16 0;
+#X connect 7 0 19 0;
 #X connect 8 0 9 1;
-#X connect 9 0 17 0;
+#X connect 9 0 20 0;
 #X connect 10 0 11 1;
-#X connect 11 0 18 0;
-#X connect 12 0 21 0;
-#X connect 13 0 19 0;
-#X connect 14 0 19 0;
-#X connect 15 0 19 0;
-#X connect 16 0 19 0;
-#X connect 17 0 19 0;
-#X connect 18 0 19 0;
-#X connect 19 0 20 0;
-#X connect 21 0 1 0;
-#X connect 21 0 3 0;
-#X connect 21 0 5 0;
-#X connect 21 0 7 0;
-#X connect 21 0 9 0;
-#X connect 21 0 11 0;
+#X connect 11 0 21 0;
+#X connect 12 0 15 0;
+#X connect 13 0 14 0;
+#X connect 15 0 1 0;
+#X connect 15 0 3 0;
+#X connect 15 0 5 0;
+#X connect 15 0 7 0;
+#X connect 15 0 9 0;
+#X connect 15 0 11 0;
+#X connect 16 0 13 0;
+#X connect 17 0 13 0;
+#X connect 18 0 13 0;
+#X connect 19 0 13 0;
+#X connect 20 0 13 0;
+#X connect 21 0 13 0;
 #X restore 336 338 pd buffer;
 #X msg 207 149 close \, info;
 #X msg 125 149 open 0 \, info;
@@ -208,7 +208,8 @@
 #X text 41 358 analog = a <channel> <val>;
 #X obj 185 15 bng 85 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/sarcduino_off.png 1;
+#X obj 228 45 ggee/image @pd_extra/K12/objects/sarcduino_off.png 1
+;
 #X obj 302 46 loadbang;
 #X obj 336 24 select 0 1;
 #X obj 140 127 gate 2 1;
diff --git a/l2ork_addons/K12/sarcduino_digital.pd b/l2ork_addons/K12/sarcduino_digital.pd
index 2cd137e9a..36a7c2774 100755
--- a/l2ork_addons/K12/sarcduino_digital.pd
+++ b/l2ork_addons/K12/sarcduino_digital.pd
@@ -3,23 +3,23 @@
 #X obj 228 45 ggee/image @pd_extra/K12/objects/sarcduino_digital.png
 1;
 #X obj 228 -60 loadbang;
-#X obj 239 44 nbx 2 14 1 16 0 0 empty empty channel: -48 8 0 11 -262144
--1 -1 1 256 3;
+#X obj 239 44 nbx 2 14 0 15 0 0 empty empty channel: -48 8 0 11 -262144
+-1 -1 0 256 3;
 #X obj 128 -60 inlet;
 #X obj 245 -15 preset_node k12;
-#X obj 128 31 route 1;
 #X obj 128 -15 route list;
 #X obj 128 8 route d;
 #X obj 212 60 tgl 30 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X msg 228 -37 open @pd_extra/K12/objects/sarcduino_digital.png;
-#X connect 2 0 10 0;
+#X obj 128 31 route 0;
+#X connect 2 0 9 0;
 #X connect 3 0 5 0;
-#X connect 3 0 6 1;
-#X connect 4 0 7 0;
+#X connect 3 0 10 1;
+#X connect 4 0 6 0;
 #X connect 5 0 3 0;
-#X connect 6 0 9 0;
-#X connect 7 0 8 0;
-#X connect 8 0 6 0;
-#X connect 9 0 0 0;
+#X connect 6 0 7 0;
+#X connect 7 0 10 0;
+#X connect 8 0 0 0;
+#X connect 10 0 8 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/sarcduino_piezo.pd b/l2ork_addons/K12/sarcduino_piezo.pd
index 0fecc7dda..30d34a96e 100755
--- a/l2ork_addons/K12/sarcduino_piezo.pd
+++ b/l2ork_addons/K12/sarcduino_piezo.pd
@@ -3,12 +3,11 @@
 #X obj 228 45 ggee/image @pd_extra/K12/objects/sarcduino_piezo.png
 1;
 #X obj 228 -60 loadbang;
-#X obj 245 44 nbx 1 14 1 16 0 0 empty empty channel: -48 8 0 11 -262144
--1 -1 1 256 3;
+#X obj 245 44 nbx 1 14 0 15 0 0 empty empty channel: -48 8 0 11 -262144
+-1 -1 0 256 3;
 #X obj 128 -111 inlet;
 #X obj 245 -15 preset_node k12;
 #X obj 128 -43 route a;
-#X obj 128 -20 route 1;
 #X obj 128 -66 route list;
 #X obj 188 63 nbx 4 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 20
 -262144 -1 -1 0 256 3;
@@ -16,16 +15,17 @@
 #X obj 128 2 - 337;
 #X obj 128 46 abs;
 #X obj 128 24 / 337;
-#X connect 2 0 10 0;
+#X obj 128 -20 route 0;
+#X connect 2 0 9 0;
 #X connect 3 0 5 0;
-#X connect 3 0 7 1;
-#X connect 4 0 8 0;
+#X connect 3 0 13 1;
+#X connect 4 0 7 0;
 #X connect 5 0 3 0;
-#X connect 6 0 7 0;
-#X connect 7 0 11 0;
-#X connect 8 0 6 0;
-#X connect 9 0 0 0;
-#X connect 11 0 13 0;
-#X connect 12 0 9 0;
-#X connect 13 0 12 0;
+#X connect 6 0 13 0;
+#X connect 7 0 6 0;
+#X connect 8 0 0 0;
+#X connect 10 0 12 0;
+#X connect 11 0 8 0;
+#X connect 12 0 11 0;
+#X connect 13 0 10 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
-- 
GitLab