From 33b8d4a1521062bfaeca896aff95c48413981ae0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 8 Sep 2008 21:25:04 +0000 Subject: - removed old, debug right/cold inlet from [arduino] - converted the right outlet on [arduino] to output status info, as it should be. Right now, it is just info directly from [comport]. svn path=/trunk/externals/hardware/arduino/; revision=10280 --- arduino-test.pd | 242 ++++++++++++++++++++++---------------------------------- arduino.pd | 52 ++++++------ 2 files changed, 118 insertions(+), 176 deletions(-) diff --git a/arduino-test.pd b/arduino-test.pd index 01d190c..37d7c63 100644 --- a/arduino-test.pd +++ b/arduino-test.pd @@ -1,4 +1,4 @@ -#N canvas 43 22 647 505 10; +#N canvas 41 22 647 505 10; #X obj 323 116 cnv 15 100 22 empty empty empty 20 12 0 14 -253938 -66577 0; #X obj 33 145 cnv 15 70 22 empty empty empty 20 12 0 14 -253938 -66577 @@ -50,12 +50,8 @@ #X restore 161 149 pd serin; #X text 158 131 serial port #; #X msg 221 172 close; -#X obj 532 310 tgl 15 0 empty empty changes 0 -6 0 8 -262144 -1 -1 -0 1; -#X obj 479 310 tgl 15 0 empty empty all 0 -6 0 8 -262144 -1 -1 0 1 -; #X obj 98 99 hsl 150 17 0 1 0 0 empty empty PWM_control_(0-1) -2 -6 -1 10 -225271 -1 -1 0 0; +1 10 -225271 -1 -1 1200 0; #X obj 277 312 tgl 15 1 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1; #X msg 437 220 digitalIns 0 0; @@ -113,60 +109,6 @@ #X connect 20 0 0 0; #X coords 0 -1 1 1 120 16 1 60 60; #X restore 437 145 pd serin; -#N canvas 77 268 490 340 debugging 0; -#X obj 136 31 inlet; -#X obj 324 29 inlet; -#X obj 27 31 inlet; -#X obj 212 81 spigot; -#X obj 209 106 select 255; -#X obj 234 246 print; -#X obj 234 227 list; -#X obj 93 115 spigot; -#X obj 260 201 bang; -#X obj 231 138 mapping/tolist; -#X obj 258 181 change; -#X obj 258 159 list-abs/list-len; -#X obj 93 136 print DEBUG; -#N canvas 0 22 478 328 measure 0; -#X obj 93 18 inlet; -#X obj 93 260 outlet; -#X obj 93 129 purepd/alternate; -#X obj 93 175 timer; -#X obj 186 150 bang; -#X obj 93 150 bang; -#X obj 200 20 tgl 18 0 empty empty empty 0 -6 0 10 -232576 -1 -1 0 -1; -#X obj 93 56 spigot 0; -#X obj 93 94 select 224; -#X connect 0 0 7 0; -#X connect 2 0 5 0; -#X connect 2 1 4 0; -#X connect 3 0 1 0; -#X connect 4 0 3 1; -#X connect 5 0 3 0; -#X connect 6 0 7 1; -#X connect 7 0 8 0; -#X connect 8 0 2 0; -#X coords 0 -1 1 1 85 18 1 200 20; -#X restore 19 178 pd measure; -#X floatatom 19 201 8 0 0 0 - - -; -#X connect 0 0 7 1; -#X connect 1 0 3 1; -#X connect 2 0 7 0; -#X connect 2 0 3 0; -#X connect 2 0 13 0; -#X connect 3 0 4 0; -#X connect 4 0 9 1; -#X connect 4 1 9 0; -#X connect 6 0 5 0; -#X connect 7 0 12 0; -#X connect 8 0 6 0; -#X connect 9 0 6 1; -#X connect 9 0 11 0; -#X connect 10 0 8 0; -#X connect 11 0 10 0; -#X connect 13 0 14 0; -#X restore 427 328 pd debugging stuff; #X floatatom 22 426 5 0 0 3 a0 - -; #X floatatom 68 426 5 0 0 3 a1 - -; #X floatatom 114 426 5 0 0 3 a2 - -; @@ -175,7 +117,7 @@ #X floatatom 252 426 5 0 0 3 a5 - -; #X text 300 291 <- argument sets port #; #X obj 40 71 hradio 15 1 0 14 empty empty empty 0 -6 0 8 -176124 -1 --1 0; +-1 6; #X text 148 57 7; #X text 42 57 0; #X text 189 57 10; @@ -231,7 +173,7 @@ #X connect 16 0 17 0; #X connect 17 0 14 0; #X restore 41 125 pd pwm; -#X msg 41 147 pwm 11 0; +#X msg 41 147 pwm 6 0.0805369; #X msg 319 155 info; #X msg 358 155 version; #X obj 230 312 spigot; @@ -248,12 +190,12 @@ #X obj 533 77 tgl 15 1 empty empty 12 0 -6 1 12 -260818 -1 -1 1 1; #X obj 550 77 tgl 15 1 empty empty 13 0 -6 1 12 -260818 -1 -1 1 1; #X text 328 44 turn on output mode for each pin (off=input); -#X msg 329 118 pinMode 13 1; +#X msg 329 118 pinMode 6 1; #N canvas 69 607 475 352 sending 0; #X obj 69 208 cnv 15 100 22 empty empty empty 20 12 0 14 -253938 -66577 0; #X obj 78 264 outlet; -#X msg 78 211 digital 2 0; +#X msg 78 211 digital 6 0; #X obj 197 148 tgl 15 0 empty empty 7 4 -6 1 12 -233017 -1 -1 0 1; #X obj 214 148 tgl 15 0 empty empty 8 4 -6 1 12 -233017 -1 -1 0 1; #X obj 231 148 tgl 15 0 empty empty 9 4 -6 1 12 -233017 -1 -1 0 1; @@ -451,16 +393,11 @@ ; #X obj 615 455 tgl 15 0 empty empty 13 0 23 1 12 -232448 -1 -1 0 1 ; -#N canvas 0 22 454 304 raw 0; -#X obj 96 231 outlet; -#X msg 96 127 240 \, 121 \, 247; -#X connect 1 0 0 0; -#X restore 374 272 pd raw PWM; #X text 2 484 (C) Copyright 2006 Free Software Foundation; #N canvas 0 22 451 224 ver 0; #X obj 23 7 inlet; -#X obj 250 100 cnv 15 145 17 empty \$0-version_cnv Firmata-2.0 4 10 -0 12 -203904 -1 0; +#X obj 250 100 cnv 15 145 17 empty \$0-version_cnv empty 4 10 0 12 +-203904 -1 0; #X obj 23 157 send \$0-version_cnv; #X msg 23 132 label \$1; #X obj 48 103 symbol; @@ -683,82 +620,91 @@ Arduino (also known as Pduino firmware).; #X obj 12 320 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; -#X connect 3 0 93 0; +#N canvas 77 268 404 287 device 0; +#X obj 102 61 inlet; +#X obj 102 119 route open port ports; +#X obj 102 170 tgl 15 0 empty empty open -3 20 0 10 -262144 -1 -1 1 +1; +#X floatatom 143 171 5 0 0 3 port - -; +#X obj 184 171 print comport_ports; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 1 1 3 0; +#X connect 1 2 4 0; +#X restore 387 323 pd device info; +#X connect 3 0 89 0; #X connect 4 0 3 0; #X connect 4 1 6 0; -#X connect 6 0 93 0; -#X connect 7 0 14 2; -#X connect 8 0 14 1; -#X connect 9 0 37 1; -#X connect 10 0 41 1; -#X connect 11 0 93 0; -#X connect 12 0 93 0; -#X connect 13 0 12 0; -#X connect 22 0 37 0; -#X connect 37 0 38 0; -#X connect 38 0 93 0; -#X connect 39 0 93 0; -#X connect 40 0 93 0; -#X connect 41 0 61 0; -#X connect 42 0 83 2; -#X connect 43 0 83 3; -#X connect 44 0 83 4; -#X connect 45 0 83 5; -#X connect 46 0 83 6; -#X connect 47 0 83 7; -#X connect 48 0 83 8; -#X connect 49 0 83 9; -#X connect 50 0 83 10; -#X connect 51 0 83 11; -#X connect 52 0 83 12; -#X connect 53 0 83 13; -#X connect 55 0 93 0; -#X connect 56 0 93 0; -#X connect 57 0 56 0; -#X connect 61 0 62 0; -#X connect 61 1 100 0; -#X connect 62 0 63 0; -#X connect 62 1 63 1; -#X connect 62 2 63 2; -#X connect 62 3 63 3; -#X connect 62 4 63 4; -#X connect 62 5 63 5; -#X connect 62 6 63 6; -#X connect 62 7 63 7; -#X connect 63 0 15 0; -#X connect 63 1 16 0; -#X connect 63 2 17 0; -#X connect 63 3 18 0; -#X connect 63 4 19 0; -#X connect 63 5 20 0; -#X connect 63 6 59 0; -#X connect 63 7 60 0; -#X connect 64 2 65 0; -#X connect 64 3 66 0; -#X connect 64 4 67 0; -#X connect 64 5 68 0; -#X connect 64 6 69 0; -#X connect 64 7 70 0; -#X connect 64 8 71 0; -#X connect 64 9 72 0; -#X connect 64 10 73 0; -#X connect 64 11 74 0; -#X connect 64 12 75 0; -#X connect 64 13 76 0; -#X connect 77 0 93 1; -#X connect 79 0 94 0; -#X connect 80 0 81 0; -#X connect 80 1 82 0; -#X connect 83 0 55 0; -#X connect 93 0 41 0; -#X connect 93 0 79 0; -#X connect 93 1 14 0; -#X connect 95 0 93 0; -#X connect 96 0 93 0; -#X connect 99 0 93 0; -#X connect 100 0 64 0; -#X connect 100 1 80 0; -#X connect 100 2 97 0; -#X connect 100 3 98 0; -#X connect 103 0 11 0; -#X connect 105 0 79 0; +#X connect 6 0 89 0; +#X connect 7 0 34 1; +#X connect 8 0 38 1; +#X connect 9 0 89 0; +#X connect 10 0 89 0; +#X connect 11 0 10 0; +#X connect 19 0 34 0; +#X connect 34 0 35 0; +#X connect 35 0 89 0; +#X connect 36 0 89 0; +#X connect 37 0 89 0; +#X connect 38 0 58 0; +#X connect 39 0 79 2; +#X connect 40 0 79 3; +#X connect 41 0 79 4; +#X connect 42 0 79 5; +#X connect 43 0 79 6; +#X connect 44 0 79 7; +#X connect 45 0 79 8; +#X connect 46 0 79 9; +#X connect 47 0 79 10; +#X connect 48 0 79 11; +#X connect 49 0 79 12; +#X connect 50 0 79 13; +#X connect 52 0 89 0; +#X connect 53 0 89 0; +#X connect 54 0 53 0; +#X connect 58 0 59 0; +#X connect 58 1 96 0; +#X connect 59 0 60 0; +#X connect 59 1 60 1; +#X connect 59 2 60 2; +#X connect 59 3 60 3; +#X connect 59 4 60 4; +#X connect 59 5 60 5; +#X connect 59 6 60 6; +#X connect 59 7 60 7; +#X connect 60 0 12 0; +#X connect 60 1 13 0; +#X connect 60 2 14 0; +#X connect 60 3 15 0; +#X connect 60 4 16 0; +#X connect 60 5 17 0; +#X connect 60 6 56 0; +#X connect 60 7 57 0; +#X connect 61 2 62 0; +#X connect 61 3 63 0; +#X connect 61 4 64 0; +#X connect 61 5 65 0; +#X connect 61 6 66 0; +#X connect 61 7 67 0; +#X connect 61 8 68 0; +#X connect 61 9 69 0; +#X connect 61 10 70 0; +#X connect 61 11 71 0; +#X connect 61 12 72 0; +#X connect 61 13 73 0; +#X connect 75 0 90 0; +#X connect 76 0 77 0; +#X connect 76 1 78 0; +#X connect 79 0 52 0; +#X connect 89 0 38 0; +#X connect 89 0 75 0; +#X connect 89 1 102 0; +#X connect 91 0 89 0; +#X connect 92 0 89 0; +#X connect 95 0 89 0; +#X connect 96 0 61 0; +#X connect 96 1 76 0; +#X connect 96 2 93 0; +#X connect 96 3 94 0; +#X connect 99 0 9 0; +#X connect 101 0 75 0; diff --git a/arduino.pd b/arduino.pd index 8d1e763..b4047ab 100644 --- a/arduino.pd +++ b/arduino.pd @@ -1,7 +1,7 @@ -#N canvas 91 22 644 371 10; -#X obj 61 19 inlet; -#X obj 61 297 outlet; -#X obj 544 297 outlet; +#N canvas 91 22 585 366 10; +#X obj 32 26 inlet; +#X obj 32 304 outlet; +#X obj 515 304 outlet; #N canvas 441 370 712 343 command 0; #X obj 24 7 inlet; #X obj 281 289 outlet; @@ -244,18 +244,16 @@ #X connect 15 0 14 0; #X connect 15 1 14 1; #X connect 15 2 1 0; -#X restore 61 52 pd command processing; -#X obj 319 19 inlet; -#X text 306 1 raw input; -#X text 57 1 processed input; -#X obj 410 88 loadbang; +#X restore 32 59 pd command processing; +#X text 28 8 processed input; +#X obj 381 95 loadbang; #N canvas 0 22 462 312 report 0; #X obj 95 26 inlet; #X obj 97 186 print [arduino]; #X msg 93 87 version_0.4; #X connect 0 0 2 0; #X connect 2 0 1 0; -#X restore 410 112 pd report object version; +#X restore 381 119 pd report object version; #N canvas 0 22 395 210 report 0; #X obj 62 21 inlet; #X obj 62 50 route open; @@ -269,8 +267,7 @@ #X connect 2 0 6 0; #X connect 4 0 3 0; #X connect 6 0 4 0; -#X restore 231 113 pd report firmware version; -#X text 335 299 DEBUG/RAW data (this will change); +#X restore 202 120 pd report firmware version; #N canvas 590 536 467 421 make 0; #X obj 28 6 inlet; #X obj 184 377 outlet; @@ -349,7 +346,7 @@ #X connect 12 0 13 0; #X connect 12 1 3 0; #X connect 13 0 5 1; -#X restore 61 194 pd make lists; +#X restore 32 201 pd make lists; #N canvas 0 22 525 269 check 0; #X obj 47 62 inlet; #X obj 47 88 route version; @@ -365,8 +362,8 @@ with; #X connect 1 0 4 0; #X connect 2 0 5 0; #X connect 5 1 3 0; -#X restore 81 250 pd check version; -#X obj 61 136 flatspace/comport \$1 115200; +#X restore 52 257 pd check version; +#X obj 32 143 flatspace/comport \$1 115200; #N canvas 666 625 541 319 convert 0; #X obj 142 278 outlet; #X obj 340 150 print UNKNOWN_INPUT_COMMAND; @@ -641,17 +638,16 @@ byte left over; #X connect 7 1 5 0; #X connect 7 2 6 0; #X connect 9 0 0 0; -#X restore 61 222 pd convert to symbolic commands; -#X text 14 337 (C) Copyright 2006-2008 Free Software Foundation; -#X text 321 336 released under the GNU GPL v2 or later; +#X restore 32 229 pd convert to symbolic commands; +#X text 27 331 (C) Copyright 2006-2008 Free Software Foundation; +#X text 334 330 released under the GNU GPL v2 or later; #X connect 0 0 3 0; -#X connect 3 0 13 0; -#X connect 4 0 13 0; -#X connect 7 0 8 0; -#X connect 9 0 3 0; -#X connect 11 0 14 0; -#X connect 13 0 2 0; -#X connect 13 0 11 0; -#X connect 13 1 9 0; -#X connect 14 0 1 0; -#X connect 14 0 12 0; +#X connect 3 0 10 0; +#X connect 5 0 6 0; +#X connect 7 0 3 0; +#X connect 8 0 11 0; +#X connect 10 0 8 0; +#X connect 10 1 7 0; +#X connect 10 1 2 0; +#X connect 11 0 1 0; +#X connect 11 0 9 0; -- cgit v1.2.1