From 4a60e3c2528378247f3b3387e5392a3c664bfc0c Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Tue, 18 Mar 2014 02:06:59 -0400
Subject: [PATCH] cleaned up and debugged abstractions for rpi k12

---
 l2ork_addons/K12/raspberrypi_analog_in.pd  | 82 ++++++++++++++--------
 l2ork_addons/K12/raspberrypi_analog_out.pd | 73 ++++++++++++-------
 l2ork_addons/K12/raspberrypi_digital.pd    | 71 +++++++++++--------
 3 files changed, 143 insertions(+), 83 deletions(-)

diff --git a/l2ork_addons/K12/raspberrypi_analog_in.pd b/l2ork_addons/K12/raspberrypi_analog_in.pd
index 940993177..7ccabbaec 100755
--- a/l2ork_addons/K12/raspberrypi_analog_in.pd
+++ b/l2ork_addons/K12/raspberrypi_analog_in.pd
@@ -1,36 +1,60 @@
-#N canvas 269 148 466 486 10;
-#X obj 258 290 outlet;
+#N canvas 262 148 466 522 10;
+#X obj 264 320 outlet;
 #X obj 228 45 ggee/image @pd_extra/K12/objects/raspberrypi_3008_analog_in_off.png
 1;
-#X obj 221 -161 loadbang;
-#X obj 239 41 nbx 2 14 -1 8 0 0 empty empty channel: -48 8 0 11 -262144
--1 -1 0 256 3;
-#X obj 290 14 preset_node k12;
-#X obj 221 -87 sel 0 1;
-#X obj 271 242 disis_spi;
-#X msg 324 184 open;
-#X msg 279 184 close;
-#X obj 279 163 sel -1, f 8;
-#X obj 258 268 switch 8 0;
-#X obj 138 163 > -1;
-#X obj 239 121 t f f f;
-#X obj 138 184 metro 100;
-#X msg 221 -63 open @pd_extra/K12/objects/raspberrypi_3008_analog_in_off.png
+#X obj 221 -151 loadbang;
+#X obj 241 51 nbx 2 14 -1 7 0 0 empty empty channel: -48 8 0 11 -262144
+-1 -1 -1 256 3;
+#X obj 290 4 preset_node k12;
+#X obj 221 -97 sel 0 1;
+#X obj 278 272 disis_spi;
+#X msg 323 238 open;
+#X msg 278 238 close;
+#X obj 264 298 switch 8 0;
+#X obj 174 218 metro 100;
+#X msg 221 -73 open @pd_extra/K12/objects/raspberrypi_3008_analog_in_off.png
 ;
-#X msg 228 -26 open @pd_extra/K12/objects/raspberrypi_3008_analog_in_on.png
+#X msg 228 -36 open @pd_extra/K12/objects/raspberrypi_3008_analog_in_on.png
 ;
+#X obj 241 218 + 1;
+#X obj 278 217 sel 0, f 8;
+#X obj 268 134 > -1;
+#X obj 268 155 change;
+#X obj 241 111 t f f;
+#X obj 268 176 t f f;
+#X obj 221 -120 change;
+#X obj 326 38 loadbang;
+#X msg 326 59 -1;
 #X connect 3 0 4 0;
-#X connect 3 0 12 0;
+#X connect 3 0 17 0;
 #X connect 4 0 3 0;
-#X connect 5 0 14 0;
-#X connect 5 1 15 0;
-#X connect 9 0 8 0;
-#X connect 9 1 7 0;
-#X connect 10 0 0 0;
-#X connect 11 0 13 0;
-#X connect 12 0 11 0;
-#X connect 12 1 10 0;
-#X connect 12 2 9 0;
-#X connect 14 0 1 0;
-#X connect 15 0 1 0;
+#X connect 5 0 11 0;
+#X connect 5 1 12 0;
+#X connect 6 0 9 1;
+#X connect 6 1 9 2;
+#X connect 6 2 9 3;
+#X connect 6 3 9 4;
+#X connect 6 4 9 5;
+#X connect 6 5 9 6;
+#X connect 6 6 9 7;
+#X connect 6 7 9 8;
+#X connect 6 8 19 0;
+#X connect 7 0 6 0;
+#X connect 8 0 6 0;
+#X connect 9 0 0 0;
+#X connect 10 0 6 0;
+#X connect 11 0 1 0;
+#X connect 12 0 1 0;
+#X connect 13 0 9 0;
+#X connect 14 0 8 0;
+#X connect 14 1 7 0;
+#X connect 15 0 16 0;
+#X connect 16 0 18 0;
+#X connect 17 0 13 0;
+#X connect 17 1 15 0;
+#X connect 18 0 10 0;
+#X connect 18 1 14 0;
+#X connect 19 0 5 0;
+#X connect 20 0 21 0;
+#X connect 21 0 3 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/raspberrypi_analog_out.pd b/l2ork_addons/K12/raspberrypi_analog_out.pd
index 6dd6428fb..ee2687501 100755
--- a/l2ork_addons/K12/raspberrypi_analog_out.pd
+++ b/l2ork_addons/K12/raspberrypi_analog_out.pd
@@ -1,40 +1,61 @@
-#N canvas 231 85 539 512 10;
-#X obj 292 314 outlet;
+#N canvas 396 92 455 542 10;
 #X obj 228 45 ggee/image @pd_extra/K12/objects/raspberrypi_gpio_analog_out_off.png
 1;
 #X obj 221 -161 loadbang;
-#X obj 227 56 nbx 2 14 0 10 0 0 empty empty empty -48 8 0 11 -262144
+#X obj 241 52 nbx 2 14 0 10 0 0 empty empty channel: -48 8 0 11 -262144
 -1 -1 0 256 3;
 #X obj 278 0 preset_node k12;
-#X obj 227 117 coll rpi_gpio.coll;
+#X obj 241 117 coll rpi_gpio.coll;
 #C restore;
-#X obj 292 285 disis_gpio;
-#X obj 155 197 inlet;
-#X msg 155 227 pwm \$1;
+#X obj 227 346 disis_gpio;
+#X obj 413 256 inlet;
+#X msg 368 307 pwm \$1;
 #X obj 222 -105 sel 0 1;
-#X msg 227 227 unexport \, export \$1 \, direction out \, open \, togglesoftpwm
-1;
-#X obj 205 55 cnv 15 52 15 empty \$0-r-cnv pin:0 4 7 0 11 -262144 -1
+#X obj 218 69 cnv 15 52 15 empty \$0-r-cnv pin:0 4 7 0 11 -262144 -99865
 0;
-#X obj 240 142 sprintf pin:%d;
-#X obj 240 163 tosymbol;
-#X msg 240 184 label \$1;
-#X obj 240 205 s \$0-r-cnv;
+#X obj 241 141 sprintf pin:%d;
+#X obj 241 162 tosymbol;
+#X msg 241 183 label \$1;
+#X obj 241 204 s \$0-r-cnv;
 #X msg 222 -83 open @pd_extra/K12/objects/raspberrypi_gpio_analog_out_off.png
 ;
 #X msg 246 -44 open @pd_extra/K12/objects/raspberrypi_gpio_analog_out_on.png
 ;
-#X connect 3 0 4 0;
-#X connect 3 0 5 0;
-#X connect 4 0 3 0;
-#X connect 5 0 10 0;
-#X connect 5 0 12 0;
-#X connect 7 0 8 0;
-#X connect 9 0 16 0;
-#X connect 9 1 17 0;
+#X obj 368 286 gate 1 0;
+#X obj 145 203 sel 0;
+#X obj 145 181 change;
+#X obj 222 -128 change;
+#X msg 335 200 togglesoftpwm 1;
+#X obj 335 178 loadbang;
+#X msg 145 227 unexport;
+#X msg 227 227 unexport \, export \$1 \, direction out \, open;
+#X obj 306 36 loadbang;
+#X msg 306 57 0;
+#X connect 2 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 2 0;
+#X connect 4 0 10 0;
+#X connect 4 0 18 0;
+#X connect 5 1 16 0;
+#X connect 5 1 19 0;
+#X connect 6 0 16 1;
+#X connect 7 0 5 0;
+#X connect 8 0 14 0;
+#X connect 8 1 15 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
 #X connect 12 0 13 0;
-#X connect 13 0 14 0;
-#X connect 14 0 15 0;
-#X connect 16 0 1 0;
-#X connect 17 0 1 0;
+#X connect 14 0 0 0;
+#X connect 15 0 0 0;
+#X connect 16 0 7 0;
+#X connect 17 0 22 0;
+#X connect 17 1 23 0;
+#X connect 18 0 17 0;
+#X connect 19 0 8 0;
+#X connect 20 0 5 0;
+#X connect 21 0 20 0;
+#X connect 22 0 5 0;
+#X connect 23 0 5 0;
+#X connect 24 0 25 0;
+#X connect 25 0 2 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/raspberrypi_digital.pd b/l2ork_addons/K12/raspberrypi_digital.pd
index 886839b12..322f89614 100755
--- a/l2ork_addons/K12/raspberrypi_digital.pd
+++ b/l2ork_addons/K12/raspberrypi_digital.pd
@@ -1,18 +1,16 @@
-#N canvas 257 133 627 499 10;
+#N canvas 257 133 436 499 10;
 #X obj 292 314 outlet;
 #X obj 228 45 ggee/image @pd_extra/K12/objects/raspberrypi_gpio_digital_off.png
 1;
 #X obj 221 -161 loadbang;
-#X obj 223 50 nbx 2 14 0 10 0 0 empty empty empty -48 8 0 11 -262144
+#X obj 240 43 nbx 2 14 0 10 0 0 empty empty channel: -48 8 0 11 -262144
 -1 -1 0 256 3;
 #X obj 283 8 preset_node k12;
-#X obj 398 114 coll rpi_gpio.coll;
+#X obj 458 114 coll rpi_gpio.coll;
 #C restore;
 #X obj 292 285 disis_gpio;
-#X obj 229 67 hradio 15 1 0 2 empty empty I/O: -25 7 0 10 -262144 -260097
+#X obj 229 77 hradio 15 1 0 2 empty empty I/O: -25 7 0 10 -262144 -260097
 -1 0;
-#X text 231 65 I;
-#X text 247 65 O;
 #X msg 323 196 symbol out;
 #X msg 258 196 symbol in;
 #X obj 276 149 select 0 1, f 11;
@@ -24,35 +22,52 @@
 #X obj 230 -98 sel 0 1;
 #X msg 276 226 direction \$1 \, open;
 #X msg 398 226 unexport \, export \$1;
-#X obj 201 51 cnv 15 52 15 empty \$0-r-cnv pin:0 4 7 0 11 -262144 -1
+#X obj 217 58 cnv 15 52 15 empty \$0-r-cnv pin:0 4 7 0 11 -262144 -99865
 0;
-#X obj 410 140 sprintf pin:%d;
-#X obj 410 161 tosymbol;
-#X msg 410 182 label \$1;
-#X obj 410 203 s \$0-r-cnv;
+#X obj 470 140 sprintf pin:%d;
+#X obj 470 161 tosymbol;
+#X msg 470 182 label \$1;
+#X obj 470 203 s \$0-r-cnv;
 #X msg 221 -76 open @pd_extra/K12/objects/raspberrypi_gpio_digital_off.png
 ;
 #X msg 249 -53 open @pd_extra/K12/objects/raspberrypi_gpio_digital_on.png
 ;
+#X obj 230 -120 change;
+#X obj 431 92 t b f;
+#X obj 407 141 select 0;
+#X msg 407 164 unexport;
+#X text 231 75 i;
+#X text 246 75 o;
 #X connect 3 0 4 0;
-#X connect 3 0 5 0;
+#X connect 3 0 27 0;
 #X connect 4 0 3 0;
 #X connect 5 0 20 0;
-#X connect 5 0 22 0;
-#X connect 7 0 12 0;
-#X connect 7 0 13 0;
-#X connect 10 0 19 0;
-#X connect 11 0 19 0;
-#X connect 12 0 11 0;
-#X connect 12 1 10 0;
-#X connect 13 0 14 0;
-#X connect 14 0 15 0;
-#X connect 16 0 7 0;
-#X connect 18 0 26 0;
-#X connect 18 1 27 0;
+#X connect 5 0 28 0;
+#X connect 6 0 0 0;
+#X connect 6 1 26 0;
+#X connect 7 0 10 0;
+#X connect 7 0 11 0;
+#X connect 8 0 17 0;
+#X connect 9 0 17 0;
+#X connect 10 0 9 0;
+#X connect 10 1 8 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 13 0 6 0;
+#X connect 14 0 7 0;
+#X connect 15 0 6 0;
+#X connect 16 0 24 0;
+#X connect 16 1 25 0;
+#X connect 17 0 6 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
 #X connect 22 0 23 0;
-#X connect 23 0 24 0;
-#X connect 24 0 25 0;
-#X connect 26 0 1 0;
-#X connect 27 0 1 0;
+#X connect 24 0 1 0;
+#X connect 25 0 1 0;
+#X connect 26 0 16 0;
+#X connect 27 0 7 0;
+#X connect 27 1 5 0;
+#X connect 28 0 29 0;
+#X connect 28 1 18 0;
+#X connect 29 0 6 0;
 #X coords 0 -1 1 1 89 89 2 183 13;
-- 
GitLab