Parcourir la source

Clements feedback

Etienne Landon il y a 7 ans
Parent
commit
b2904b6b2e
2 fichiers modifiés avec 88 ajouts et 94 suppressions
  1. 38 45
      OSCstepperCtl.pd
  2. 50 49
      kostepper.pd

+ 38 - 45
OSCstepperCtl.pd

@@ -1,4 +1,4 @@
-#N canvas 955 220 950 703 10;
+#N canvas 551 118 1032 703 10;
 #N canvas 112 146 817 472 SerialOSC 0;
 #X obj 99 6 inlet;
 #X obj 99 362 outlet;
@@ -127,12 +127,10 @@ verbose 1 \, retries 0;
 #X connect 37 0 35 1;
 #X connect 38 0 3 0;
 #X coords 0 -1 1 1 85 61 1 300 50;
-#X restore 721 47 pd SerialOSC;
-#N canvas 293 93 792 755 syncControl 0;
+#X restore 801 47 pd SerialOSC;
+#N canvas 979 217 792 755 syncControl 0;
 #X floatatom 17 578 5 0 0 0 - - -, f 5;
 #X floatatom 183 533 5 0 0 0 - - -, f 5;
-#X obj 23 299 unauthorized/grid grid1 200 -2 2 200 -2 2 1 0.01 0.01
-2 2 134 397;
 #X obj 23 640 t f f;
 #X obj 23 681 abs;
 #X obj 23 702 s /stepper/0/manualSpeed;
@@ -142,7 +140,7 @@ verbose 1 \, retries 0;
 #X obj 70 678 s /stepper/0/manualDirection;
 #X obj 242 645 t f f;
 #X obj 242 686 abs;
-#X obj 342 654 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#X obj 342 654 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
 #X obj 289 662 > 0;
 #X obj 289 683 s /stepper/1/manualDirection;
@@ -189,49 +187,44 @@ bang;
 #X obj 279 555 moses 0.1;
 #X msg 275 574 0;
 #X obj 276 613 f;
-#X connect 2 0 0 0;
-#X connect 2 0 39 0;
-#X connect 2 1 1 0;
-#X connect 2 1 42 0;
+#X connect 2 0 3 0;
+#X connect 2 1 6 0;
 #X connect 3 0 4 0;
-#X connect 3 1 7 0;
-#X connect 4 0 5 0;
-#X connect 7 0 6 0;
-#X connect 7 0 8 0;
-#X connect 9 0 10 0;
-#X connect 9 1 12 0;
-#X connect 10 0 14 0;
-#X connect 12 0 11 0;
-#X connect 12 0 13 0;
-#X connect 15 0 16 0;
-#X connect 15 0 38 0;
-#X connect 17 0 18 0;
-#X connect 20 0 21 0;
-#X connect 22 0 23 0;
-#X connect 24 0 26 0;
-#X connect 27 0 29 0;
-#X connect 29 0 31 0;
-#X connect 30 0 29 1;
+#X connect 6 0 5 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 8 1 11 0;
+#X connect 9 0 13 0;
+#X connect 11 0 10 0;
+#X connect 11 0 12 0;
+#X connect 14 0 15 0;
+#X connect 14 0 37 0;
+#X connect 16 0 17 0;
+#X connect 19 0 20 0;
+#X connect 21 0 22 0;
+#X connect 23 0 25 0;
+#X connect 26 0 28 0;
+#X connect 28 0 30 0;
+#X connect 29 0 28 1;
 #X connect 38 0 2 0;
-#X connect 39 0 3 0;
-#X connect 39 1 40 0;
-#X connect 40 0 41 0;
-#X connect 40 1 3 0;
-#X connect 41 0 3 0;
-#X connect 42 0 45 0;
-#X connect 42 1 43 0;
+#X connect 38 1 39 0;
+#X connect 39 0 40 0;
+#X connect 39 1 2 0;
+#X connect 40 0 2 0;
+#X connect 41 0 44 0;
+#X connect 41 1 42 0;
+#X connect 42 0 43 0;
+#X connect 42 1 44 0;
 #X connect 43 0 44 0;
-#X connect 43 1 45 0;
-#X connect 44 0 45 0;
-#X connect 45 0 9 0;
-#X coords 0 -1 1 1 220 500 1 10 10;
-#X restore 721 117 pd syncControl;
+#X connect 44 0 8 0;
+#X coords 0 -1 1 1 180 300 1 10 10;
+#X restore 801 117 pd syncControl;
 #N canvas 417 245 901 633 settings 0;
 #X obj 100 100 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 100 178 text define -k settings;
 #A set accLimit 2 \; speedLimit 10 \; microstepping 4 \; serialDevice
-/dev/ttyUSB0 \;;
+/dev/ttyACM0 \;;
 #X msg 100 150 click;
 #X obj 417 249 r accLimit;
 #X floatatom 417 270 5 0 0 0 - - -, f 5;
@@ -280,7 +273,7 @@ bang;
 #X connect 19 0 18 0;
 #X connect 21 0 1 0;
 #X coords 0 -1 1 1 85 30 1 100 100;
-#X restore 721 13 pd settings;
-#X text 808 91 list;
-#X obj 12 13 kostepper 0;
-#X obj 12 362 kostepper 1;
+#X restore 801 13 pd settings;
+#X text 888 91 list;
+#X obj 12 12 kostepper 1;
+#X obj 12 347 kostepper 0;

+ 50 - 49
kostepper.pd

@@ -1,9 +1,9 @@
-#N canvas 927 127 871 626 10;
-#X obj 85 172 cnv 15 130 200 empty empty Status 2 8 0 14 -233017 -128992
+#N canvas 927 127 984 626 10;
+#X obj 85 172 cnv 15 130 305 empty empty Status 2 8 0 14 -233017 -128992
 0;
-#X obj 85 377 cnv 15 130 100 empty empty MANUEL 2 8 0 14 -233017 -128992
+#X obj 219 172 cnv 15 79 305 empty empty MANUEL 2 8 0 14 -233017 -128992
 0;
-#X obj 220 172 cnv 15 180 305 empty empty Move 2 8 0 14 -233017 -128992
+#X obj 302 172 cnv 15 180 305 empty empty Move 2 8 0 14 -233017 -128992
 0;
 #X obj 65 9 r /fromOSC;
 #X floatatom 145 283 10 0 0 0 - - -, f 10;
@@ -53,11 +53,11 @@
 #X connect 11 0 6 0;
 #X restore 65 96 pd conversion;
 #X obj 65 74 route /status /onTarget;
-#X obj 177 382 vsl 12 60 0 2 0 0 /stepper/\$1/manualSpeed /stepper/\$1/manualSpeed
-speed -10 70 0 10 -262144 -1 -1 5900 1;
-#X obj 105 444 hradio 15 1 0 2 /stepper/\$1/manualDirection /stepper/\$1/manualDirection
+#X obj 251 266 vsl 20 175 0.001 2 1 0 /stepper/\$1/manualSpeed /stepper/\$1/manualSpeed
+speed -6 185 0 10 -262144 -1 -1 0 1;
+#X obj 242 232 hradio 15 1 0 2 /stepper/\$1/manualDirection /stepper/\$1/manualDirection
 direction -10 22 0 10 -262144 -1 -1 0;
-#X obj 329 295 bng 25 250 50 0 /stepper/\$1/move/go /stepper/\$1/move/go
+#X obj 411 295 bng 25 250 50 0 /stepper/\$1/move/go /stepper/\$1/move/go
 GO 6 13 0 10 -4034 -1 -1;
 #X obj 285 686 list prepend add;
 #X obj 285 707 list trim;
@@ -91,73 +91,73 @@ GO 6 13 0 10 -4034 -1 -1;
 #X connect 11 0 12 0;
 #X connect 12 0 13 0;
 #X restore 661 40 pd \$0-osc;
-#X obj 106 398 tgl 35 0 /stepper/\$1/manualDrive /stepper/\$1/manualDrive
+#X obj 240 193 tgl 35 0 /stepper/\$1/manualDrive /stepper/\$1/manualDrive
 empty 17 7 0 10 -204800 -33289 -1 0 1;
-#X obj 345 350 tgl 15 0 /stepper/\$1/accMode /stepper/\$1/accMode 0/1
+#X obj 427 350 tgl 15 0 /stepper/\$1/accMode /stepper/\$1/accMode 0/1
 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 233 292 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move /stepper/\$1/move
-tours 48 8 0 10 -262144 -1 -1 0.0555556 256;
-#X obj 165 459 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/manualSpeed /stepper/\$1/manualSpeed
-empty 0 -8 0 10 -262144 -1 -1 2 256;
-#X obj 253 371 vsl 25 60 0 2 0 0 /stepper/\$1/setMaxSpeed /stepper/\$1/setMaxSpeed
+#X obj 315 292 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move /stepper/\$1/move
+tours 48 8 0 10 -262144 -1 -1 0 256;
+#X obj 227 459 nbx 6 14 -1e+37 1e+37 0 0 /stepper/\$1/manualSpeed /stepper/\$1/manualSpeed
+empty 0 -8 0 10 -262144 -1 -1 0.001 256;
+#X obj 335 371 vsl 25 60 0 2 0 0 /stepper/\$1/setMaxSpeed /stepper/\$1/setMaxSpeed
 speed -4 70 0 10 -262144 -1 -1 2950 1;
-#X obj 243 449 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/setMaxSpeed /stepper/\$1/setMaxSpeed
+#X obj 325 449 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/setMaxSpeed /stepper/\$1/setMaxSpeed
 empty 0 -8 0 10 -262144 -1 -1 1 256;
-#X obj 342 372 vsl 25 60 0 2 0 0 /stepper/\$1/acceleration /stepper/\$1/acceleration
-acc 4 70 0 10 -233017 -233017 -195568 0 1;
-#X obj 333 449 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/acceleration
-/stepper/\$1/acceleration empty 0 -8 0 10 -233017 -233017 -195568 0
+#X obj 424 372 vsl 25 60 0 2 0 0 /stepper/\$1/acceleration /stepper/\$1/acceleration
+acc 4 70 0 10 -233017 -233017 -195568 2950 1;
+#X obj 415 449 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/acceleration
+/stepper/\$1/acceleration empty 0 -8 0 10 -233017 -233017 -195568 1
 256;
 #X obj 434 838 cnv 15 180 100 empty empty presets 2 8 0 14 -233017
 -128992 0;
 #X obj 197 175 bng 15 250 50 0 /stepper/\$1/updateStatus /stepper/\$1/updateStatus
 refresh -45 8 0 10 -262144 -1 -1;
-#X obj 357 295 bng 25 250 50 0 /stepper/\$1/stop /stepper/\$1/stop
+#X obj 439 295 bng 25 250 50 0 /stepper/\$1/stop /stepper/\$1/stop
 STOP 1 14 0 10 -258113 -1 -1;
 #X obj 281 531 t b b;
 #X obj 286 765 s /stepper/\$1/sequences/list;
 #X msg 309 559 clear \, align 0 \, add none \, set 0;
 #X obj 83 127 s /stepper/\$1/pos/current;
-#X obj 224 229 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/startPos
+#X obj 306 229 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/startPos
 /stepper/\$1/move/startPos Position_depart 0 -8 0 12 -204800 -1 -1
 0 256;
-#X obj 353 229 bng 15 250 50 0 /stepper/\$1/move/gotoStart /stepper/\$1/move/gotoStart
+#X obj 435 229 bng 15 250 50 0 /stepper/\$1/move/gotoStart /stepper/\$1/move/gotoStart
 goto 17 7 0 10 -204800 -1 -1;
-#X obj 296 229 bng 15 250 50 0 /stepper/\$1/move/setStart /stepper/\$1/move/setStart
+#X obj 378 229 bng 15 250 50 0 /stepper/\$1/move/setStart /stepper/\$1/move/setStart
 set 17 7 0 10 -262144 -1 -1;
 #X obj 148 241 nbx 3 14 -1e+37 1e+37 0 0 /stepper/\$1/pos/current/deg
-/stepper/\$1/pos/current/deg degrees -50 8 0 10 -262144 -1 -1 259.978
-256;
+/stepper/\$1/pos/current/deg degrees -50 8 0 10 -262144 -1 -1 0 256
+;
 #X obj 148 225 nbx 5 14 -1e+37 1e+37 0 0 /stepper/\$1/pos/current /stepper/\$1/pos/current
-turns -45 7 0 10 -262144 -1 -1 1.72216 256;
-#X obj 233 308 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/deg /stepper/\$1/move/deg
-deg 48 8 0 10 -262144 -1 -1 20 256;
+turns -45 7 0 10 -262144 -1 -1 0 256;
+#X obj 315 308 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/deg /stepper/\$1/move/deg
+deg 48 8 0 10 -262144 -1 -1 0 256;
 #X obj 153 97 s /stepper/\$1/pos/onTarget;
-#X obj 301 174 cnv 25 70 25 /stepper/\$1/runningGui /stepper/\$1/runningGui
+#X obj 383 174 cnv 25 70 25 /stepper/\$1/runningGui /stepper/\$1/runningGui
 idle 17 12 0 14 -233017 -195568 0;
 #X obj 353 122 r /stepper/\$1/accGUI;
-#X text 225 263 Reglages mouvement;
-#X obj 405 172 cnv 15 370 305 empty empty Sequence 2 8 0 14 -233017
+#X text 307 263 Reglages mouvement;
+#X obj 487 172 cnv 15 370 305 empty empty Sequence 2 8 0 14 -233017
 -128992 0;
-#X obj 637 248 bng 15 250 50 0 /stepper/\$1/writeSeq /stepper/\$1/writeSeq
+#X obj 719 248 bng 15 250 50 0 /stepper/\$1/writeSeq /stepper/\$1/writeSeq
 save 17 7 0 10 -262144 -1 -1;
 #X text 144 204 CURRENT;
 #X obj 172 824 tof/menubutton 100 25 \$0-mbS \$0-mbR 1 grey90 black
 grey95 black 0 \, none \, test (autre copie).move \, test.move \, test (3e copie).move
 \, test (4e copie).move \, test (copie).move;
 #X obj 183 801 r /stepper/\$1/sequences/list;
-#X obj 637 228 bng 15 250 50 0 /stepper/\$1/sequencer/open empty choose_sequence
+#X obj 719 228 bng 15 250 50 0 /stepper/\$1/sequencer/open empty choose_sequence
 17 7 0 10 -262144 -1 -1;
-#X obj 798 255 nbx 5 14 -1e+37 1e+37 0 0 /stepper/\$1/cue/current /stepper/\$1/cue/current
+#X obj 898 255 nbx 5 14 -1e+37 1e+37 0 0 /stepper/\$1/cue/current /stepper/\$1/cue/current
 empty 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 481 229 bng 30 250 50 0 /stepper/\$1/sequencer/go /stepper/\$1/sequencer/go
+#X obj 563 229 bng 30 250 50 0 /stepper/\$1/sequencer/go /stepper/\$1/sequencer/go
 GO 9 16 0 10 -204786 -1 -1;
 #X msg 494 538 1;
-#X obj 534 229 tgl 30 0 /stepper/\$1/sequencer/loop /stepper/\$1/sequencer/loop
-loop 32 15 0 13 -162280 -1 -1 1 1;
-#X obj 791 226 bng 15 250 50 0 /stepper/\$1/sequencer/load /stepper/\$1/sequencer/load
+#X obj 616 229 tgl 30 0 /stepper/\$1/sequencer/loop /stepper/\$1/sequencer/loop
+loop 32 15 0 13 -162280 -1 -1 0 1;
+#X obj 891 226 bng 15 250 50 0 /stepper/\$1/sequencer/load /stepper/\$1/sequencer/load
 reload 17 7 0 10 -262144 -1 -1;
-#X text 413 232 sequence;
+#X text 495 232 sequence;
 #N canvas 594 568 980 300 \$0-gui 0;
 #X obj 19 143 loadbang;
 #X obj 19 202 s /stepper/\$1/runningGui;
@@ -717,19 +717,20 @@ move \$2 \$1 \, setSpeed \$3 \$1 \, getStatus \$1 \$1;
 #X connect 106 0 83 1;
 #X connect 107 0 83 4;
 #X restore 661 117 pd \$0-modes&moves;
-#X obj 514 190 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/startPos
+#X obj 596 190 nbx 4 14 -1e+37 1e+37 0 0 /stepper/\$1/move/startPos
 /stepper/\$1/move/startPos Position_depart 0 -8 0 12 -204800 -1 -1
 0 256;
-#X obj 643 190 bng 15 250 50 0 /stepper/\$1/move/gotoStart /stepper/\$1/move/gotoStart
+#X obj 725 190 bng 15 250 50 0 /stepper/\$1/move/gotoStart /stepper/\$1/move/gotoStart
 goto 17 7 0 10 -204800 -1 -1;
-#X obj 586 190 bng 15 250 50 0 /stepper/\$1/move/setStart /stepper/\$1/move/setStart
+#X obj 668 190 bng 15 250 50 0 /stepper/\$1/move/setStart /stepper/\$1/move/setStart
 set 17 7 0 10 -262144 -1 -1;
-#X obj 410 273 stepperCue \$1 0;
-#X obj 410 263 cnv 15 66 5 /stepper/\$1/sequencer/wait/gui /stepper/\$1/sequencer/wait/gui
+#X obj 492 273 stepperCue \$1 0;
+#X obj 492 263 cnv 15 66 5 /stepper/\$1/sequencer/wait/gui /stepper/\$1/sequencer/wait/gui
 empty 20 12 0 14 -260818 -99865 0;
-#X obj 411 417 stepperCue \$1 3;
-#X obj 411 369 stepperCue \$1 2;
-#X obj 410 321 stepperCue \$1 1;
+#X obj 493 417 stepperCue \$1 3;
+#X obj 493 369 stepperCue \$1 2;
+#X obj 492 321 stepperCue \$1 1;
+#X text 226 281 1 -;
 #X connect 3 0 11 0;
 #X connect 11 0 10 0;
 #X connect 11 0 13 0;
@@ -752,4 +753,4 @@ empty 20 12 0 14 -260818 -99865 0;
 #X connect 40 0 39 0;
 #X connect 50 0 33 0;
 #X connect 50 0 34 0;
-#X coords 0 -1 1 1 700 329 1 80 150;
+#X coords 0 -1 1 1 780 329 1 80 150;