From 45e5a4d32cc992835d58aef9ae8cda8a5f084477 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Fri, 14 Aug 2015 18:49:32 -0400
Subject: [PATCH] ported: "*improved arduino icons" from pd-l2ork:
fb109233c5b8c2ed4bbc5d0f7598cff4e2ed7a10
---
l2ork_addons/K12/arduino_analog_in.pd | 44 +++++++--------
l2ork_addons/K12/arduino_analog_out.pd | 72 +++++++++++++------------
l2ork_addons/K12/arduino_digital_in.pd | 34 ++++++------
l2ork_addons/K12/arduino_digital_out.pd | 29 +++++-----
pd/src/pd.tk | 8 +--
5 files changed, 97 insertions(+), 90 deletions(-)
diff --git a/l2ork_addons/K12/arduino_analog_in.pd b/l2ork_addons/K12/arduino_analog_in.pd
index ef7aa634e..d548bc09f 100644
--- a/l2ork_addons/K12/arduino_analog_in.pd
+++ b/l2ork_addons/K12/arduino_analog_in.pd
@@ -1,7 +1,7 @@
-#N canvas 212 26 496 348 10;
+#N canvas 202 16 496 407 10;
#X obj 110 64 outlet;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog.png 1
-;
+#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog_in_off.png
+1;
#X obj 228 -60 loadbang;
#X obj 58 -60 inlet;
#X obj 240 -15 preset_node k12;
@@ -14,7 +14,7 @@
#X msg 224 202 symbol arduino-\$1;
#X symbolatom 228 62 3 0 0 0 - - -, f 3;
#X text 203 61 pin:;
-#N canvas 310 207 755 313 pin_parser 0;
+#N canvas 300 197 755 407 pin_parser 0;
#X obj 18 18 inlet;
#X obj 148 202 outlet;
#X obj 306 275 outlet;
@@ -26,10 +26,11 @@
#X msg 355 67 19;
#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 obj 18 45 sel A0 A1 A2 A3 A4 A5, f 68;
-#X connect 0 0 13 0;
+#X msg 423 220 open @pd_extra/K12/objects/arduino_analog_in_off.png
+;
+#X msg 307 250 open @pd_extra/K12/objects/arduino_analog_in.png;
+#X connect 0 0 11 0;
#X connect 3 0 1 0;
#X connect 3 0 9 0;
#X connect 4 0 1 0;
@@ -42,32 +43,33 @@
#X connect 7 0 9 0;
#X connect 8 0 1 0;
#X connect 8 0 9 0;
-#X connect 9 0 11 0;
+#X connect 9 0 13 0;
#X connect 10 0 12 0;
-#X connect 11 0 2 0;
+#X connect 11 0 3 0;
+#X connect 11 1 4 0;
+#X connect 11 2 5 0;
+#X connect 11 3 6 0;
+#X connect 11 4 7 0;
+#X connect 11 5 8 0;
+#X connect 11 6 10 0;
#X connect 12 0 2 0;
-#X connect 13 0 3 0;
-#X connect 13 1 4 0;
-#X connect 13 2 5 0;
-#X connect 13 3 6 0;
-#X connect 13 4 7 0;
-#X connect 13 5 8 0;
-#X connect 13 6 10 0;
+#X connect 13 0 2 0;
#X restore 277 104 pd pin_parser;
#X obj 110 41 route -1;
#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 msg 77 228 pinMode \$1 analog;
-#X connect 2 0 20 0;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_analog_in_off.png
+;
+#X connect 2 0 21 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 21 0;
+#X connect 7 0 20 0;
#X connect 8 0 9 0;
#X connect 8 1 7 0;
#X connect 8 2 10 0;
@@ -81,6 +83,6 @@
#X connect 15 0 0 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 connect 20 0 16 0;
+#X connect 21 0 1 0;
#X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/arduino_analog_out.pd b/l2ork_addons/K12/arduino_analog_out.pd
index b7fcf3ec0..a42270546 100644
--- a/l2ork_addons/K12/arduino_analog_out.pd
+++ b/l2ork_addons/K12/arduino_analog_out.pd
@@ -1,12 +1,12 @@
-#N canvas 595 62 500 399 10;
+#N canvas 575 42 500 407 10;
#X obj 58 308 outlet;
-#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog.png 1
-;
+#X obj 228 45 ggee/image @pd_extra/K12/objects/arduino_analog_out_off.png
+1;
#X obj 228 -60 loadbang;
#X obj 58 -60 inlet;
#X obj 240 -15 preset_node k12;
#X text 204 56 pin:;
-#N canvas 413 221 673 425 pin_parser 0;
+#N canvas 403 211 673 425 pin_parser 0;
#X obj 138 15 inlet;
#X obj 93 123 select 3 5 6 9 10 11, f 44;
#X obj 114 280 outlet;
@@ -19,14 +19,15 @@
#X msg 310 145 11;
#X obj 273 276 t b;
#X obj 354 276 t b;
-#X msg 354 298 open @pd_extra/K12/objects/arduino_analog_off.png;
-#X msg 273 338 open @pd_extra/K12/objects/arduino_analog.png;
#X obj 93 15 inlet;
#X obj 93 92 gate 2 1;
#X obj 138 67 f;
#X obj 93 37 t b f;
#X obj 387 123 split 2 13;
-#X connect 0 0 16 0;
+#X msg 354 298 open @pd_extra/K12/objects/arduino_analog_out_off.png
+;
+#X msg 273 338 open @pd_extra/K12/objects/arduino_analog_out.png;
+#X connect 0 0 14 0;
#X connect 1 0 4 0;
#X connect 1 1 5 0;
#X connect 1 2 6 0;
@@ -46,28 +47,27 @@
#X connect 8 0 10 0;
#X connect 9 0 2 0;
#X connect 9 0 10 0;
-#X connect 10 0 13 0;
-#X connect 11 0 12 0;
-#X connect 12 0 3 0;
-#X connect 13 0 3 0;
-#X connect 14 0 17 0;
-#X connect 15 0 1 0;
-#X connect 15 1 18 0;
-#X connect 16 0 15 1;
-#X connect 17 0 16 0;
-#X connect 17 1 15 0;
-#X connect 18 0 2 0;
-#X connect 18 0 10 0;
-#X connect 18 1 11 0;
+#X connect 10 0 18 0;
+#X connect 11 0 17 0;
+#X connect 12 0 15 0;
+#X connect 13 0 1 0;
+#X connect 13 1 16 0;
+#X connect 14 0 13 1;
+#X connect 15 0 14 0;
+#X connect 15 1 13 0;
+#X connect 16 0 2 0;
+#X connect 16 0 10 0;
+#X connect 16 1 11 0;
+#X connect 17 0 3 0;
+#X connect 18 0 3 0;
#X restore 284 160 pd pin_parser;
#X msg 267 237 pinMode \$1 pwm;
#X obj 284 182 t f f;
#X msg 58 244 pwm \$2 \$1;
#X obj 58 221 pack 0 0;
-#X obj 228 59 nbx 3 14 -1e+37 1e+37 0 1 empty empty empty 0 -8 0 10
--262144 -1 -1 2 256 3;
-#X msg 228 -37 open @pd_extra/K12/objects/arduino_analog_off.png;
-#X obj 238 74 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 228 59 nbx 3 14 -1 13 0 1 empty empty empty 0 -8 0 10 -262144
+-1 -1 -1 256 3;
+#X obj 238 74 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
#X text 200 71 servo:;
#X text 196 42 PWM OUTPUT;
@@ -76,24 +76,26 @@
#X msg 311 258 pinMode \$1 servo;
#X obj 239 130 t f f;
#X obj 239 108 + 1;
-#X connect 2 0 12 0;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_analog_out_off.png
+;
+#X connect 2 0 20 0;
#X connect 3 0 10 0;
#X connect 4 0 11 0;
#X connect 6 0 8 0;
#X connect 6 1 1 0;
#X connect 7 0 0 0;
#X connect 8 0 10 1;
-#X connect 8 1 17 1;
+#X connect 8 1 16 1;
#X connect 9 0 0 0;
#X connect 10 0 9 0;
#X connect 11 0 6 1;
-#X connect 12 0 1 0;
-#X connect 13 0 20 0;
-#X connect 16 0 13 0;
-#X connect 17 0 7 0;
-#X connect 17 1 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 19 1 17 0;
-#X connect 20 0 19 0;
+#X connect 12 0 19 0;
+#X connect 15 0 12 0;
+#X connect 16 0 7 0;
+#X connect 16 1 17 0;
+#X connect 17 0 0 0;
+#X connect 18 0 6 0;
+#X connect 18 1 16 0;
+#X connect 19 0 18 0;
+#X connect 20 0 1 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 57ad72ffe..af5216c7f 100644
--- a/l2ork_addons/K12/arduino_digital_in.pd
+++ b/l2ork_addons/K12/arduino_digital_in.pd
@@ -1,6 +1,6 @@
-#N canvas 305 164 503 355 10;
+#N canvas 295 154 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_in_off.png
1;
#X obj 228 -60 loadbang;
#X obj 58 -60 inlet;
@@ -11,14 +11,15 @@
#X obj 122 162 f, f 2;
#X obj 224 160 change;
#X msg 224 182 symbol arduino-\$1;
-#N canvas 770 373 537 255 pin_parser 0;
+#N canvas 760 363 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 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 199 136 open @pd_extra/K12/objects/arduino_digital_in.png;
+#X msg 228 112 open @pd_extra/K12/objects/arduino_digital_in_off.png
+;
#X connect 0 0 3 0;
#X connect 3 0 4 0;
#X connect 3 1 6 0;
@@ -30,18 +31,19 @@
#X obj 110 41 route -1;
#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 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 obj 230 64 nbx 3 14 -1 13 0 1 empty empty empty 0 -8 0 10 -262144
+-1 -1 -1 256 3;
#X msg 77 228 pinMode \$1 input;
#X obj 110 8 route d;
-#X connect 2 0 15 0;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_digital_in_off.png
+;
+#X connect 2 0 19 0;
#X connect 3 0 5 0;
-#X connect 4 0 17 0;
+#X connect 4 0 16 0;
#X connect 5 0 7 0;
-#X connect 5 1 19 0;
-#X connect 6 0 18 0;
+#X connect 5 1 18 0;
+#X connect 6 0 17 0;
#X connect 7 0 8 0;
#X connect 7 1 6 0;
#X connect 7 2 9 0;
@@ -52,8 +54,8 @@
#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 connect 16 0 11 0;
+#X connect 17 0 13 0;
+#X connect 18 0 12 0;
+#X connect 19 0 1 0;
#X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/l2ork_addons/K12/arduino_digital_out.pd b/l2ork_addons/K12/arduino_digital_out.pd
index 1ea531573..c308b6411 100644
--- a/l2ork_addons/K12/arduino_digital_out.pd
+++ b/l2ork_addons/K12/arduino_digital_out.pd
@@ -1,24 +1,24 @@
-#N canvas 316 152 503 325 10;
+#N canvas 306 142 503 325 10;
#X obj 58 237 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_out_off.png
1;
#X obj 228 -60 loadbang;
#X obj 58 -60 inlet;
#X obj 240 -15 preset_node k12;
-#N canvas 732 363 518 255 pin_parser 0;
+#N canvas 722 353 518 255 pin_parser 0;
#X obj 171 23 inlet;
#X obj 37 220 outlet;
#X obj 228 220 outlet;
#X obj 171 59 split 0 13;
#X obj 171 81 t f b;
-#X msg 198 139 open @pd_extra/K12/objects/arduino_digital.png;
-#X msg 228 109 open @pd_extra/K12/objects/arduino_digital_off.png
+#X msg 228 109 open @pd_extra/K12/objects/arduino_digital_out_off.png
;
+#X msg 198 139 open @pd_extra/K12/objects/arduino_digital_out.png;
#X connect 0 0 3 0;
#X connect 3 0 4 0;
-#X connect 3 1 6 0;
+#X connect 3 1 5 0;
#X connect 4 0 1 0;
-#X connect 4 1 5 0;
+#X connect 4 1 6 0;
#X connect 5 0 2 0;
#X connect 6 0 2 0;
#X restore 277 104 pd pin_parser;
@@ -27,13 +27,14 @@
#X msg 304 150 pinMode \$1 output;
#X msg 58 185 digital \$2 \$1;
#X text 208 45 OUTPUT;
-#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 11 0;
+#X obj 230 64 nbx 3 14 -1 13 0 1 empty empty empty 0 -8 0 10 -262144
+-1 -1 -1 256 3;
+#X msg 228 -37 open @pd_extra/K12/objects/arduino_digital_out_off.png
+;
+#X connect 2 0 13 0;
#X connect 3 0 7 0;
-#X connect 4 0 13 0;
+#X connect 4 0 12 0;
#X connect 5 0 6 0;
#X connect 5 1 1 0;
#X connect 6 0 7 1;
@@ -41,6 +42,6 @@
#X connect 7 0 9 0;
#X connect 8 0 0 0;
#X connect 9 0 0 0;
-#X connect 11 0 1 0;
-#X connect 13 0 5 0;
+#X connect 12 0 5 0;
+#X connect 13 0 1 0;
#X coords 0 -1 1 1 89 89 2 183 13;
diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 6c4aebd30..a9a710b93 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -409,10 +409,10 @@ proc pdtk_enable_k12_mode {extra_dir} {
image create photo i.wii_nunchuk_stick -file $extra_dir/K12/icons/wii_nunchuk_stick.png
image create photo i.arduino -file $extra_dir/K12/icons/arduino_on.png
- image create photo i.arduino_digital_in -file $extra_dir/K12/icons/arduino_digital.png
- image create photo i.arduino_digital_out -file $extra_dir/K12/icons/arduino_digital.png
- image create photo i.arduino_analog_in -file $extra_dir/K12/icons/arduino_analog.png
- image create photo i.arduino_analog_out -file $extra_dir/K12/icons/arduino_analog.png
+ image create photo i.arduino_digital_in -file $extra_dir/K12/icons/arduino_digital_in.png
+ image create photo i.arduino_digital_out -file $extra_dir/K12/icons/arduino_digital_out.png
+ image create photo i.arduino_analog_in -file $extra_dir/K12/icons/arduino_analog_in.png
+ image create photo i.arduino_analog_out -file $extra_dir/K12/icons/arduino_analog_out.png
#image create photo i.arduino_net -file $extra_dir/K12/icons/arduino_net.png
image create photo i.raspberry_digital -file $extra_dir/K12/icons/raspberrypi_gpio_digital_on.png
--
GitLab