add config example for comples arts board with BN085 gyroscope.

This reverts commit 2d88948c99.

main/espd.c

@@ -177,24 +177,17 @@ static void initdacs( void)
         get_i2s_pins(I2S_NUM_0, (board_i2s_pin_t *)(&i2s_pin_cfg));
 #else /* PD_LYRAT */
         i2s_pin_config_t i2s_pin_cfg = {
-#if 0       /* generic board 1 - edit this as needed */
+        .bck_io_num = PIN_BIT_CLOCK,    /* bit clock */
-        .bck_io_num = 13,         /* bit clock */
+        .ws_io_num = PIN_WORD_SELECT,   /* Word select, aka left right clock */
-        .ws_io_num = 33,          /* Word select, aka left right clock */
+        .data_out_num = PIN_DATA_OUT,   /* Data out ESP32 - to DIN on 38357A */
-        .data_out_num = 32,       /* Data out from ESP32, to DIN on 38357A */
+        .data_in_num = PIN_DATA_IN      /* data from ADC */
-        .data_in_num = 35         /* data from ADC */
-#endif
-#if 1   /* complex arts sensorboard */
-        .bck_io_num = 33,         /* bit clock */
-        .ws_io_num = 25,          /* Word select, aka left right clock */
-        .data_out_num = 32,       /* Data out from ESP32, to DIN on 38357A */
-        .data_in_num = 26         /* ADC */
-#endif
         };
 #endif /* PD_LYRAT */
         i2s_set_pin(I2S_NUM_0, &i2s_pin_cfg);
     }               
 }
 #else /* OBSOLETEAPI */
+
 static void initdacs( void)
 {
     
@@ -219,10 +212,10 @@ static void initdacs( void)
             I2S_SLOT_MODE_STEREO),
         .gpio_cfg = {
             .mclk = I2S_GPIO_UNUSED,
-            .bclk = 13,
+            .bclk = PIN_BIT_CLOCK,
-            .ws = 33,
+            .ws = PIN_WORD_SELECT,
-            .dout = 32,
+            .dout = PIN_DATA_OUT,
-            .din = 35,
+            .din = PIN_DATA_IN,
             .invert_flags = {
                 .mclk_inv = false,
                 .bclk_inv = false,

main/espd.h

@@ -4,8 +4,9 @@
 /* #define PD_INCLUDEPATCH */   /* load the patch defined in "testpatch.c" */
 /* #define PD_LYRAT */          /* using LyraT or LyraT mini board */
 #define USEADC                  /* enable audio input (output always enabled) */
+/* #define PD_USE_GYRO */       /* complex Arts board with BNO085 gyro */
 #define IOCHANS 2
-#define OBSOLETEAPI 0
+#define OBSOLETEAPI       /* need this for LyraT boards */
 
 /* task priorities */
 #define  PRIORITY_WIFI 2
@@ -32,7 +33,6 @@ void bt_init( void);
 void pd_bt_writeback(unsigned char *s, int length);
 #endif
 
-
 #ifdef PD_USE_WIFI
 void wifi_init(void);   /* wifi.c - manage 802.11 connection */
 void net_init( void);   /* init */

pd

@@ -1 +1 @@
-Subproject commit d6326559b2b26038d70f538725e0974c39de1fc4
+Subproject commit c0f1664bbf600c9e7d27d2b5defa806f7bd1474a

test-patch/esp-patch.pd

@@ -1,35 +1,115 @@
-#N canvas 56 126 393 697 12;
+#N canvas 379 96 761 642 12;
-#X obj 119 294 r a;
+#X obj 77 229 r a;
 #X obj 158 87 loadbang;
 #X msg 156 123 dsp 1;
 #X obj 156 147 s pd;
 #X obj 46 160 r f;
-#X obj 144 352 r b;
+#X obj 85 262 r b;
-#X obj 54 354 +~;
+#X obj 46 259 +~;
-#X obj 46 187 phasor~ 440;
+#X obj 45 291 dac~ 1 2;
-#X obj 46 213 -~ 0.5;
+#X obj 147 301 adc~;
-#X obj 46 239 *~ 1e+15;
+#X obj 40 366 print~;
-#X obj 46 265 clip~ 0 1;
+#X obj 41 323 r p1;
-#X obj 52 326 *~ 0.03;
-#X obj 53 386 dac~ 1 2;
-#X obj 188 437 adc~;
-#X obj 112 508 print~;
-#X obj 113 465 r p1;
 #X obj 238 501 print~;
 #X obj 239 458 r p2;
-#X connect 0 0 11 1;
+#X obj 46 187 osc~ 440;
+#X obj 312 93 r~ x1;
+#X obj 454 97 r~ x2;
+#X obj 584 94 r~ x3;
+#X obj 315 387 s~ x1;
+#X obj 435 394 s~ x2;
+#X obj 556 398 s~ x3;
+#X obj 313 128 -~ 0.5;
+#X obj 313 154 *~ 1e+06;
+#X obj 313 180 clip~ 0 1;
+#X obj 314 205 *~;
+#X obj 346 205 r c1;
+#X obj 316 294 +~;
+#X obj 346 295 r f1;
+#X obj 316 320 phasor~;
+#X obj 336 352 cos~;
+#X obj 454 126 -~ 0.5;
+#X obj 454 152 *~ 1e+06;
+#X obj 454 178 clip~ 0 1;
+#X obj 455 203 *~;
+#X obj 457 292 +~;
+#X obj 457 318 phasor~;
+#X obj 477 350 cos~;
+#X obj 583 122 -~ 0.5;
+#X obj 583 148 *~ 1e+06;
+#X obj 583 174 clip~ 0 1;
+#X obj 584 199 *~;
+#X obj 586 288 +~;
+#X obj 586 314 phasor~;
+#X obj 606 346 cos~;
+#X obj 487 293 r f2;
+#X obj 617 289 r f3;
+#X obj 487 203 r c2;
+#X obj 616 199 r c3;
+#X obj 671 400 *~;
+#X obj 671 426 dac~;
+#X obj 44 231 *~;
+#X obj 692 374 r a1;
+#X obj 487 509 r gyro;
+#X obj 487 535 unpack 0 0 0;
+#X obj 444 507 r p3;
+#X obj 449 537 f;
+#X obj 446 567 pack 0 0 0;
+#X obj 446 593 print;
+#X obj 55 494 r p4;
+#X connect 0 0 49 1;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
-#X connect 4 0 7 0;
+#X connect 4 0 13 0;
 #X connect 5 0 6 1;
-#X connect 6 0 12 0;
+#X connect 6 0 7 0;
-#X connect 6 0 12 1;
+#X connect 6 0 7 1;
-#X connect 7 0 8 0;
 #X connect 8 0 9 0;
-#X connect 9 0 10 0;
+#X connect 8 1 11 0;
-#X connect 10 0 11 0;
+#X connect 10 0 9 0;
-#X connect 11 0 6 0;
+#X connect 12 0 11 0;
-#X connect 13 0 14 0;
+#X connect 13 0 49 0;
-#X connect 13 1 16 0;
+#X connect 14 0 20 0;
-#X connect 15 0 14 0;
+#X connect 15 0 29 0;
-#X connect 17 0 16 0;
+#X connect 16 0 36 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 33 0;
+#X connect 24 0 23 1;
+#X connect 25 0 27 0;
+#X connect 26 0 25 1;
+#X connect 27 0 17 0;
+#X connect 27 0 28 0;
+#X connect 28 0 47 0;
+#X connect 29 0 30 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 32 0 40 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 34 0 18 0;
+#X connect 35 0 47 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 0;
+#X connect 39 0 25 0;
+#X connect 40 0 41 0;
+#X connect 41 0 42 0;
+#X connect 41 0 19 0;
+#X connect 42 0 47 0;
+#X connect 43 0 33 1;
+#X connect 44 0 40 1;
+#X connect 45 0 32 1;
+#X connect 46 0 39 1;
+#X connect 47 0 48 0;
+#X connect 47 0 48 1;
+#X connect 49 0 6 0;
+#X connect 50 0 47 1;
+#X connect 51 0 52 0;
+#X connect 52 0 54 1;
+#X connect 52 1 55 1;
+#X connect 52 2 55 2;
+#X connect 53 0 54 0;
+#X connect 54 0 55 0;
+#X connect 55 0 56 0;

test-patch/host-patch.pd

@@ -1,42 +1,42 @@
-#N canvas 383 59 1262 545 12;
+#N canvas 258 27 1265 697 12;
 #X msg 373 294 listen 4498;
 #X obj 374 331 netreceive -u -f;
-#X listbox 481 365 26 0 0 0 - - - 0;
+#X listbox 468 360 26 0 0 0 - - - 0;
-#X listbox 374 398 26 0 0 0 - - - 0;
+#X listbox 374 389 26 0 0 0 - - - 0;
 #X obj 374 355 list;
-#X obj 372 426 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
+#X obj 372 417 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
 #X obj 373 268 loadbang;
 #X msg 55 38 listen 4498;
 #X msg 62 65 listen 0;
-#X floatatom 120 478 5 0 0 0 - - - 0;
+#X floatatom 142 414 5 0 0 0 - - - 0;
-#X obj 43 480 list;
+#X obj 52 469 list;
-#X listbox 43 504 20 0 0 0 - - - 0;
+#X listbox 52 493 20 0 0 0 - - - 0;
 #X obj 922 425 text define patch;
-#X obj 108 398 text sequence patch;
+#X obj 117 359 text sequence patch;
-#X obj 44 454 netreceive;
+#X obj 53 415 netreceive;
-#X msg 96 270 send pd foo 1;
+#X msg 105 231 send pd foo 1;
 #X obj 55 12 loadbang;
 #X obj 379 78 r amp;
 #X msg 379 104 set \$1;
 #X obj 379 130 s amp-set;
 #X floatatom 655 144 8 0 100 1 amp amp-set amp 0;
-#X obj 103 131 r amp;
+#X obj 86 123 r amp;
-#X msg 101 156 send a \$1;
+#X msg 84 148 send a \$1;
 #X msg 476 198 set \$1;
 #X floatatom 589 180 11 -100 100 1 bias bias-set bias 0;
 #X obj 476 172 r bias;
 #X obj 476 224 s bias-set;
-#X obj 181 129 r bias;
+#X obj 164 121 r bias;
-#X msg 179 154 send b \$1;
+#X msg 162 146 send b \$1;
 #X msg 510 285 set \$1;
 #X floatatom 623 267 10 0 1000 1 freq freq-set freq 0;
 #X obj 510 259 r freq;
 #X obj 510 311 s freq-set;
-#X obj 268 131 r freq;
+#X obj 251 123 r freq;
-#X msg 268 157 send f \$1;
+#X msg 251 149 send f \$1;
-#X obj 370 494 timer;
+#X obj 370 469 timer;
-#X obj 372 464 t b b;
+#X obj 372 439 t b b;
-#X floatatom 370 520 5 0 0 0 - - - 0;
+#X floatatom 370 495 5 0 0 0 - - - 0;
 #X obj 627 465 / 32768;
 #X obj 627 491 s freq;
 #X msg 626 439 8;
@@ -68,22 +68,49 @@
 #X msg 1166 155 639;
 #X msg 788 28 \; int-bias 255 \; amp 0 \; freq 0;
 #X msg 1134 153 510;
-#X msg 94 246 send pd foo 0;
+#X msg 103 207 send pd foo 0;
-#X msg 81 296 send pd foo 2;
+#X msg 90 257 send pd foo 2;
 #X floatatom 1053 395 11 0 0 0 - - - 0;
 #X obj 1053 446 s amp;
 #X obj 1053 420 / 200;
 #X msg 1016 33 \; amp 2 \; bias -1 \; freq 30;
 #X obj 1014 241 bng 35 250 50 0 empty empty empty 0 -11 0 12 #fcfcfc #000000 #000000;
 #X obj 921 397 r pat;
-#X obj 110 425 r esp;
+#X obj 119 386 r esp;
 #X msg 1013 281 \; pat read esp-patch.pd \; esp send pd begin-new poodle . \; seq line 0 \, auto \; esp send pd end-new;
-#X obj 105 373 r seq;
+#X obj 114 334 r seq;
 #X msg 749 455 \; esp send p1 bang;
 #X msg 752 494 \; esp send p2 bang;
 #X msg 1184 35 \; amp 0 \; bias 0 \; freq 30;
-#X obj 42 528 bng 21 250 50 0 empty empty empty 0 -11 0 12 #fcfcfc #000000 #000000;
+#X obj 52 525 bng 21 250 50 0 empty empty empty 0 -11 0 12 #fcfcfc #000000 #000000;
 #X msg 1090 33 \; amp 0.1 \; bias 0 \; freq 440;
+#X obj 53 441 route alive;
+#X obj 168 447 list;
+#X listbox 168 473 20 0 0 0 - - - 0;
+#X obj 62 557 r f1;
+#X msg 62 583 f1 \$1;
+#X obj 62 610 list;
+#X obj 110 557 r f2;
+#X obj 155 558 r f3;
+#X obj 203 558 r c1;
+#X obj 258 554 r c2;
+#X obj 306 554 r c3;
+#X msg 110 583 f2 \$1;
+#X msg 155 584 f3 \$1;
+#X msg 203 584 c1 \$1;
+#X msg 258 580 c2 \$1;
+#X msg 306 580 c3 \$1;
+#X msg 62 636 \; esp send \$1 \$2;
+#X msg 604 528 \; a1 0.2;
+#X msg 539 528 \; a1 0.02;
+#X msg 493 528 \; a1 0;
+#X obj 353 558 r a1;
+#X msg 353 584 a1 \$1;
+#X msg 751 540 \; esp send p3 bang;
+#X msg 743 600 \; esp send p4 bang;
+#X obj 202 405 print zzz;
+#X msg 120 286 send pd foo 3;
+#X msg 187 312 send pd znarf;
 #X connect 0 0 1 0;
 #X connect 1 0 4 0;
 #X connect 1 1 2 0;
@@ -93,10 +120,11 @@
 #X connect 6 0 0 0;
 #X connect 7 0 14 0;
 #X connect 8 0 14 0;
+#X connect 9 0 109 0;
 #X connect 10 0 11 0;
 #X connect 11 0 83 0;
 #X connect 13 0 14 0;
-#X connect 14 0 10 0;
+#X connect 14 0 85 0;
 #X connect 14 1 9 0;
 #X connect 15 0 14 0;
 #X connect 16 0 7 0;
@@ -149,3 +177,23 @@
 #X connect 76 0 12 0;
 #X connect 77 0 14 0;
 #X connect 79 0 13 0;
+#X connect 85 0 10 0;
+#X connect 85 1 86 0;
+#X connect 86 0 87 0;
+#X connect 88 0 89 0;
+#X connect 89 0 90 0;
+#X connect 90 0 101 0;
+#X connect 91 0 96 0;
+#X connect 92 0 97 0;
+#X connect 93 0 98 0;
+#X connect 94 0 99 0;
+#X connect 95 0 100 0;
+#X connect 96 0 90 0;
+#X connect 97 0 90 0;
+#X connect 98 0 90 0;
+#X connect 99 0 90 0;
+#X connect 100 0 90 0;
+#X connect 105 0 106 0;
+#X connect 106 0 90 0;
+#X connect 110 0 14 0;
+#X connect 111 0 14 0;

wifi/net.c

@@ -35,7 +35,7 @@ void tcpreceivertask(void *z)
         return;
     }
 
-    ESP_LOGI(TAG, "connecting...");
+    ESP_LOGI(TAG, "TCP connecting...");
     while ((err = connect(newsocket,
         (struct sockaddr *)&dest_addr, sizeof(dest_addr)) < 0))
     {
@@ -49,6 +49,7 @@ void tcpreceivertask(void *z)
         }
     }
     tcp_socket = newsocket;
+    ESP_LOGI(TAG, "TCP connected.");
     while (1)
     {
         int len = recv(newsocket, rx_buffer, sizeof(rx_buffer) - 1, 0);