1 files changed, 161 insertions, 118 deletions

diff --git a/controctopus/cc-learner.pd b/controctopus/cc-learner.pd
index 9e2a883..0f13eb3 100644
--- a/controctopus/cc-learner.pd
+++ b/controctopus/cc-learner.pd
@@ -1,145 +1,188 @@
-#N canvas 730 32 629 668 10;
-#X obj 60 46 nbx 3 14 0 127 0 1 \$0-ccNumber \$0-ccNumberLearn CC 42
-8 0 11 -194624 -1 -1 1 256;
-#X obj 63 64 bng 13 250 50 0 \$0-learnOn \$0nullR empty 0 -6 0 8 -259541
--1 -1;
-#X obj 353 200 r \$0-ccNumber;
-#X obj 81 67 bng 8 250 50 0 empty \$0lite1 empty 0 -6 0 8 -1 -262085
+#N canvas 62 131 629 668 10;
+#X obj 60 46 nbx 3 14 0 127 0 1 \$0.cc.s \$0.cc.r CC 42 8 0 11 -194624
+-1 -1 1 256;
+#X obj 63 64 bng 13 250 50 0 \$0.learn-on \$0.nullR empty 0 -6 0 8
+-259541 -1 -1;
+#X obj 330 208 r \$0.cc.v;
+#X obj 81 67 bng 8 250 50 0 empty \$0.lite1 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 92 67 bng 8 250 50 0 empty \$0lite2 empty 0 -6 0 8 -1 -262085
+#X obj 92 67 bng 8 250 50 0 empty \$0.lite2 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 103 67 bng 8 250 50 0 empty \$0lite3 empty 0 -6 0 8 -1 -262085
+#X obj 103 67 bng 8 250 50 0 empty \$0.lite3 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 300 -1 ctlin;
-#X obj 60 81 nbx 2 14 1 64 0 0 \$0devNo \$1/devNo Dev 32 8 0 11 -110565
--1 -1 1 256;
+#X obj 268 49 ctlin;
+#X obj 60 81 nbx 2 14 1 64 0 0 \$0.device-number.s \$0.device-number.r
+Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 315 181 spigot;
-#X obj 300 257 spigot;
+#X obj 268 267 spigot;
 #X obj 268 181 / 127;
-#N canvas 0 22 458 308 midiLearn 0;
-#X obj 217 143 inlet;
-#X obj 162 38 r \$0-learnOn;
-#X obj 217 177 spigot;
-#X obj 74 188 metro 250;
-#X obj 58 221 count 3;
-#X obj 29 126 t b b;
-#X msg 29 189 reset;
-#X obj 217 199 s \$0-ccNumberLearn;
-#X obj 162 75 pipe 1000;
-#X msg 255 74 1;
-#X msg 274 118 0;
-#X msg 74 150 0;
-#X msg 106 150 1;
-#X obj 58 251 sel 0 1 2;
-#X obj 58 281 s \$0lite1;
-#X obj 138 281 s \$0lite2;
-#X obj 218 281 s \$0lite3;
-#X connect 0 0 2 0;
-#X connect 1 0 8 0;
-#X connect 1 0 9 0;
-#X connect 1 0 12 0;
-#X connect 2 0 7 0;
-#X connect 3 0 4 0;
-#X connect 4 0 13 0;
-#X connect 5 0 6 0;
-#X connect 5 1 11 0;
-#X connect 6 0 4 0;
-#X connect 8 0 5 0;
-#X connect 8 0 10 0;
-#X connect 9 0 2 1;
-#X connect 10 0 2 1;
-#X connect 11 0 3 0;
-#X connect 12 0 3 0;
-#X connect 13 0 14 0;
-#X connect 13 1 15 0;
-#X connect 13 2 16 0;
-#X restore 178 180 pd midiLearn;
-#X obj 337 229 ==;
-#X obj 352 101 div 16;
-#X obj 352 161 ==;
-#X obj 368 139 r \$0devNo;
-#X obj 443 115 mod 16;
-#X obj 413 85 t f f;
+#X obj 315 237 ==;
 #X obj 349 566 list append;
 #X obj 333 611 s;
-#X obj 443 135 s \$0channel;
-#X msg 224 287 set \$1;
-#X obj 300 365 s \$0data;
-#X obj 210 467 r \$0data;
-#X obj 333 431 r \$0data;
-#X obj 493 17 loadbang;
-#X msg 493 39 1;
+#X msg 294 292 set \$1;
+#X obj 268 367 s \$0.data;
+#X obj 210 467 r \$0.data;
+#X obj 333 431 r \$0.data;
+#X obj 32 231 loadbang;
+#X msg 32 253 1;
 #X obj 391 544 t b f;
-#X obj 391 522 r \$0channel;
-#X obj 352 120 + 1;
+#X obj 391 522 r \$0.channel;
 #X obj 349 500 list append \$2;
 #X obj 10 570 r \$1/getControls;
 #X obj 10 620 s \$1/controlsList;
 #X obj 10 594 list append \$2;
-#X obj 224 307 s \$1\$2/GUIR;
+#X obj 294 312 s \$1\$2/GUIR;
 #X obj 210 567 s \$1\$2;
-#X obj 224 338 r \$1\$2/GUI;
+#X obj 294 343 r \$1\$2/GUI;
 #X msg 349 587 symbol \$1\$2/Ch\$3;
 #X obj 349 478 list append \$1;
 #X text 208 594 Omni;
 #X obj 10 492 r \$1/setChannel;
-#X obj 10 517 s \$0channel;
+#X obj 10 517 s \$0.channel;
 #X obj 51 31 cnv 12 75 12 empty empty \$2 2 7 0 11 -83692 -262144 0
 ;
 #X obj 315 98 t a;
 #X obj 268 98 t a;
-#X obj 352 69 t a;
-#X obj 198 1 r sft.ctlin;
-#X obj 198 28 unpack f f f;
-#X obj 493 65 s \$0channel;
+#X obj 348 99 t a;
+#X obj 32 279 s \$0.channel;
 #X obj 222 493 outlet;
 #X obj 51 98 cnv 10 75 10 empty empty \$1 1 6 0 8 -66577 -171136 0
 ;
-#X obj 32 129 sssadie/sssad-lg \$2-cc \$0;
-#X obj 32 151 sssadie/sssad-lg \$2-device \$0;
-#X connect 0 0 51 1;
-#X connect 2 0 12 1;
-#X connect 6 0 44 0;
-#X connect 6 1 43 0;
-#X connect 6 2 45 0;
-#X connect 7 0 52 1;
-#X connect 8 0 12 0;
-#X connect 9 0 21 0;
-#X connect 9 0 22 0;
+#X obj 308 49 nr PDCTLIN 3;
+#X obj 32 304 r \$1/devNo;
+#X obj 32 329 s \$0.device-number.r;
+#N canvas 0 22 450 300 sssad 0;
+#X obj 43 89 sssadie/sssadiez \$1 \$2 cc 0 1024 \$0 round;
+#X obj 43 109 sssadie/sssadiez \$1 \$2 device-number 0 1024 \$0 round
+;
+#X restore 26 198 pd sssad;
+#N canvas 0 22 458 308 midi-learn 0;
+#X obj 217 143 inlet;
+#X obj 162 38 r \$0.learn-on;
+#X obj 217 177 spigot;
+#X obj 74 188 metro 250;
+#X obj 29 126 t b b;
+#X obj 217 199 s \$0.cc.r;
+#X obj 162 75 pipe 1000;
+#X msg 255 74 1;
+#X msg 274 118 0;
+#X msg 74 150 0;
+#X msg 106 150 1;
+#X obj 58 251 sel 0 1 2;
+#X obj 58 281 s \$0.lite1;
+#X obj 138 281 s \$0.lite2;
+#X obj 218 281 s \$0.lite3;
+#X msg 29 189 0;
+#X obj 58 221 f;
+#X obj 85 221 + 1;
+#X obj 112 221 mod 3;
+#X connect 0 0 2 0;
+#X connect 1 0 6 0;
+#X connect 1 0 7 0;
+#X connect 1 0 10 0;
+#X connect 2 0 5 0;
+#X connect 3 0 16 0;
+#X connect 4 0 15 0;
+#X connect 4 1 9 0;
+#X connect 6 0 4 0;
+#X connect 6 0 8 0;
+#X connect 7 0 2 1;
+#X connect 8 0 2 1;
+#X connect 9 0 3 0;
+#X connect 10 0 3 0;
+#X connect 11 0 12 0;
+#X connect 11 1 13 0;
+#X connect 11 2 14 0;
+#X connect 15 0 16 1;
+#X connect 16 0 11 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 17 0 16 1;
+#X connect 18 0 17 1;
+#X restore 366 133 pd midi-learn;
+#N canvas 872 119 244 290 parse-channel 0;
+#X obj 55 34 inlet;
+#X obj 55 241 outlet;
+#X obj 55 137 div 16;
+#X obj 55 197 ==;
+#X obj 71 175 r \$0.device-number;
+#X obj 82 88 mod 16;
+#X obj 55 67 t f f;
+#X obj 82 108 s \$0.channel;
+#X obj 55 156 + 1;
+#X connect 0 0 6 0;
+#X connect 2 0 8 0;
+#X connect 3 0 1 0;
+#X connect 4 0 3 1;
+#X connect 5 0 7 0;
+#X connect 6 0 2 0;
+#X connect 6 1 5 0;
+#X connect 8 0 3 0;
+#X restore 348 156 pd parse-channel;
+#N canvas 833 52 478 437 midi-sensory 0;
+#X obj 73 159 spigot;
+#X obj 73 100 r \$0.data;
+#X obj 106 134 r MMMAP_SENSING?;
+#X obj 219 61 keycommand ¬ MMMAP_SENSING? 1;
+#X obj 219 86 keycommand Escape MMMAP_SENSING? 0;
+#X obj 73 204 list append \$2;
+#X obj 73 181 t b b;
+#X msg 110 181 0;
+#X obj 139 181 s MMMAP_SENSING?;
+#X obj 73 231 s \$1.sensed;
+#X obj 77 288 r MMMAP_SENSING?;
+#X obj 137 372 s \$1\$2/GUIR;
+#X msg 137 348 color \$1 -1 -1;
+#X obj 77 313 list-idx-list 0 15;
+#X obj 198 288 r \$1\$2.assigning?;
+#X obj 198 313 list-idx-list 0 19;
+#X connect 0 0 6 0;
+#X connect 1 0 0 0;
+#X connect 2 0 0 1;
+#X connect 5 0 9 0;
+#X connect 6 0 5 0;
+#X connect 6 1 7 0;
+#X connect 7 0 8 0;
+#X connect 10 0 13 0;
+#X connect 12 0 11 0;
+#X connect 13 0 12 0;
+#X connect 14 0 15 0;
+#X connect 15 0 12 0;
+#X restore 485 392 pd midi-sensory;
+#X text 195 15 cc-learner /unit /control;
+#X connect 2 0 11 1;
+#X connect 6 0 36 0;
+#X connect 6 1 35 0;
+#X connect 6 2 37 0;
+#X connect 8 0 11 0;
+#X connect 9 0 14 0;
+#X connect 9 0 15 0;
 #X connect 10 0 9 0;
-#X connect 12 0 9 1;
-#X connect 13 0 29 0;
-#X connect 14 0 8 1;
-#X connect 15 0 14 1;
-#X connect 16 0 20 0;
+#X connect 11 0 9 1;
+#X connect 12 0 29 0;
+#X connect 14 0 26 0;
+#X connect 16 0 27 0;
+#X connect 16 0 39 0;
 #X connect 17 0 13 0;
-#X connect 17 1 16 0;
-#X connect 18 0 37 0;
-#X connect 21 0 34 0;
-#X connect 23 0 35 0;
-#X connect 23 0 49 0;
-#X connect 24 0 19 0;
-#X connect 25 0 26 0;
-#X connect 26 0 48 0;
-#X connect 27 0 38 0;
-#X connect 27 1 18 1;
-#X connect 28 0 27 0;
-#X connect 29 0 14 0;
-#X connect 30 0 18 0;
-#X connect 31 0 33 0;
-#X connect 33 0 32 0;
-#X connect 36 0 22 0;
-#X connect 37 0 19 1;
-#X connect 38 0 30 0;
-#X connect 40 0 41 0;
-#X connect 43 0 11 0;
-#X connect 43 0 8 0;
-#X connect 44 0 10 0;
-#X connect 45 0 17 0;
-#X connect 46 0 47 0;
-#X connect 47 0 44 0;
-#X connect 47 1 43 0;
-#X connect 47 2 45 0;
-#X connect 51 0 0 0;
-#X connect 52 0 7 0;
+#X connect 18 0 19 0;
+#X connect 19 0 38 0;
+#X connect 20 0 30 0;
+#X connect 20 1 12 1;
+#X connect 21 0 20 0;
+#X connect 22 0 12 0;
+#X connect 23 0 25 0;
+#X connect 25 0 24 0;
+#X connect 28 0 15 0;
+#X connect 29 0 13 1;
+#X connect 30 0 22 0;
+#X connect 32 0 33 0;
+#X connect 35 0 45 0;
+#X connect 35 0 8 0;
+#X connect 36 0 10 0;
+#X connect 37 0 46 0;
+#X connect 41 0 36 0;
+#X connect 41 1 35 0;
+#X connect 41 2 37 0;
+#X connect 42 0 43 0;
+#X connect 46 0 8 1;
 #X coords 0 -1 1 1 77 79 2 50 30;