From 1710ad8b0781ba52c51b5093e387d578ec0f61c0 Mon Sep 17 00:00:00 2001 From: schneider Date: Sun, 17 Jul 2011 10:53:52 +0200 Subject: [PATCH] debug output for cdc example --- firmware/applications/cdc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/firmware/applications/cdc.c b/firmware/applications/cdc.c index ae91545..88e3838 100644 --- a/firmware/applications/cdc.c +++ b/firmware/applications/cdc.c @@ -4,6 +4,11 @@ #include "core/usbcdc/usbhw.h" #include "core/usbcdc/cdcuser.h" #include "core/usbcdc/cdc_buf.h" +#include +#include "basic/basic.h" +#include "lcd/render.h" +#include "lcd/allfonts.h" + volatile unsigned int lastTick; int puts(const char * str) @@ -36,18 +41,24 @@ int puts(const char * str) void main_cdc(void) { + int dx = 0; //lastTick = systickGetTicks(); // Used to control output/printf timing + + lcdPrintln("Init USB"); lcdRefresh(); + CDC_Init(); // Initialise VCOM USB_Init(); // USB Initialization USB_Connect(TRUE); // USB Connect // Wait until USB is configured or timeout occurs uint32_t usbTimeout = 0; - while ( usbTimeout < CFG_USBCDC_INITTIMEOUT / 10 ) + while ( usbTimeout < CFG_USBCDC_INITTIMEOUT / 10 ) { if (USB_Configuration) break; delayms(10); // Wait 10ms usbTimeout++; } + lcdPrintln("Done"); lcdRefresh(); + uint8_t buf[2] = {0,0}; int l; while(1){ @@ -56,6 +67,8 @@ void main_cdc(void) l = 1; CDC_RdOutBuf (buf, &l); puts(buf); + dx=DoString(dx,0,buf); + lcdDisplay(0); } //puts("hello world\r\n"); //delayms(1);