Browse Source

added enable and percent move

titi 5 years ago
parent
commit
07288e6041
2 changed files with 92 additions and 72 deletions
  1. 59 59
      blob-CN/htequiOSC.pd
  2. 33 13
      blob-CN/stepper.pd

+ 59 - 59
blob-CN/htequiOSC.pd

@@ -1,4 +1,4 @@
-#N canvas 0 182 1755 697 12;
+#N canvas 513 296 1755 697 12;
 #X msg 73 121 disconnect;
 #X obj 329 426 tgl 15 0 empty empty connected 20 7 0 8 -24198 -241291
 -1 1 1;
@@ -23,25 +23,24 @@
 #X obj 1309 58 unpack 0 0 0 0 0;
 #X msg 942 13 status;
 #X floatatom 1234 59 9 0 0 0 - - -;
-#X obj 1443 62 tgl 15 0 empty empty empty 17 7 0 10 -4034 -1 -1 0 1
+#X obj 1443 62 tgl 15 0 empty empty empty 17 7 0 10 -4034 -1 -1 1 1
 ;
 #X floatatom 1233 84 9 0 0 0 - - -;
 #X text 1099 36 bytes received:;
 #X text 1069 60 total bytes received:;
 #X obj 1007 427 spigot;
 #X obj 1046 407 tgl 15 0 empty empty enable_print: -77 8 0 10 -4034
--1 -1 0 1;
+-1 -1 1 1;
 #X obj 1007 452 print received;
 #X obj 1235 33 route received total from multicast;
-#X msg 953 52 port 9998;
 #X obj 943 296 route /analog/0;
-#X obj 942 108 mrpeach/unpackOSC;
+#X obj 942 148 mrpeach/unpackOSC;
 #X obj 512 335 mrpeach/packOSC;
 #X obj 932 356 vsl 15 128 0 1024 0 0 empty empty empty 0 -9 0 10 -262144
 -1 -1 0 1;
 #X msg 269 252 connect 192.168.1.105 8000;
 #X obj 500 236 r toOSC;
-#X obj 986 162 s fromOSC;
+#X obj 986 182 s fromOSC;
 #X msg 668 469 /brush \$1;
 #X floatatom 689 422 5 0 0 0 - - -;
 #X obj 745 429 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
@@ -108,68 +107,69 @@
 #X msg 397 823 X \, Y \, Z \, W \, T1 \, T2 \, T3 \, T4 \, Shutter
 ;
 #X obj 942 86 mrpeach/udpreceive 9977 239.200.200.200;
-#X connect 0 0 72 0;
-#X connect 3 0 72 0;
-#X connect 4 0 72 0;
-#X connect 8 0 72 0;
-#X connect 10 0 72 0;
+#X msg 953 52 port 9977;
+#X connect 0 0 71 0;
+#X connect 3 0 71 0;
+#X connect 4 0 71 0;
+#X connect 8 0 71 0;
+#X connect 10 0 71 0;
 #X connect 11 0 10 0;
 #X connect 18 0 13 0;
 #X connect 18 1 14 0;
 #X connect 18 2 15 0;
 #X connect 18 3 16 0;
 #X connect 18 4 17 0;
-#X connect 19 0 94 0;
+#X connect 19 0 93 0;
 #X connect 25 0 27 0;
 #X connect 26 0 25 1;
 #X connect 28 0 20 0;
 #X connect 28 1 22 0;
 #X connect 28 2 18 0;
 #X connect 28 3 21 0;
-#X connect 29 0 94 0;
-#X connect 30 0 33 0;
-#X connect 30 1 25 0;
-#X connect 31 0 30 0;
-#X connect 31 0 36 0;
-#X connect 32 0 72 0;
-#X connect 35 0 32 0;
-#X connect 37 0 32 0;
-#X connect 38 0 37 0;
-#X connect 39 0 40 0;
-#X connect 40 0 37 0;
-#X connect 41 0 42 0;
-#X connect 43 0 45 0;
-#X connect 44 0 43 0;
-#X connect 45 0 32 0;
-#X connect 46 0 49 0;
-#X connect 47 0 32 0;
-#X connect 48 0 47 0;
-#X connect 49 0 43 0;
-#X connect 56 0 32 0;
-#X connect 57 0 56 0;
-#X connect 58 0 59 0;
-#X connect 59 0 32 0;
-#X connect 60 0 79 0;
-#X connect 61 0 32 0;
-#X connect 62 0 32 0;
-#X connect 63 0 32 0;
-#X connect 64 0 32 0;
-#X connect 65 0 68 0;
-#X connect 68 0 66 0;
-#X connect 68 1 67 0;
-#X connect 68 2 69 0;
-#X connect 69 0 70 0;
-#X connect 69 1 71 0;
-#X connect 72 0 1 0;
-#X connect 73 0 32 0;
-#X connect 74 0 73 0;
-#X connect 75 0 76 0;
-#X connect 76 0 32 0;
-#X connect 77 0 78 0;
-#X connect 78 0 32 0;
-#X connect 79 0 72 0;
-#X connect 89 0 90 0;
-#X connect 90 0 80 0;
-#X connect 93 0 89 0;
-#X connect 94 0 31 0;
-#X connect 94 1 28 0;
+#X connect 29 0 32 0;
+#X connect 29 1 25 0;
+#X connect 30 0 29 0;
+#X connect 30 0 35 0;
+#X connect 31 0 71 0;
+#X connect 34 0 31 0;
+#X connect 36 0 31 0;
+#X connect 37 0 36 0;
+#X connect 38 0 39 0;
+#X connect 39 0 36 0;
+#X connect 40 0 41 0;
+#X connect 42 0 44 0;
+#X connect 43 0 42 0;
+#X connect 44 0 31 0;
+#X connect 45 0 48 0;
+#X connect 46 0 31 0;
+#X connect 47 0 46 0;
+#X connect 48 0 42 0;
+#X connect 55 0 31 0;
+#X connect 56 0 55 0;
+#X connect 57 0 58 0;
+#X connect 58 0 31 0;
+#X connect 59 0 78 0;
+#X connect 60 0 31 0;
+#X connect 61 0 31 0;
+#X connect 62 0 31 0;
+#X connect 63 0 31 0;
+#X connect 64 0 67 0;
+#X connect 67 0 65 0;
+#X connect 67 1 66 0;
+#X connect 67 2 68 0;
+#X connect 68 0 69 0;
+#X connect 68 1 70 0;
+#X connect 71 0 1 0;
+#X connect 72 0 31 0;
+#X connect 73 0 72 0;
+#X connect 74 0 75 0;
+#X connect 75 0 31 0;
+#X connect 76 0 77 0;
+#X connect 77 0 31 0;
+#X connect 78 0 71 0;
+#X connect 88 0 89 0;
+#X connect 89 0 79 0;
+#X connect 92 0 88 0;
+#X connect 93 0 30 0;
+#X connect 93 1 28 0;
+#X connect 94 0 93 0;

+ 33 - 13
blob-CN/stepper.pd

@@ -1,9 +1,9 @@
-#N canvas 333 290 1246 622 10;
+#N canvas 293 258 1246 622 10;
 #X floatatom 234 227 10 0 0 0 step #1_step -;
 #X obj 57 61 r fromOSC;
-#X floatatom 379 228 5 0 0 0 move - #1_move;
-#X floatatom 379 248 5 0 0 0 moveTo - #1_moveTo;
-#X floatatom 379 268 5 0 0 0 rotate - #1_rotate;
+#X floatatom 249 295 5 0 0 0 move - #1_move;
+#X floatatom 249 315 5 0 0 0 moveTo - #1_moveTo;
+#X floatatom 249 335 5 0 0 0 rotate - #1_rotate;
 #X obj 737 518 pack s f s;
 #X obj 794 491 symbol \$1;
 #X msg 737 297 move \$1;
@@ -13,7 +13,7 @@
 #X msg 757 337 rotate \$1;
 #X obj 55 114 unpack f f;
 #X floatatom 234 248 15 0 0 0 speed #1_speed -;
-#X obj 233 279 bng 25 250 50 0 empty \$1_onTarget onTarget 27 12 0
+#X obj 340 228 bng 25 250 50 0 empty \$1_onTarget onTarget 27 12 0
 10 -262144 -1 -1;
 #X obj 55 137 s \$1_step;
 #X obj 113 157 s \$1_speed;
@@ -34,9 +34,9 @@
 #X obj 737 229 r \$1_move;
 #X obj 747 249 r \$1_moveTo;
 #X obj 757 269 r \$1_rotate;
-#X obj 379 291 bng 25 250 50 0 \$1_stop empty stop 27 12 0 10 -260097
+#X obj 409 312 bng 25 250 50 0 \$1_stop empty stop 27 12 0 10 -260097
 -1 -1;
-#X obj 379 321 bng 25 250 50 0 \$1_emergency empty emergency 27 12
+#X obj 409 341 bng 25 250 50 0 \$1_emergency empty emergency 27 12
 0 10 -258113 -1 -1;
 #X obj 562 348 r \$1_stop;
 #X obj 632 358 r \$1_emergency;
@@ -46,9 +46,9 @@
 0 10 -262144 -1 -1;
 #X msg 562 380 stop 0;
 #X msg 632 400 emergency_stop 0;
-#X floatatom 314 377 10 0 0 0 maxSpeed - #1_maxSpeed;
-#X floatatom 404 377 10 0 0 0 acc - #1_acc;
-#X floatatom 404 357 10 0 0 0 homingSpeed - #1_homingSpeed;
+#X floatatom 164 377 10 0 0 0 maxSpeed - #1_maxSpeed;
+#X floatatom 254 377 10 0 0 0 acc - #1_acc;
+#X floatatom 404 377 10 0 0 0 homingSpeed - #1_homingSpeed;
 #X obj 955 495 symbol \$1;
 #X obj 871 448 t a b;
 #X obj 871 572 s toOSC;
@@ -75,14 +75,28 @@
 #X msg 837 297 setMaxSpeed \$1;
 #X msg 847 317 setAcceleration \$1;
 #X msg 857 337 setHomingSpeed \$1;
-#X obj 233 323 tgl 15 0 empty \$1_limitLow limitLow 17 7 0 10 -262144
+#X obj 415 268 tgl 15 0 empty \$1_limitLow limitLow 17 7 0 10 -262144
 -1 -1 0 1;
-#X obj 233 341 tgl 15 0 empty \$1_limitHigh limitHigh 17 7 0 10 -262144
+#X obj 415 286 tgl 15 0 empty \$1_limitHigh limitHigh 17 7 0 10 -262144
 -1 -1 0 1;
 #X obj 424 206 tgl 15 0 \$1_enable empty enable 17 7 0 10 -262144 -1
--1 1 1;
+-1 0 1;
 #X obj 1040 381 r \$1_enable;
 #X msg 1040 404 enable \$1;
+#X floatatom 323 498 5 0 0 0 move% - #1_move%;
+#X floatatom 323 518 5 0 0 0 moveTo% - #1_moveTo%;
+#X obj 813 110 r \$1_move%;
+#X obj 823 130 r \$1_moveTo%;
+#X msg 813 178 move% \$1;
+#X msg 823 198 moveTo% \$1;
+#X obj 294 297 vsl 10 50 -1 0.9999 0 0 \$1_move% empty move% 0 -9 0
+10 -262144 -1 -1 4800 0;
+#X obj 334 297 vsl 10 50 0 0.999999 0 0 \$1_moveTo% empty moveTo% 0
+-9 0 10 -262144 -1 -1 4900 0;
+#X obj 286 357 nbx 3 14 -1 1 0 0 empty empty empty 0 -8 0 10 -262144
+-1 -1 0 256;
+#X obj 326 357 nbx 3 14 0 0.9999 0 0 empty empty empty 0 -8 0 10 -262144
+-1 -1 0.9999 256;
 #X connect 1 0 59 0;
 #X connect 5 0 56 0;
 #X connect 6 0 5 2;
@@ -132,4 +146,10 @@
 #X connect 69 0 8 0;
 #X connect 73 0 74 0;
 #X connect 74 0 8 0;
+#X connect 77 0 79 0;
+#X connect 78 0 80 0;
+#X connect 79 0 8 0;
+#X connect 80 0 8 0;
+#X connect 83 0 81 0;
+#X connect 84 0 82 0;
 #X coords 0 -1 1 1 400 200 1 100 200;