From 02eddfbe224b8ba68d1831aade213033dac3ec71 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Sat, 16 Nov 2013 21:22:16 -0500 Subject: [PATCH] improved logic for passthrough mode based on what is connected --- l2ork_addons/K12/wii_accelerometer-help.pd | 0 l2ork_addons/K12/wii_connect.pd | 37 ++++++++-- .../K12/wii_nunchuk_accelerometer-help.pd | 0 l2ork_addons/K12/wii_nunchuk_accelerometer.pd | 73 ++++++++++++++----- l2ork_addons/K12/wii_nunchuk_buttons-help.pd | 0 l2ork_addons/K12/wii_nunchuk_buttons.pd | 69 +++++++++++++----- l2ork_addons/K12/wii_nunchuk_hit-help.pd | 0 l2ork_addons/K12/wii_nunchuk_hit.pd | 51 ++++++++++--- l2ork_addons/K12/wii_nunchuk_stick-help.pd | 0 l2ork_addons/K12/wii_nunchuk_stick.pd | 61 ++++++++++++---- l2ork_addons/K12/wii_speed.pd | 40 +++++----- l2ork_addons/K12/wii_speed_xry-help.pd | 0 l2ork_addons/K12/wii_speed_xry.pd | 0 13 files changed, 244 insertions(+), 87 deletions(-) mode change 100644 => 100755 l2ork_addons/K12/wii_accelerometer-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_accelerometer-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_buttons-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_buttons.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_hit-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_hit.pd mode change 100644 => 100755 l2ork_addons/K12/wii_nunchuk_stick-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_speed_xry-help.pd mode change 100644 => 100755 l2ork_addons/K12/wii_speed_xry.pd diff --git a/l2ork_addons/K12/wii_accelerometer-help.pd b/l2ork_addons/K12/wii_accelerometer-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_connect.pd b/l2ork_addons/K12/wii_connect.pd index b0353b854..6660c1fcb 100755 --- a/l2ork_addons/K12/wii_connect.pd +++ b/l2ork_addons/K12/wii_connect.pd @@ -1,14 +1,14 @@ -#N canvas 456 127 558 396 10; +#N canvas 570 134 558 396 10; #X obj 337 311 disis_wiimote; #X obj 337 78 bng 76 250 50 0 empty connect_r empty 17 7 0 10 -258699 -1 -262144; #X obj 337 333 outlet; -#N canvas 372 128 648 266 running_the_wiimote 0; +#N canvas 96 309 648 345 running_the_wiimote 0; #X obj 20 8 inlet; -#X obj 20 238 outlet; +#X obj 20 318 outlet; #X msg 20 113 discover; #X obj 191 84 metro 100; -#X obj 191 55 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +#X obj 191 55 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1; #X msg 262 84 reportAcceleration \$1; #X obj 262 57 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 @@ -19,10 +19,24 @@ #X text 281 5 On connection \, start these; #X msg 94 113 disconnect; #X obj 94 8 inlet; -#X msg 408 84 reportExpansion \$1 \, togglePassthrough \$1; +#X msg 408 84 reportExpansion \$1; +#X obj 408 230 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 +1; +#X msg 408 271 togglePassthrough \$1; +#X obj 191 135 sel 0; +#X obj 191 114 counter 0 10; +#X obj 191 318 outlet; +#X obj 440 180 delay 2000; +#X msg 440 201 0; +#X obj 408 155 t f b; +#X obj 408 250 change; +#X obj 408 134 r passthrough-\$0; +#X obj 191 156 f \$0; +#X msg 191 177 passthrough \$1; #X connect 0 0 2 0; #X connect 2 0 1 0; #X connect 3 0 1 0; +#X connect 3 0 16 0; #X connect 4 0 3 0; #X connect 5 0 1 0; #X connect 6 0 5 0; @@ -33,6 +47,18 @@ #X connect 10 0 1 0; #X connect 11 0 10 0; #X connect 12 0 1 0; +#X connect 13 0 21 0; +#X connect 14 0 1 0; +#X connect 15 0 23 0; +#X connect 16 0 15 0; +#X connect 18 0 19 0; +#X connect 19 0 13 0; +#X connect 20 0 13 0; +#X connect 20 1 18 0; +#X connect 21 0 14 0; +#X connect 22 0 20 0; +#X connect 23 0 24 0; +#X connect 24 0 17 0; #X restore 337 289 pd running_the_wiimote; #X obj 337 267 delay 1000; #X obj 375 103 ggee/image @pd_extra/K12/objects/wii_connect_off.png @@ -70,6 +96,7 @@ #X connect 0 1 12 1; #X connect 1 0 12 0; #X connect 3 0 0 0; +#X connect 3 1 2 0; #X connect 4 0 3 0; #X connect 6 0 15 0; #X connect 7 0 15 0; diff --git a/l2ork_addons/K12/wii_nunchuk_accelerometer-help.pd b/l2ork_addons/K12/wii_nunchuk_accelerometer-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_nunchuk_accelerometer.pd b/l2ork_addons/K12/wii_nunchuk_accelerometer.pd index b5ad860cd..62ba57c9e 100755 --- a/l2ork_addons/K12/wii_nunchuk_accelerometer.pd +++ b/l2ork_addons/K12/wii_nunchuk_accelerometer.pd @@ -1,6 +1,6 @@ -#N canvas 693 136 564 373 10; +#N canvas 575 75 564 417 10; #X obj 46 268 outlet; -#X obj 65 -75 inlet; +#X obj 65 -115 inlet; #X obj 65 29 unpack 0 0 0; #X obj 261 121 ggee/image @pd_extra/K12/objects/wii_nunchuk_accelerometer.png 1; @@ -9,8 +9,7 @@ #X obj 46 217 switch 3 1; #X obj 238 139 hradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144 -1 -1 0; -#X obj 65 -33 route acceleration; -#X obj 65 -54 route nunchuk; +#X obj 65 7 route acceleration; #X obj 46 238 / 2.5; #X msg 255 41 open @pd_extra/K12/objects/wii_nunchuk_accelerometer.png ; @@ -24,25 +23,59 @@ #X msg 267 210 y; #X msg 296 210 z; #X obj 46 196 + 1; -#X connect 1 0 9 0; +#X obj 65 -94 route nunchuk passthrough motionplus; +#N canvas 411 217 455 392 check_4_wiimote_passthrough 0; +#X obj 177 22 inlet; +#X obj 246 22 inlet; +#X obj 132 252 t 1 f; +#X obj 132 329 s; +#X obj 159 279 change; +#X msg 159 300 symbol passthrough-\$1; +#X obj 132 231 gate 1 0; +#X obj 246 101 counter 0 10; +#X obj 246 122 sel 0; +#X obj 246 143 t 1 b; +#X obj 273 165 delay 2000; +#X msg 273 186 0; +#X obj 246 59 route angle_rate; +#X obj 246 80 t b; +#X connect 0 0 6 1; +#X connect 1 0 12 0; +#X connect 2 0 3 0; +#X connect 2 1 4 0; +#X connect 4 0 5 0; +#X connect 5 0 3 1; +#X connect 6 0 2 0; +#X connect 7 0 8 0; +#X connect 8 0 9 0; +#X connect 9 0 6 0; +#X connect 9 1 10 0; +#X connect 10 0 11 0; +#X connect 11 0 6 0; +#X connect 12 0 13 0; +#X connect 13 0 7 0; +#X restore 136 -59 pd check_4_wiimote_passthrough; +#X connect 1 0 20 0; #X connect 2 0 6 1; #X connect 2 1 6 2; #X connect 2 2 6 3; #X connect 5 0 7 0; -#X connect 6 0 10 0; -#X connect 7 0 13 0; -#X connect 7 0 20 0; +#X connect 6 0 9 0; +#X connect 7 0 12 0; +#X connect 7 0 19 0; #X connect 8 0 2 0; -#X connect 9 0 8 0; -#X connect 10 0 0 0; -#X connect 11 0 3 0; -#X connect 13 0 17 0; -#X connect 13 1 18 0; -#X connect 13 2 19 0; -#X connect 14 0 16 0; -#X connect 16 0 15 0; -#X connect 17 0 14 0; -#X connect 18 0 14 0; -#X connect 19 0 14 0; -#X connect 20 0 6 0; +#X connect 9 0 0 0; +#X connect 10 0 3 0; +#X connect 12 0 16 0; +#X connect 12 1 17 0; +#X connect 12 2 18 0; +#X connect 13 0 15 0; +#X connect 15 0 14 0; +#X connect 16 0 13 0; +#X connect 17 0 13 0; +#X connect 18 0 13 0; +#X connect 19 0 6 0; +#X connect 20 0 8 0; +#X connect 20 1 21 0; +#X connect 20 2 21 1; #X coords 0 -1 1 1 89 89 2 216 89; diff --git a/l2ork_addons/K12/wii_nunchuk_buttons-help.pd b/l2ork_addons/K12/wii_nunchuk_buttons-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_nunchuk_buttons.pd b/l2ork_addons/K12/wii_nunchuk_buttons.pd old mode 100644 new mode 100755 index 98041701c..9d46b81da --- a/l2ork_addons/K12/wii_nunchuk_buttons.pd +++ b/l2ork_addons/K12/wii_nunchuk_buttons.pd @@ -1,12 +1,11 @@ -#N canvas 486 131 589 373 10; +#N canvas 183 174 589 426 10; #X obj 254 116 bng 14 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 245 134 bng 32 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 65 273 outlet; -#X obj 65 -75 inlet; +#X obj 65 -125 inlet; #X obj 255 18 loadbang; -#X obj 65 -54 route nunchuk; #X msg 255 41 open @pd_extra/K12/objects/wii_nunchuk_buttons.png; #X msg 323 73 open @pd_extra/K12/objects/wii_nunchuk_buttons_C.png ; @@ -15,25 +14,57 @@ #X msg 80 174 2; #X msg 110 174 1; #X obj 65 208 & 8; -#X obj 240 -25 r blah; #X obj 65 -33 route button; #X obj 65 229 > 0; #X obj 261 106 ggee/image @pd_extra/K12/objects/wii_nunchuk_buttons.png 1; -#X connect 0 0 9 0; -#X connect 0 0 7 0; -#X connect 1 0 10 0; -#X connect 1 0 8 0; -#X connect 3 0 5 0; -#X connect 4 0 6 0; +#X obj 65 -104 route nunchuk passthrough motionplus; +#N canvas 411 217 455 392 check_4_wiimote_passthrough 0; +#X obj 177 22 inlet; +#X obj 246 22 inlet; +#X obj 132 252 t 1 f; +#X obj 132 329 s; +#X obj 159 279 change; +#X msg 159 300 symbol passthrough-\$1; +#X obj 132 231 gate 1 0; +#X obj 246 101 counter 0 10; +#X obj 246 122 sel 0; +#X obj 246 143 t 1 b; +#X obj 273 165 delay 2000; +#X msg 273 186 0; +#X obj 246 59 route angle_rate; +#X obj 246 80 t b; +#X connect 0 0 6 1; +#X connect 1 0 12 0; +#X connect 2 0 3 0; +#X connect 2 1 4 0; +#X connect 4 0 5 0; +#X connect 5 0 3 1; +#X connect 6 0 2 0; +#X connect 7 0 8 0; +#X connect 8 0 9 0; +#X connect 9 0 6 0; +#X connect 9 1 10 0; +#X connect 10 0 11 0; +#X connect 11 0 6 0; +#X connect 12 0 13 0; +#X connect 13 0 7 0; +#X restore 136 -69 pd check_4_wiimote_passthrough; +#X connect 0 0 8 0; +#X connect 0 0 6 0; +#X connect 1 0 9 0; +#X connect 1 0 7 0; +#X connect 3 0 14 0; +#X connect 4 0 5 0; #X connect 5 0 13 0; -#X connect 6 0 15 0; -#X connect 7 0 15 0; -#X connect 8 0 15 0; -#X connect 9 0 11 1; -#X connect 10 0 11 1; -#X connect 11 0 14 0; -#X connect 12 0 5 0; -#X connect 13 0 11 0; -#X connect 14 0 2 0; +#X connect 6 0 13 0; +#X connect 7 0 13 0; +#X connect 8 0 10 1; +#X connect 9 0 10 1; +#X connect 10 0 12 0; +#X connect 11 0 10 0; +#X connect 12 0 2 0; +#X connect 14 0 11 0; +#X connect 14 1 15 0; +#X connect 14 2 15 1; #X coords 0 -1 1 1 89 89 2 216 89; diff --git a/l2ork_addons/K12/wii_nunchuk_hit-help.pd b/l2ork_addons/K12/wii_nunchuk_hit-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_nunchuk_hit.pd b/l2ork_addons/K12/wii_nunchuk_hit.pd old mode 100644 new mode 100755 index 464b44215..fd33810cc --- a/l2ork_addons/K12/wii_nunchuk_hit.pd +++ b/l2ork_addons/K12/wii_nunchuk_hit.pd @@ -1,4 +1,4 @@ -#N canvas 693 136 540 515 10; +#N canvas 454 139 540 515 10; #X obj 25 -100 expr sqrt(pow($f1 \, 2) + pow($f2 \, 2) + pow($f3 \, 2)); #X obj 25 -50 -; @@ -14,9 +14,9 @@ #X obj 66 33 gate 1 0; #X msg 89 208 1; #X obj 25 140 moses 0.3; -#X obj 25 -225 inlet; -#X obj 25 -183 route acceleration; -#X obj 25 -162 unpack 0 0 0; +#X obj 25 -235 inlet; +#X obj 25 -163 route acceleration; +#X obj 25 -142 unpack 0 0 0; #X obj 261 121 ggee/image @pd_extra/K12/objects/wii_nunchuk_hit1.png 1; #X obj 169 -9 select 0 1; @@ -80,8 +80,39 @@ #X text 225 131 low; #X obj 311 89 preset_node k12; #X obj 311 111 preset_node k12; -#X obj 25 -204 route nunchuk; #X msg 261 40 open @pd_extra/K12/objects/wii_nunchuk_hit1.png; +#X obj 25 -214 route nunchuk passthrough motionplus; +#N canvas 411 217 455 392 check_4_wiimote_passthrough 0; +#X obj 177 22 inlet; +#X obj 246 22 inlet; +#X obj 132 252 t 1 f; +#X obj 132 329 s; +#X obj 159 279 change; +#X msg 159 300 symbol passthrough-\$1; +#X obj 132 231 gate 1 0; +#X obj 246 101 counter 0 10; +#X obj 246 122 sel 0; +#X obj 246 143 t 1 b; +#X obj 273 165 delay 2000; +#X msg 273 186 0; +#X obj 246 59 route angle_rate; +#X obj 246 80 t b; +#X connect 0 0 6 1; +#X connect 1 0 12 0; +#X connect 2 0 3 0; +#X connect 2 1 4 0; +#X connect 4 0 5 0; +#X connect 5 0 3 1; +#X connect 6 0 2 0; +#X connect 7 0 8 0; +#X connect 8 0 9 0; +#X connect 9 0 6 0; +#X connect 9 1 10 0; +#X connect 10 0 11 0; +#X connect 11 0 6 0; +#X connect 12 0 13 0; +#X connect 13 0 7 0; +#X restore 96 -185 pd check_4_wiimote_passthrough; #X connect 0 0 2 0; #X connect 1 0 3 0; #X connect 2 0 1 1; @@ -98,7 +129,7 @@ #X connect 11 0 9 0; #X connect 12 0 11 0; #X connect 13 1 4 1; -#X connect 14 0 34 0; +#X connect 14 0 35 0; #X connect 15 0 16 0; #X connect 16 0 0 0; #X connect 16 1 0 1; @@ -108,7 +139,7 @@ #X connect 19 0 27 0; #X connect 20 0 17 0; #X connect 21 0 20 1; -#X connect 22 0 35 0; +#X connect 22 0 34 0; #X connect 23 0 4 0; #X connect 24 1 5 0; #X connect 24 1 12 0; @@ -123,6 +154,8 @@ #X connect 29 0 9 1; #X connect 32 0 28 0; #X connect 33 0 29 0; -#X connect 34 0 15 0; -#X connect 35 0 17 0; +#X connect 34 0 17 0; +#X connect 35 0 15 0; +#X connect 35 1 36 0; +#X connect 35 2 36 1; #X coords 0 -1 1 1 89 89 2 216 89; diff --git a/l2ork_addons/K12/wii_nunchuk_stick-help.pd b/l2ork_addons/K12/wii_nunchuk_stick-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_nunchuk_stick.pd b/l2ork_addons/K12/wii_nunchuk_stick.pd index 13afe0670..23fa1952c 100755 --- a/l2ork_addons/K12/wii_nunchuk_stick.pd +++ b/l2ork_addons/K12/wii_nunchuk_stick.pd @@ -1,26 +1,59 @@ -#N canvas 486 131 522 373 10; +#N canvas 319 199 522 373 10; #X obj 66 268 outlet; #X obj 65 -75 inlet; #X obj 261 121 ggee/image @pd_extra/K12/objects/wii_nunchuk_stick.png 1; #X obj 255 18 loadbang; -#X obj 65 -54 route nunchuk; #X msg 255 41 open @pd_extra/K12/objects/wii_nunchuk_stick.png; #X obj 122 268 outlet; -#X obj 65 29 unpack 0 0; -#X obj 65 -33 route stick; +#X obj 65 179 unpack 0 0; +#X obj 65 156 route stick; #X obj 66 208 / 128; #X obj 66 229 - 1; #X obj 122 208 / 128; #X obj 122 229 - 1; -#X connect 1 0 4 0; -#X connect 4 0 8 0; -#X connect 5 0 2 0; -#X connect 7 0 9 0; -#X connect 7 1 11 0; -#X connect 8 0 7 0; -#X connect 9 0 10 0; -#X connect 10 0 0 0; -#X connect 11 0 12 0; -#X connect 12 0 6 0; +#X obj 65 -54 route nunchuk passthrough motionplus; +#N canvas 411 217 455 392 check_4_wiimote_passthrough 0; +#X obj 177 22 inlet; +#X obj 246 22 inlet; +#X obj 132 252 t 1 f; +#X obj 132 329 s; +#X obj 159 279 change; +#X msg 159 300 symbol passthrough-\$1; +#X obj 132 231 gate 1 0; +#X obj 246 101 counter 0 10; +#X obj 246 122 sel 0; +#X obj 246 143 t 1 b; +#X obj 273 165 delay 2000; +#X msg 273 186 0; +#X obj 246 59 route angle_rate; +#X obj 246 80 t b; +#X connect 0 0 6 1; +#X connect 1 0 12 0; +#X connect 2 0 3 0; +#X connect 2 1 4 0; +#X connect 4 0 5 0; +#X connect 5 0 3 1; +#X connect 6 0 2 0; +#X connect 7 0 8 0; +#X connect 8 0 9 0; +#X connect 9 0 6 0; +#X connect 9 1 10 0; +#X connect 10 0 11 0; +#X connect 11 0 6 0; +#X connect 12 0 13 0; +#X connect 13 0 7 0; +#X restore 136 -17 pd check_4_wiimote_passthrough; +#X connect 1 0 12 0; +#X connect 4 0 2 0; +#X connect 6 0 8 0; +#X connect 6 1 10 0; +#X connect 7 0 6 0; +#X connect 8 0 9 0; +#X connect 9 0 0 0; +#X connect 10 0 11 0; +#X connect 11 0 5 0; +#X connect 12 0 7 0; +#X connect 12 1 13 0; +#X connect 12 2 13 1; #X coords 0 -1 1 1 89 89 2 216 89; diff --git a/l2ork_addons/K12/wii_speed.pd b/l2ork_addons/K12/wii_speed.pd index 51e3dbf17..1230df23a 100755 --- a/l2ork_addons/K12/wii_speed.pd +++ b/l2ork_addons/K12/wii_speed.pd @@ -2,31 +2,31 @@ #X obj 120 131 bng 82 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X obj 3 198 inlet; -#N canvas 141 109 450 530 unpack_motionplus 0; +#N canvas 141 109 450 364 unpack_motionplus 0; #X obj 14 12 inlet; #X obj 14 40 route motionplus; -#X obj 17 105 unpack 0 0 0; +#X obj 14 105 unpack 0 0 0; #X obj 14 63 route angle_rate; -#X obj 17 238 f; -#X obj 80 240 f; -#X obj 18 271 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 11 +#X obj 14 238 f; +#X obj 78 240 f; +#X obj 14 271 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 11 -262144 -1 -1 0 256 0; -#X obj 82 271 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 11 +#X obj 78 271 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 11 -262144 -1 -1 0 256 0; -#X obj 18 308 outlet; -#X obj 82 307 outlet; -#X obj 277 305 outlet; -#X obj 333 305 outlet; -#X text 274 328 Realtime motion plus data; -#X text 16 331 Initial Calibration; -#X obj 17 163 change; -#X obj 26 188 gate 1 1; -#X obj 17 140 t f f; -#X obj 207 118 inlet; -#X obj 136 192 counter 0 2; -#X obj 26 211 t b b; -#X obj 136 214 sel 2; -#X msg 136 236 0; +#X obj 14 308 outlet; +#X obj 78 307 outlet; +#X obj 274 305 outlet; +#X obj 330 305 outlet; +#X text 271 328 Realtime motion plus data; +#X text 13 331 Initial Calibration; +#X obj 14 163 change; +#X obj 23 188 gate 1 1; +#X obj 14 140 t f f; +#X obj 204 118 inlet; +#X obj 133 192 counter 0 2; +#X obj 23 211 t b b; +#X obj 133 214 sel 2; +#X msg 133 236 0; #X connect 0 0 1 0; #X connect 1 0 3 0; #X connect 2 0 10 0; diff --git a/l2ork_addons/K12/wii_speed_xry-help.pd b/l2ork_addons/K12/wii_speed_xry-help.pd old mode 100644 new mode 100755 diff --git a/l2ork_addons/K12/wii_speed_xry.pd b/l2ork_addons/K12/wii_speed_xry.pd old mode 100644 new mode 100755 -- GitLab