From 558b4dbde3b9c5e575de08399bad94ae2737d697 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 18 Oct 2019 17:50:29 +0700
Subject: [PATCH] change DEBUG optimization option from O0 to Og

add uart write to board test example
---
 examples/device/board_test/src/main.c | 9 +++++++++
 examples/make.mk                      | 2 +-
 hw/bsp/board.h                        | 4 ++--
 hw/bsp/pca10056/pca10056.c            | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/examples/device/board_test/src/main.c b/examples/device/board_test/src/main.c
index 0126110e..16aad95f 100644
--- a/examples/device/board_test/src/main.c
+++ b/examples/device/board_test/src/main.c
@@ -42,6 +42,8 @@ enum  {
   BLINK_UNPRESSED = 1000
 };
 
+#define HELLO_STR   "Hello from TinyUSB\n"
+
 int main(void)
 {
   board_init();
@@ -49,13 +51,20 @@ int main(void)
   uint32_t start_ms = 0;
   bool led_state = false;
 
+
   while (1)
   {
     uint32_t interval_ms = board_button_read() ? BLINK_PRESSED : BLINK_UNPRESSED;
 
+    // uart echo
+//    uint8_t ch;
+//    if ( board_uart_read(&ch, 1) ) board_uart_write(&ch, 1);
+
     // Blink every interval ms
     if ( !(board_millis() - start_ms < interval_ms) )
     {
+      board_uart_write(HELLO_STR, strlen(HELLO_STR));
+
       start_ms = board_millis();
 
       board_led_write(led_state);
diff --git a/examples/make.mk b/examples/make.mk
index 55248396..b736b877 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -79,7 +79,7 @@ CFLAGS += \
 
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
-  CFLAGS += -O0 -ggdb -DCFG_TUSB_DEBUG=1
+  CFLAGS += -Og -ggdb -DCFG_TUSB_DEBUG=2
 else
 ifneq ($(BOARD), spresense)
   CFLAGS += -flto -Os
diff --git a/hw/bsp/board.h b/hw/bsp/board.h
index e0455b80..4c5716d9 100644
--- a/hw/bsp/board.h
+++ b/hw/bsp/board.h
@@ -107,10 +107,10 @@ static inline void board_delay(uint32_t ms)
   }
 }
 
-static inline int8_t board_uart_getchar(void)
+static inline int board_uart_getchar(void)
 {
   uint8_t c;
-  return board_uart_read(&c, 1) ? c : (-1);
+  return board_uart_read(&c, 1) ? (int) c : (-1);
 }
 
 static inline int board_uart_putchar(uint8_t c)
diff --git a/hw/bsp/pca10056/pca10056.c b/hw/bsp/pca10056/pca10056.c
index 78d9cc2c..2eaed025 100644
--- a/hw/bsp/pca10056/pca10056.c
+++ b/hw/bsp/pca10056/pca10056.c
@@ -156,6 +156,7 @@ int board_uart_read(uint8_t* buf, int len)
   (void) buf;
   (void) len;
   return 0;
+//  return NRFX_SUCCESS == nrfx_uart_rx(&_uart_id, buf, (size_t) len) ? len : 0;
 }
 
 int board_uart_write(void const * buf, int len)