for esp32, turn back on some system log and get modLog working

Author: phoddie

build/devices/esp32/xsProj/main/main.c

@@ -140,24 +140,13 @@ void loop(void)
 	to enable serial port for diagnostic information and debugging
 */
 
-#if 0
-	#define DEBUGIT(x)	printf x
-#else
-	#define DEBUGIT(x)
-#endif
 void modLog_transmit(const char *msg)
 {
-#if 0
-	printf("%s\n", msg);
-#else
 	uint8_t c;
 
-DEBUGIT(("modLog_transmit %s\n", msg));
 	if (gThe) {
 		while (0 != (c = c_read8(msg++)))
 			fx_putc(gThe, c);
-		fx_putc(gThe, 13);
-		fx_putc(gThe, 10);
 		fx_putc(gThe, 0);
 	}
 	else {
@@ -166,13 +155,10 @@ DEBUGIT(("modLog_transmit %s\n", msg));
 		ESP_putc(13);
 		ESP_putc(10);
 	}
-#endif
 }
 
 void ESP_putc(int c) {
 	char cx = c;
-
-DEBUGIT(("about to uart_write_bytes: %c\n", cx));
 	uart_write_bytes(USE_UART, &cx, 1);
 }
 
@@ -181,9 +167,7 @@ int ESP_getc(void) {
 	uint8_t myChar = ' ';
 	if (!ESP_isReadable())
 		return -1;
-DEBUGIT(("about to uart_read_bytes:\n"));
 	err = uart_read_bytes(USE_UART, &myChar, 1, 1);
-DEBUGIT((" ret: %d, char: %c\n", err, myChar));
 	if (err == 1)
 		return myChar;
 	return -1;

build/devices/esp32/xsProj/sdkconfig

@@ -157,10 +157,11 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF=
 CONFIG_NEWLIB_STDIN_LINE_ENDING_LF=
 CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_NEWLIB_NANO_FORMAT=
-CONFIG_CONSOLE_UART_DEFAULT=
+CONFIG_CONSOLE_UART_DEFAULT=y
 CONFIG_CONSOLE_UART_CUSTOM=
-CONFIG_CONSOLE_UART_NONE=y
+CONFIG_CONSOLE_UART_NONE=
 CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ULP_COPROC_ENABLED=
 CONFIG_ULP_COPROC_RESERVE_MEM=0
 CONFIG_ESP32_PANIC_PRINT_HALT=
@@ -308,13 +309,13 @@ CONFIG_HEAP_TRACING=
 #
 # Log output
 #
-CONFIG_LOG_DEFAULT_LEVEL_NONE=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=
 CONFIG_LOG_DEFAULT_LEVEL_ERROR=
-CONFIG_LOG_DEFAULT_LEVEL_WARN=
+CONFIG_LOG_DEFAULT_LEVEL_WARN=y
 CONFIG_LOG_DEFAULT_LEVEL_INFO=
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=
 CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=
-CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_LOG_DEFAULT_LEVEL=2
 CONFIG_LOG_COLORS=
 
 #

xs/includes/xsesp.h

@@ -102,11 +102,19 @@ extern void espFreeUint32(void *t);
 extern void modLog_transmit(const char *msg);
 extern void ESP_putc(int c);
 
-#define modLog(msg) \
-	do { \
-		static const char scratch[] ICACHE_XS6STRING_ATTR = msg ; \
-		modLog_transmit(scratch); \
-	} while (0)
+#if !ESP32
+	#define modLog(msg) \
+		do { \
+			static const char scratch[] ICACHE_XS6STRING_ATTR = msg ; \
+			modLog_transmit(scratch); \
+		} while (0)
+#else
+	#define modLog(msg) \
+		do { \
+			static const char scratch[] = msg ; \
+			modLog_transmit(scratch); \
+		} while (0)
+#endif
 #define modLogVar(msg) modLog_transmit(msg)
 #define modLogInt(msg) \
 	do { \