From 601a094fb5a24a4c90901cd1ab0e299c671bbb6e Mon Sep 17 00:00:00 2001 From: Bascy Date: Thu, 11 Oct 2018 23:05:53 +0200 Subject: [PATCH 1/3] Replaced ARDUINO_VARIANT with const char --- libraries/ESPmDNS/src/ESPmDNS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/ESPmDNS/src/ESPmDNS.cpp b/libraries/ESPmDNS/src/ESPmDNS.cpp index 42a4ad50349..89de0006486 100644 --- a/libraries/ESPmDNS/src/ESPmDNS.cpp +++ b/libraries/ESPmDNS/src/ESPmDNS.cpp @@ -82,7 +82,7 @@ void MDNSResponder::setInstanceName(String name) { void MDNSResponder::enableArduino(uint16_t port, bool auth){ mdns_txt_item_t arduTxtData[4] = { - {(char*)"board" ,(char*)ARDUINO_VARIANT}, + {(char*)"board" ,(char*)"esp32"}, {(char*)"tcp_check" ,(char*)"no"}, {(char*)"ssh_upload" ,(char*)"no"}, {(char*)"auth_upload" ,(char*)"no"} From 7fb2f31990879224a358c37269d3e1fb67fd5c8c Mon Sep 17 00:00:00 2001 From: Bascy Date: Sat, 10 Nov 2018 22:28:26 +0100 Subject: [PATCH 2/3] Fixed missing return value --- cores/esp32/esp32-hal-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c index 08956e18797..bc75e5157d2 100644 --- a/cores/esp32/esp32-hal-uart.c +++ b/cores/esp32/esp32-hal-uart.c @@ -242,7 +242,7 @@ void uartEnd(uart_t* uart) size_t uartResizeRxBuffer(uart_t * uart, size_t new_size) { if(uart == NULL) { - return; + return 0; } UART_MUTEX_LOCK(); From a29962ee7b1d3e7cf7ddb8ace90540f10806c23b Mon Sep 17 00:00:00 2001 From: Bascy Date: Sat, 15 Dec 2018 22:24:57 +0100 Subject: [PATCH 3/3] Added quotes around defined value in macro (Issue #2193) --- libraries/ESPmDNS/src/ESPmDNS.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/ESPmDNS/src/ESPmDNS.cpp b/libraries/ESPmDNS/src/ESPmDNS.cpp index 89de0006486..2211f67b9c7 100644 --- a/libraries/ESPmDNS/src/ESPmDNS.cpp +++ b/libraries/ESPmDNS/src/ESPmDNS.cpp @@ -43,6 +43,14 @@ License (MIT license): #include #include "esp_wifi.h" +// Add quotes around defined value +#ifdef __IN_ECLIPSE__ +#define STR_EXPAND(tok) #tok +#define STR(tok) STR_EXPAND(tok) +#else +#define STR(tok) tok +#endif + static void _on_sys_event(system_event_t *event){ mdns_handle_system_event(NULL, event); } @@ -82,7 +90,7 @@ void MDNSResponder::setInstanceName(String name) { void MDNSResponder::enableArduino(uint16_t port, bool auth){ mdns_txt_item_t arduTxtData[4] = { - {(char*)"board" ,(char*)"esp32"}, + {(char*)"board" ,(char*)STR(ARDUINO_VARIANT)}, {(char*)"tcp_check" ,(char*)"no"}, {(char*)"ssh_upload" ,(char*)"no"}, {(char*)"auth_upload" ,(char*)"no"}