aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-06-26 23:05:49 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-06-26 23:05:49 +0000
commit28c8901bc909fd79b5f09ca1cbe90dcee2943a13 (patch)
treefbadbe08589c230248dab336bc2b333b7416b634
parentc6be69970a25abc8a22c350e9486455aaec086eb (diff)
added support for new samplingInterval message
svn path=/trunk/externals/hardware/arduino/; revision=11821
-rw-r--r--arduino-test.pd21
-rw-r--r--arduino.pd50
2 files changed, 52 insertions, 19 deletions
diff --git a/arduino-test.pd b/arduino-test.pd
index e4a38c3..f6ffd9d 100644
--- a/arduino-test.pd
+++ b/arduino-test.pd
@@ -1,4 +1,4 @@
-#N canvas 59 22 647 505 10;
+#N canvas 201 41 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
@@ -69,13 +69,13 @@
#X obj 267 302 tgl 15 1 empty empty empty 0 -6 0 8 -225271 -1 -1 1
1;
#X msg 437 220 digitalIns 0 0;
-#X msg 437 165 analogIns 0 0;
+#X msg 437 165 analogIns 0 1;
#N canvas 162 133 610 460 serin 0;
#X obj 59 337 outlet;
#X obj 59 266 trigger bang anything;
#X obj 201 286 list;
#X obj 60 61 tgl 15 0 junk_to_hide_inlet ARDUINO_TEST_RESET 0 5 9 1
-12 -262130 -1 -1 0 1;
+12 -262130 -1 -1 1 1;
#X obj 75 61 tgl 15 0 junk_to_hide_inlet ARDUINO_TEST_RESET 1 5 9 1
12 -262130 -1 -1 0 1;
#X obj 90 61 tgl 15 0 junk_to_hide_inlet ARDUINO_TEST_RESET 2 5 9 1
@@ -328,7 +328,7 @@
#X msg 91 338 port 0 \$1;
#X msg 230 338 port 2 \$1;
#X obj 362 297 tgl 25 0 empty ARDUINO_TEST_RESET ALL 2 12 0 12 -262144
--1 -1 255 255;
+-1 -1 0 255;
#X obj 362 246 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0
16383;
#X obj 362 266 metro 100;
@@ -466,8 +466,8 @@
#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 empty 4 10 0 12
--203904 -1 0;
+#X obj 250 100 cnv 15 145 17 empty \$0-version_cnv Firmata-2.1 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;
@@ -609,7 +609,7 @@
#X connect 0 0 1 0;
#X connect 1 0 2 0;
#X restore 482 393 pd STRING;
-#N canvas 284 22 487 372 strings 0;
+#N canvas 205 22 593 390 strings 0;
#X obj -178 287 outlet;
#X obj -142 101 moocow/any2string;
#X symbolatom -92 48 10 0 0 0 - - -;
@@ -626,6 +626,10 @@
#X msg -310 41 TEST;
#X obj -313 153 cyclone/prepend sysex;
#X obj -313 131 cyclone/prepend 40;
+#X msg 66 117 samplingInterval \$1;
+#X obj 69 93 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2000 1;
+#X floatatom 27 117 5 0 0 0 - - -;
#X connect 1 0 7 0;
#X connect 2 0 4 0;
#X connect 4 0 1 0;
@@ -641,6 +645,9 @@
#X connect 14 0 0 0;
#X connect 14 0 10 0;
#X connect 15 0 14 0;
+#X connect 16 0 0 0;
+#X connect 17 0 16 0;
+#X connect 17 0 18 0;
#X restore 437 242 pd strings and special messages;
#X obj 397 369 route digital version string sysex;
#X text 397 483 released under the GNU GPL v2 or later;
diff --git a/arduino.pd b/arduino.pd
index eee184d..ada95f7 100644
--- a/arduino.pd
+++ b/arduino.pd
@@ -1,10 +1,10 @@
-#N canvas 559 528 585 366 10;
+#N canvas 16 261 585 366 10;
#X obj 32 26 inlet;
#X obj 32 304 outlet;
#X obj 515 304 outlet;
-#N canvas 100 292 813 345 command 0;
+#N canvas 47 171 822 340 command 0;
#X obj 24 7 inlet;
-#X obj 281 289 outlet;
+#X obj 299 298 outlet;
#N canvas 75 439 547 478 digital-out 0;
#X obj 4 15 inlet;
#X obj 284 440 outlet;
@@ -125,7 +125,7 @@
#X connect 9 0 6 1;
#X restore 24 94 pd pwm;
#X msg 307 94 info;
-#X msg 510 136 249;
+#X msg 500 136 249;
#N canvas 0 22 462 312 analogIns 0;
#X obj 64 7 inlet;
#X obj 69 263 outlet;
@@ -167,11 +167,11 @@
#X connect 5 0 3 0;
#X connect 6 0 5 0;
#X restore 150 94 pd digitalIns;
-#X msg 569 136 240 \, 121 \, 247;
-#X obj 510 116 bang;
-#X obj 569 115 bang;
+#X msg 536 137 240 \, 121 \, 247;
+#X obj 500 116 bang;
+#X obj 536 116 bang;
#X obj 24 51 route pwm analog analogIns digitalIns pinMode info;
-#N canvas 624 420 451 466 sysex 0;
+#N canvas 626 419 451 466 sysex 0;
#X obj 62 424 outlet;
#X obj 28 22 inlet;
#X obj 28 145 list split 1;
@@ -240,8 +240,8 @@
#X connect 16 0 2 0;
#X connect 16 1 17 0;
#X connect 17 0 3 1;
-#X restore 662 136 pd sysex;
-#X obj 662 114 route sysex string;
+#X restore 697 136 pd sysex;
+#X obj 697 114 route sysex string;
#N canvas 107 510 569 343 port-out 0;
#X obj 13 15 inlet;
#X obj 167 281 outlet;
@@ -283,7 +283,31 @@
#X connect 17 0 18 1;
#X connect 18 0 16 0;
#X restore 425 122 pd port-out;
-#X obj 361 77 route digital port version firmware;
+#X obj 361 77 route digital port version firmware samplingInterval
+;
+#N canvas 0 22 450 300 samplingInterval 0;
+#X obj 172 226 outlet;
+#X obj 78 21 inlet;
+#X text 225 34 LSB;
+#X obj 167 131 % 128;
+#X text 208 131 only 7-bits of data allowed;
+#X text 173 33 MSB;
+#X obj 167 77 >> 7;
+#X obj 79 51 trigger bang anything anything bang;
+#X msg 219 89 240 \, 120;
+#X text 284 90 START_SYSEX then 0x78;
+#X msg 59 102 247;
+#X text 89 101 END_SYSEX;
+#X connect 1 0 7 0;
+#X connect 3 0 0 0;
+#X connect 6 0 3 0;
+#X connect 7 0 10 0;
+#X connect 7 1 6 0;
+#X connect 7 2 3 0;
+#X connect 7 3 8 0;
+#X connect 8 0 0 0;
+#X connect 10 0 0 0;
+#X restore 572 110 pd samplingInterval;
#X connect 0 0 12 0;
#X connect 2 0 1 0;
#X connect 3 0 1 0;
@@ -312,7 +336,9 @@
#X connect 16 1 15 0;
#X connect 16 2 10 0;
#X connect 16 3 11 0;
-#X connect 16 4 14 0;
+#X connect 16 4 17 0;
+#X connect 16 5 14 0;
+#X connect 17 0 1 0;
#X restore 32 59 pd command processing;
#X text 28 8 processed input;
#X obj 381 95 loadbang;