فهرست منبع

improved serial management

gui improvements
use serialDevice name from settings
check if connected
Etienne Landon 7 سال پیش
والد
کامیت
7756615d8b
1فایلهای تغییر یافته به همراه114 افزوده شده و 37 حذف شده
  1. 114 37
      OSCstepperCtl.pd

+ 114 - 37
OSCstepperCtl.pd

@@ -1,18 +1,17 @@
 #N canvas 952 55 958 984 10;
-#N canvas 605 252 1054 472 SerialOSC 1;
+#N canvas 157 186 817 472 SerialOSC 0;
 #X obj 99 6 inlet;
-#X obj 99 332 outlet;
+#X obj 99 362 outlet;
 #X obj 99 200 comport;
-#X obj 329 264 print errors;
 #X msg 590 173 devices;
-#X obj 112 299 s /fromOSC;
-#X obj 122 49 r /toOSC;
+#X obj 112 329 s /fromOSC;
+#X obj 130 32 r /toOSC;
 #X obj 429 50 route 0 1;
 #X msg 429 132 close;
 #X obj 59 391 mrpeach/unpackOSC;
 #X obj 99 231 mrpeach/slipdec 65536;
-#X obj 99 261 mrpeach/unpackOSC;
-#X obj 99 97 mrpeach/packOSC;
+#X obj 99 291 mrpeach/unpackOSC;
+#X obj 99 57 mrpeach/packOSC;
 #X obj 99 122 mrpeach/slipenc 65536;
 #X msg 404 214 devicename /dev/ttyACM0 \, baud 115200 \, pollintervall
 1 \, verbose 1;
@@ -22,31 +21,109 @@
 #X obj 238 290 route 13 10;
 #X obj 253 321 list fromsymbol;
 #X obj 429 31 r serialConnect;
-#X obj 540 58 r serialDevice;
+#X obj 540 28 r serialDevice;
 #X obj 462 80 symbol;
-#X msg 459 110 devicename \$1 \, baud 115200 \, pollintervall 1 \,
-verbose 1;
-#X connect 0 0 12 0;
-#X connect 0 0 16 0;
-#X connect 2 0 10 0;
-#X connect 2 1 3 0;
+#X obj 540 49 symbol;
+#X obj 301 51 tgl 60 0 serialConnect empty connect 2 30 0 14 -24198
+-166441 -262144 1 1;
+#X obj 13 75 loadbang;
+#X obj 13 116 metro 200;
+#X msg 13 137 info;
+#X obj 329 264 route open;
+#X obj 382 292 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 13 96 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 1
+;
+#X obj 426 312 s serialIsOpen;
+#N canvas 1 55 450 300 \$0-colors 0;
+#X obj 129 33 r serialIsOpen;
+#X obj 129 54 route 0 1;
+#X obj 138 179 outlet;
+#X floatatom 243 160 5 0 0 0 - - -, f 5;
+#X msg 243 180 color \$1 \$1 \$1;
+#X msg 101 107 color 13 13 0 \, label connect \, set 0;
+#X msg 141 127 color 16 1 0 \, label connect;
+#X connect 0 0 1 0;
+#X connect 1 0 5 0;
+#X connect 1 1 6 0;
+#X connect 3 0 4 0;
 #X connect 4 0 2 0;
-#X connect 6 0 12 0;
-#X connect 7 0 8 0;
-#X connect 7 1 21 0;
-#X connect 8 0 2 0;
-#X connect 10 0 11 0;
-#X connect 11 0 1 0;
-#X connect 11 0 5 0;
-#X connect 12 0 13 0;
+#X connect 5 0 2 0;
+#X connect 6 0 2 0;
+#X restore 303 12 pd \$0-colors;
+#X msg 459 110 devicename \$1 \, baud 115200 \, pollintervall 1 \,
+verbose 1 \, retries 0;
+#X obj 362 51 cnv 20 22 60 empty serialSend S 4 12 0 20 -233017 -233017
+0;
+#X obj 362 81 cnv 20 22 30 empty serialReceive R 4 12 0 20 -233017
+-128992 0;
+#X obj 99 78 t a b;
+#N canvas 1 55 450 300 serialSendGUI 0;
+#X obj 70 23 inlet;
+#X obj 70 44 t b b;
+#X obj 70 81 delay 50;
+#X obj 72 163 s serialSend;
+#X floatatom 178 68 5 0 0 0 - - -, f 5;
+#X msg 151 90 color 10 10 11;
+#X msg 59 124 color 10 10 10;
+#X connect 0 0 1 0;
+#X connect 1 0 2 0;
+#X connect 1 1 5 0;
+#X connect 2 0 6 0;
+#X connect 4 0 5 0;
+#X connect 5 0 3 0;
+#X connect 6 0 3 0;
+#X restore 128 99 pd serialSendGUI;
+#X obj 99 252 t a b;
+#N canvas 1 55 450 300 serialReceiveGUI 0;
+#X obj 70 23 inlet;
+#X obj 70 44 t b b;
+#X obj 70 81 delay 50;
+#X floatatom 178 68 5 0 0 0 - - -, f 5;
+#X msg 151 90 color 10 10 11;
+#X msg 59 124 color 10 10 10;
+#X obj 72 163 s serialReceive;
+#X connect 0 0 1 0;
+#X connect 1 0 2 0;
+#X connect 1 1 4 0;
+#X connect 2 0 5 0;
+#X connect 3 0 4 0;
+#X connect 4 0 6 0;
+#X connect 5 0 6 0;
+#X restore 142 268 pd serialReceiveGUI;
+#X connect 0 0 11 0;
+#X connect 0 0 15 0;
+#X connect 2 0 9 0;
+#X connect 2 1 26 0;
+#X connect 3 0 2 0;
+#X connect 5 0 11 0;
+#X connect 6 0 7 0;
+#X connect 6 1 20 0;
+#X connect 7 0 2 0;
+#X connect 9 0 36 0;
+#X connect 10 0 1 0;
+#X connect 10 0 4 0;
+#X connect 11 0 34 0;
+#X connect 12 0 2 0;
 #X connect 13 0 2 0;
-#X connect 14 0 2 0;
-#X connect 18 0 16 0;
-#X connect 19 0 7 0;
-#X connect 20 0 21 1;
-#X connect 21 0 22 0;
-#X connect 22 0 2 0;
-#X coords 0 -1 1 1 85 60 1 300 50;
+#X connect 17 0 15 0;
+#X connect 18 0 6 0;
+#X connect 19 0 21 0;
+#X connect 20 0 31 0;
+#X connect 21 0 20 1;
+#X connect 23 0 28 0;
+#X connect 24 0 25 0;
+#X connect 25 0 2 0;
+#X connect 26 0 27 0;
+#X connect 26 0 29 0;
+#X connect 28 0 24 0;
+#X connect 30 0 22 0;
+#X connect 31 0 2 0;
+#X connect 34 0 12 0;
+#X connect 34 1 35 0;
+#X connect 36 0 10 0;
+#X connect 36 1 37 0;
+#X coords 0 -1 1 1 85 61 1 300 50;
 #X restore 747 137 pd SerialOSC;
 #X obj 723 491 print OSCin;
 #X obj 721 357 r /fromOSC;
@@ -121,12 +198,12 @@ bang;
 #X restore 157 714 pd syncControl;
 #X obj 12 13 kostepper 0;
 #X obj 12 362 kostepper 1;
-#N canvas 13 362 637 633 settings 0;
+#N canvas 4 354 637 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 1.5 \; speedLimit 1 \; microstepping 4 \; serialDevice
-/dev/ttyACM1 \;;
+/dev/ttyACM0 \;;
 #X msg 100 150 click;
 #X obj 417 249 r accLimit;
 #X floatatom 417 270 5 0 0 0 - - -, f 5;
@@ -145,11 +222,11 @@ bang;
 #X obj 407 465 symbol;
 #X msg 226 150 write ./settings;
 #X obj 231 33 loadbang;
-#X msg 258 77 read./settings;
 #X obj 231 54 t b b;
 #X obj 100 115 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X text 118 114 reload;
+#X msg 258 77 read ./settings;
 #X connect 0 0 2 0;
 #X connect 1 1 16 0;
 #X connect 1 1 10 0;
@@ -163,11 +240,11 @@ bang;
 #X connect 14 0 15 0;
 #X connect 15 0 9 0;
 #X connect 16 0 1 0;
-#X connect 17 0 19 0;
-#X connect 18 0 1 0;
-#X connect 19 0 11 0;
-#X connect 19 1 18 0;
-#X connect 20 0 19 0;
+#X connect 17 0 18 0;
+#X connect 18 0 11 0;
+#X connect 18 1 21 0;
+#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 776 67 pd settings;
 #X connect 2 0 3 0;