merge in progress

components/display/display/component.mk

@@ -6,7 +6,8 @@
 # lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
 # please read the SDK documents if you need to do this.
 #
-COMPONENT_SRCDIRS := . tarablessd1306
+CFLAGS += 	-I$(COMPONENT_PATH)/../squeezelite
+COMPONENT_SRCDIRS := . tarablessd1306 tarablessd1306/fonts tarablessd1306/ifaces
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_ADD_INCLUDEDIRS += ./tarablessd1306
 

components/display/display/display.c

@@ -0,0 +1,76 @@
+/* 
+ *  (c) 2004,2006 Richard Titmuss for SlimProtoLib 
+ *  (c) Philippe G. 2019, philippe_44@outlook.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <ctype.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+#include "esp_log.h"
+#include "config.h"
+#include "embedded.h"
+#include "display.h"
+
+#define TAG 		"display"
+
+static bool (*slimp_handler_chain)(u8_t *data, int len);
+static struct display_handle_s *handle;
+
+static bool display_handler(u8_t *data, int len);
+
+/****************************************************************************************
+ * 
+ */
+void display_init(void) {
+	char *item = config_alloc_get(NVS_TYPE_STR, "display_config");
+
+	if (item && *item) { 
+		handle = &SSD1306_handle;
+		if (handle->init(item)) {
+			slimp_handler_chain = slimp_handler;
+			slimp_handler = display_handler;
+			ESP_LOGI(TAG, "Display initialization successful");
+		} else {
+			ESP_LOGI(TAG, "Display initialization failed");
+		}
+	} else {
+		ESP_LOGI(TAG, "no display");
+	}
+
+	if (item) free(item);
+}
+
+/****************************************************************************************
+ * Process graphic display data
+ */
+static bool display_handler(u8_t *data, int len){
+	bool res = true;
+
+	if (!strncmp((char*) data, "vfdc", 4)) {
+		handle->vfdc_handler(data, len);
+	} else if (!strncmp((char*) data, "grfe", 4)) {
+		handle->grfe_handler(data, len);
+	} else {
+		res = false;
+	}
+	
+	// chain protocol handlers (bitwise or is fine)
+	if (*slimp_handler_chain) res |= (*slimp_handler_chain)(data, len);
+	return res;
+}
+

components/display/display/display.h

@@ -0,0 +1,32 @@
+/* 
+ *  (c) Philippe G. 2019, philippe_44@outlook.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+struct display_handle_s {
+	bool (*init)(char *config);
+	void (*vfdc_handler)(u8_t *data, int len);
+	void (*grfe_handler)(u8_t *data, int len);
+	void (*grfb_handler)(u8_t *data, int len);
+	void (*visu_handler)(u8_t *data, int len);
+}; 
+
+extern struct display_handle_s SSD1306_handle;
+
+
+

components/display/display/driver_SSD1306.c

@@ -0,0 +1,245 @@
+/* 
+ *  (c) 2004,2006 Richard Titmuss for SlimProtoLib 
+ *  (c) Philippe G. 2019, philippe_44@outlook.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <ctype.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+#include "esp_log.h"
+#include "display.h"
+
+#include "ssd1306.h"
+#include "ssd1306_draw.h"
+#include "ssd1306_font.h"
+#include "ssd1306_default_if.h"
+
+#define I2C_PORT 	1
+#define I2C_ADDRESS	0x3C
+#define LINELEN		40
+#define TAG 		"display"
+
+static void 	vfdc_handler( u8_t *_data, int bytes_read);
+void 			grfe_handler( u8_t *data, int len);
+static bool 	display_init(char *config);
+
+struct display_handle_s SSD1306_handle = {
+	display_init,
+	vfdc_handler,
+	grfe_handler,
+	NULL, NULL,
+};
+
+static struct SSD1306_Device I2CDisplay;
+static SSD1306_AddressMode AddressMode = AddressMode_Invalid;
+
+static const unsigned char BitReverseTable256[] = 
+{
+  0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, 
+  0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8, 
+  0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4, 
+  0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC, 
+  0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2, 
+  0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+  0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6, 
+  0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+  0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+  0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9, 
+  0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+  0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+  0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3, 
+  0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+  0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7, 
+  0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+/****************************************************************************************
+ * 
+ */
+static bool display_init(char *config) {
+	bool res = false;
+
+	if (strstr(config, "I2C")) {
+		int scl = -1, sda = -1;
+		int width = -1, height = -1;
+		char *p;
+
+		// no time for smart parsing - this is for tinkerers
+		if ((p = strcasestr(config, "scl")) != NULL) scl = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "sda")) != NULL) sda = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1);
+		if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1);
+
+		if (sda != -1 && scl != -1 && width != -1 && height != -1) {
+			SSD1306_I2CMasterInitDefault( I2C_PORT, sda, scl );
+			SSD1306_I2CMasterAttachDisplayDefault( &I2CDisplay, width, height, I2C_ADDRESS, -1);
+			SSD1306_SetFont( &I2CDisplay, &Font_droid_sans_fallback_15x17 );
+			ESP_LOGI(TAG, "Initialized I2C display %dx%d (sda:%d, scl:%d)", width, height, sda, scl);
+			res = true;
+		} else {
+			ESP_LOGI(TAG, "Cannot initialized I2C display %s [%dx%d sda:%d, scl:%d]", config, width, height, sda, scl);
+		}
+	} else {
+		// other types
+	}
+
+	return res;
+}
+
+/****************************************************************************************
+ * Change special LCD chars to something more printable on screen 
+ */
+static void makeprintable(unsigned char * line) {
+	for (int n = 0; n < LINELEN; n++) {
+		switch (line[n]) {
+		case 11:		/* block */
+			line[n] = '#';
+			break;;
+		case 16:		/* rightarrow */
+			line[n] = '>';
+			break;;
+		case 22:		/* circle */
+			line[n] = '@';
+			break;;
+		case 145:		/* note */
+			line[n] = ' ';
+			break;;
+		case 152:		/* bell */
+			line[n] = 'o';
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+/****************************************************************************************
+ * Check if char is printable, or a valid symbol
+ */
+static bool charisok(unsigned char c) {
+   switch (c) {
+	  case 11:		/* block */
+	  case 16:		/* rightarrow */
+	  case 22:		/* circle */
+	  case 145:		/* note */
+	  case 152:		/* bell */
+		 return true;
+	 break;;
+	  default:
+		 return isprint(c);
+   }
+}
+
+/****************************************************************************************
+ * Show the display (text mode)
+ */
+static void show_display_buffer(char *ddram) {
+	char line1[LINELEN+1];
+	char *line2;
+
+	memset(line1, 0, LINELEN+1);
+	strncpy(line1, ddram, LINELEN);
+	line2 = &(ddram[LINELEN]);
+	line2[LINELEN] = '\0';
+
+	/* Convert special LCD chars */
+	makeprintable((unsigned char *)line1);
+	makeprintable((unsigned char *)line2);
+
+	ESP_LOGI(TAG, "\n\t%.40s\n\t%.40s", line1, line2);
+
+	SSD1306_Clear( &I2CDisplay, SSD_COLOR_BLACK );
+	SSD1306_FontDrawAnchoredString( &I2CDisplay, TextAnchor_NorthWest, line1, SSD_COLOR_WHITE );
+	SSD1306_FontDrawAnchoredString( &I2CDisplay, TextAnchor_SouthWest, line2, SSD_COLOR_WHITE );
+
+	// check addressing mode by rows
+	if (AddressMode != AddressMode_Horizontal) {
+		AddressMode = AddressMode_Horizontal;
+		SSD1306_SetDisplayAddressMode( &I2CDisplay, AddressMode );
+	}
+
+	SSD1306_Update( &I2CDisplay );
+}
+
+/****************************************************************************************
+ * Process display data
+ */
+static void vfdc_handler( u8_t *_data, int bytes_read) {
+	unsigned short *data = (unsigned short*) _data, *display_data;
+	char ddram[(LINELEN + 1) * 2];
+	int n, addr = 0; /* counter */
+
+	bytes_read -= 4;
+	if (bytes_read % 2) bytes_read--; /* even number of bytes */
+	// if we use Noritake VFD codes, display data starts at 12
+	display_data = &(data[5]); /* display data starts at byte 10 */
+
+	memset(ddram, ' ', LINELEN * 2);
+
+	for (n = 0; n < (bytes_read/2); n++) {
+		unsigned short d; /* data element */
+		unsigned char t, c;
+
+		d = ntohs(display_data[n]);
+		t = (d & 0x00ff00) >> 8; /* type of display data */
+		c = (d & 0x0000ff); /* character/command */
+		switch (t) {
+			case 0x03: /* character */
+				if (!charisok(c)) c = ' ';
+				if (addr <= LINELEN * 2) {
+					ddram[addr++] = c;
+		}
+				break;
+			case 0x02: /* command */
+				switch (c) {
+					case 0x06: /* display clear */
+						memset(ddram, ' ', LINELEN * 2);
+						break;
+					case 0x02: /* cursor home */
+						addr = 0;
+						break;
+					case 0xc0: /* cursor home2 */
+						addr = LINELEN;
+						break;
+				}
+		}
+	}
+
+	show_display_buffer(ddram);
+}
+
+/****************************************************************************************
+ * Process graphic display data
+ */
+void grfe_handler( u8_t *data, int len) {
+	data += 8;
+	len -= 8;
+
+	// to be verified, but this is as fast as using a pointer on data
+	for (int i = len - 1; i >= 0; i--) data[i] = BitReverseTable256[data[i]];
+
+	// check addressing mode by columns
+	if (AddressMode != AddressMode_Vertical) {
+		AddressMode = AddressMode_Vertical;
+		SSD1306_SetDisplayAddressMode( &I2CDisplay, AddressMode );
+	}
+	
+	SSD1306_WriteRawData( &I2CDisplay, data,  len);
+}
+
+

components/display/display/tarablessd1306/ssd1306.c

@@ -225,7 +225,7 @@ static bool SSD1306_Init( struct SSD1306_Device* DeviceHandle, int Width, int He
     SSD1306_SetInverted( DeviceHandle, false );
     SSD1306_SetDisplayClocks( DeviceHandle, 0, 8 );
     EnableChargePumpRegulator( DeviceHandle );
-    SSD1306_SetDisplayAddressMode( DeviceHandle, AddressMode_Horizontal );
+    SSD1306_SetDisplayAddressMode( DeviceHandle, AddressMode_Vertical );
     SSD1306_SetColumnAddress( DeviceHandle, 0, DeviceHandle->Width - 1 );
     SSD1306_SetPageAddress( DeviceHandle, 0, ( DeviceHandle->Height / 8 ) - 1 );
     SSD1306_EnableDisplayRAM( DeviceHandle );

components/display/text.c

@@ -1,187 +0,0 @@
-/* 
- *  (c) 2004,2006 Richard Titmuss for SlimProtoLib 
- *  (c) Philippe G. 2019, philippe_44@outlook.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string.h>
-#include <ctype.h>
-#include <arpa/inet.h>
-#include "esp_log.h"
-#include "config.h"
-
-#include "ssd1306.h"
-#include "ssd1306_draw.h"
-#include "ssd1306_font.h"
-#include "ssd1306_default_if.h"
-
-#define LINELEN 	40
-#define I2C_PORT 	1
-#define I2C_ADDRESS	0x3C
-#define TAG 		"display"
-
-static struct SSD1306_Device I2CDisplay;
-static bool init, display;
-
-void display_init(void) {
-	char *item = config_alloc_get(NVS_TYPE_STR, "display_config");
-
-	if (!item || !*item) { 
-		ESP_LOGI(TAG, "no display");
-		return;
-	}
-
-	if (strstr(item, "I2C")) {
-		int scl = -1, sda = -1;
-		int width = -1, height = -1;
-		char *p;
-
-		// done no matter what
-		init = true;
-
-		// no time for smart parsing - this is for tinkerers
-		if ((p = strcasestr(item, "scl")) != NULL) scl = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(item, "sda")) != NULL) sda = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(item, "width")) != NULL) width = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(item, "height")) != NULL) height = atoi(strchr(p, '=') + 1);
-
-		if (sda != -1 && scl != -1 && width != -1 && height != -1) {
-			SSD1306_I2CMasterInitDefault( I2C_PORT, sda, scl );
-			SSD1306_I2CMasterAttachDisplayDefault( &I2CDisplay, width, height, I2C_ADDRESS, -1);
-			SSD1306_SetFont( &I2CDisplay, &Font_droid_sans_fallback_15x17 );
-			ESP_LOGI(TAG, "initialized I2C display %dx%d (sda:%d, scl:%d)", width, height, sda, scl);
-			display = true;
-		} else {
-			ESP_LOGI(TAG, "cannot initialized I2C display %s [%dx%d sda:%d, scl:%d]", item, width, height, sda, scl);
-		}
-	} else {
-		// other types
-	}
-}
-
-//Change special LCD chars to something more printable on screen
-unsigned char printable(unsigned char c) {
-   switch (c) {
-	  case 11:		/* block */
-		return '#';
-		break;;
-	  case 16:		/* rightarrow */
-		return '>';
-		break;;
-	  case 22:		/* circle */
-		return '@';
-		break;;
-	  case 145:		/* note */
-		return ' ';
-		break;;
-	  case 152:		/* bell */
-		return 'o';
-		break;
-	  default:
-		return c;
-	  }
-}
-
-// Replace unprintable symbols in line
-void makeprintable(unsigned char * line) {
-	for (int n = 0; n < LINELEN; n++) line[n] = printable(line[n]);
-}
-
-// Show the display
-void show_display_buffer(char *ddram) {
-	char line1[LINELEN+1];
-	char *line2;
-
-	memset(line1, 0, LINELEN+1);
-	strncpy(line1, ddram, LINELEN);
-	line2 = &(ddram[LINELEN]);
-	line2[LINELEN] = '\0';
-
-	/* Convert special LCD chars */
-	makeprintable((unsigned char *)line1);
-	makeprintable((unsigned char *)line2);
-
-	ESP_LOGI(TAG, "\n\t%.40s\n\t%.40s", line1, line2);
-
-	if (display) {
-		SSD1306_Clear( &I2CDisplay, SSD_COLOR_BLACK );
-		SSD1306_FontDrawAnchoredString( &I2CDisplay, TextAnchor_NorthWest, line1, SSD_COLOR_WHITE );
-		SSD1306_FontDrawAnchoredString( &I2CDisplay, TextAnchor_SouthWest, line2, SSD_COLOR_WHITE );
-		SSD1306_Update( &I2CDisplay );
-	}
-}
-
-// Check if char is printable, or a valid symbol
-bool charisok(unsigned char c) {
-   switch (c) {
-	  case 11:		/* block */
-	  case 16:		/* rightarrow */
-	  case 22:		/* circle */
-	  case 145:		/* note */
-	  case 152:		/* bell */
-		 return true;
-	 break;;
-	  default:
-		 return isprint(c);
-   }
-}
-
-// Process display data
-void vfd_data( unsigned short *data, int bytes_read) {
-	unsigned short *display_data;
-	char ddram[LINELEN * 2];
-	int n;
-	int addr = 0; /* counter */
-
-	if (!init) display_init();
-
-	if (bytes_read % 2) bytes_read--; /* even number of bytes */
-	// if we use Noritake VFD codes, display data starts at 12
-	display_data = &(data[5]); /* display data starts at byte 10 */
-
-	memset(ddram, ' ', LINELEN * 2);
-
-	for (n = 0; n < (bytes_read/2); n++) {
-		unsigned short d; /* data element */
-		unsigned char t, c;
-
-		d = ntohs(display_data[n]);
-		t = (d & 0x00ff00) >> 8; /* type of display data */
-		c = (d & 0x0000ff); /* character/command */
-		switch (t) {
-			case 0x03: /* character */
-				if (!charisok(c)) c = ' ';
-				if (addr <= LINELEN * 2) {
-					ddram[addr++] = c;
-		}
-				break;
-			case 0x02: /* command */
-				switch (c) {
-					case 0x06: /* display clear */
-						memset(ddram, ' ', LINELEN * 2);
-						break;
-					case 0x02: /* cursor home */
-						addr = 0;
-						break;
-					case 0xc0: /* cursor home2 */
-						addr = LINELEN;
-						break;
-				}
-		}
-	}
-
-	show_display_buffer(ddram);
-}

components/services/battery.c

@@ -21,13 +21,11 @@
 
 static const char TAG[] = "battery";
 
-#ifdef CONFIG_SQUEEZEAMP
 static struct {
 	float sum, avg;
 	int count;
 	TimerHandle_t timer;
 } battery;
-#endif
 
 /****************************************************************************************
  * 

components/services/buttons.c

@@ -156,7 +156,7 @@ void button_create(void *id, int gpio, int type, bool pull, int debounce, button
 
 	if (n_buttons >= MAX_BUTTONS) return;
 
-	ESP_LOGI(TAG, "creating button using GPIO %u, type %u, pull-up/down %u, long press %u shifter %u", gpio, type, pull, long_press, shifter_gpio);
+	ESP_LOGI(TAG, "Creating button using GPIO %u, type %u, pull-up/down %u, long press %u shifter %u", gpio, type, pull, long_press, shifter_gpio);
 
 	if (!n_buttons) {
 		button_evt_queue = xQueueCreate(10, sizeof(struct button_s));

components/squeezelite/embedded.h

@@ -8,6 +8,7 @@
 		- pthread_create_name
 		- stack size
 		- s16_t, s32_t, s64_t and u64_t
+		- PLAYER_ID
 	can overload (use #define)
 		- exit
 		- gettime_ms
@@ -25,6 +26,7 @@
 #define OUTPUT_THREAD_STACK_SIZE  6 * 1024
 #define IR_THREAD_STACK_SIZE      6 * 1024
 
+#define PLAYER_ID 100
 #define BASE_CAP "Model=squeezeesp32,AccuratePlayPoints=1,HasDigitalOut=1,HasPolarityInversion=1,Firmware=" VERSION
 #define EXT_BSS __attribute__((section(".ext_ram.bss"))) 
 
@@ -43,12 +45,14 @@ uint32_t 	_gettime_ms_(void);
 int			pthread_create_name(pthread_t *thread, _CONST pthread_attr_t  *attr, 
 				   void *(*start_routine)( void * ), void *arg, char *name);
 
+// must provide	of #define as empty macros		
 void		embedded_init(void);
 void 		register_external(void);
 void 		deregister_external(void);
 void 		decode_resume(int external);
-void 		vfd_data(u8_t *data, int len);
 
+// optional, please chain 
+bool		(*slimp_handler)(u8_t *data, int len);
 void 		(*server_notify)(in_addr_t ip, u16_t hport, u16_t cport);
 				   
 #endif // EMBEDDED_H

components/squeezelite/slimproto.c

@@ -45,7 +45,7 @@ static sockfd sock = -1;
 static in_addr_t slimproto_ip = 0;
 static u16_t slimproto_hport = 9000;
 static u16_t slimproto_cport = 9090;
-static u8_t	player_id = 100; // squeezeesp32
+static u8_t	player_id = PLAYER_ID;
 
 extern struct buffer *streambuf;
 extern struct buffer *outputbuf;
@@ -450,11 +450,6 @@ static void process_dsco(u8_t *pkt, int len) {
 	player_id = 12;
 }
 
-static void process_vfdc(u8_t *pkt, int len) {
-	LOG_DEBUG("VFDC %u", len);
-	vfd_data( pkt, len - 4);
-}
-
 static void process_setd(u8_t *pkt, int len) {
 	struct setd_packet *setd = (struct setd_packet *)pkt;
 
@@ -531,7 +526,6 @@ static struct handler handlers[] = {
 	{ "setd", process_setd },
 	{ "serv", process_serv },
 	{ "dsco", process_dsco },
-	{ "vfdc", process_vfdc },
 	{ "",     NULL  },
 };
 
@@ -542,7 +536,7 @@ static void process(u8_t *pack, int len) {
 	if (h->handler) {
 		LOG_DEBUG("%s", h->opcode);
 		h->handler(pack, len);
-	} else {
+	} else if (!slimp_handler || !(*slimp_handler)(pack, len)) {
 		pack[4] = '\0';
 		LOG_WARN("unhandled %s", (char *)pack);
 	}

main/Params.txt

@@ -1,3 +1,5 @@
+espcoredump.py info_corefile -t b64 -c </path/to/saved/base64/text> </path/to/program/elf/file>
+
 LWIP
 Enable Copy between L2 and L3 no (no)
 Default receive window size 32768 (5740)
@@ -26,21 +28,42 @@ nvs_set autoexec1 str -v "join <SSID> <password>"
 # enable
 nvs_set autoexec u8 -v 1		
 
-nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -m ESP32-BT -R -Z 96000 -r \"44100-44100\" -e flac"
-nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -m ESP32-BT -R -Z 96000 -r \"44100-44100\""
+nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -BT -R -Z 96000 -r \"44100-44100\" -e flac"
+nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -BT -R -Z 96000 -r \"44100-44100\""
 nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -R -Z 96000 -r \"44100-44100\""
-nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -m ESP32-BT -R -u m -Z 192000 -r \"44100-44100\" -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -m ESP32-BT -r \"44100-44100\" -e flac"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info -m ESP32 -R -Z 96000 -r \"44100-44100\" -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info -m ESP32 -R -Z 96000 -r \"96000-96000\" -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info -m ESP32 -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info -m ESP32"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -m ESP32 -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info -m ESP32 -s 192.168.2.10"
-nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d decode=info -m ESP32 -s 192.168.2.144"
-nvs_set autoexec2 str -v "squeezelite -o SPDIF -b 500:2000 -d all=info -m ESP32"
+nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -BT -R -u m -Z 192000 -r \"44100-44100\" -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o \"BT -n 'RIVAARENA'\" -b 500:2000 -d all=info -BT -r \"44100-44100\" -e flac"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info  -R -Z 96000 -r \"44100-44100\" -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info  -R -Z 96000 -r \"96000-96000\" -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info  -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d all=info  -s 192.168.2.10"
+nvs_set autoexec2 str -v "squeezelite -o I2S -b 500:2000 -d decode=info  -s 192.168.2.144"
+nvs_set autoexec2 str -v "squeezelite -o SPDIF -b 500:2000 -d all=info "
+
+nvs_set autoexec1 str -v "squeezelite -o I2S -b 500:2000 -d all=info  -s 192.168.2.144"
+nvs_set autoexec1 str -v "squeezelite -o SPDIF -b 500:2000 -d all=info  -s 192.168.2.144"
 
 curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
 sudo add-apt-repository "deb [arch=arm64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
 sudo add-apt-repository "deb [arch=armhf] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
 sudo apt-get install docker-ce docker-ce-cli containerd.io
+
+
+
+# Build recovery.bin, bootloader.bin, ota_data_initial.bin, partitions.bin  
+# force appropriate rebuild by touching all the files which may have a RECOVERY_APPLICATION specific source compile logic
+	find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -type f -print0 | xargs -0 grep -l "RECOVERY_APPLICATION" | xargs touch
+	export PROJECT_NAME="recovery" 
+	make -j4 all EXTRA_CPPFLAGS='-DRECOVERY_APPLICATION=1'
+make flash
+#
+# Build squeezelite.bin
+# Now force a rebuild by touching all the files which may have a RECOVERY_APPLICATION specific source compile logic
+find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -type f -print0 | xargs -0 grep -l "RECOVERY_APPLICATION" | xargs touch
+export PROJECT_NAME="squeezelite" 
+make -j4 app EXTRA_CPPFLAGS='-DRECOVERY_APPLICATION=0'
+python  ${IDF_PATH}/components/esptool_py/esptool/esptool.py --chip esp32 --port ${ESPPORT} --baud 2000000 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x150000 ./build/squeezelite.bin  
+# monitor serial output
+make monitor

main/esp_app_main.c

@@ -71,6 +71,7 @@ extern const uint8_t server_cert_pem_start[] asm("_binary_github_pem_start");
 extern const uint8_t server_cert_pem_end[] asm("_binary_github_pem_end");
 
 extern void services_init(void);
+extern void	display_init(void);
 
 /* brief this is an exemple of a callback that you can setup in your own app to get notified of wifi manager event */
 void cb_connection_got_ip(void *pvParameter){