diff options
| author | Donald Delmar Davis <don@suspectdevices.com> | 2012-10-17 20:36:43 -0700 |
|---|---|---|
| committer | Donald Delmar Davis <don@suspectdevices.com> | 2012-10-17 20:36:43 -0700 |
| commit | 0d4c2699ced7558e3afc69198de05fdd73a4d29b (patch) | |
| tree | b948a324d4b763cf45e480836768f07e36a45067 /dumblogger/Monitor.cpp | |
| parent | ca70518b303b1006d6969e2f0cb288b2d773292e (diff) | |
fs work
Diffstat (limited to 'dumblogger/Monitor.cpp')
| -rw-r--r-- | dumblogger/Monitor.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/dumblogger/Monitor.cpp b/dumblogger/Monitor.cpp index 6b8297d..730d108 100644 --- a/dumblogger/Monitor.cpp +++ b/dumblogger/Monitor.cpp @@ -33,6 +33,7 @@ const char *keywords = KEYWORDS LOGGERKEYWORDS; +char debugBuffer[MAX_COMMAND_LINE_LENGTH]; //return buffer for console actions allocate this once use it often. char actionBuffer[MAX_COMMAND_LINE_LENGTH]; //return buffer for console actions allocate this once use it often. const char *theNak="NAK:"; @@ -77,12 +78,26 @@ char * lookupKey(int ndx, char *keyBuff) { return keyBuff; } -void toDevice(char *buff){ - usart_tx(USART1, (uint8_t *)buff, strlen(buff)); +void toDevice(const char *format, ...){ + va_list args; + va_start( args, format ); + vsprintf(actionBuffer, format, args ); + usart_tx(USART1, (uint8_t *)actionBuffer, strlen(actionBuffer)); usart_tx(USART1, (uint8_t *)"\r\n", 2); - ; + va_end(args); +} + +void debug(const char *format, ...){ + va_list args; + va_start( args, format ); + debugBuffer[0]='L',debugBuffer[1]='D',debugBuffer[2]='B',debugBuffer[3]=':', + vsprintf(debugBuffer+4, format, args ); + if(SerialUSB.isConnected() && (SerialUSB.getDTR() || SerialUSB.getRTS())) { + SerialUSB.write(debugBuffer); + SerialUSB.write("\r\n"); + } + va_end(args); } -extern "C" {int sdoPrintf(char *out, const char *format, ...);} void toConsole(const char *format, ...){ va_list args; @@ -98,7 +113,7 @@ void toConsole(const char *format, ...){ uint8_t NOPaction(uint8_t source) { if (source==CONSOLE) { - toConsole("DBG: Forwarding (%c%c%c)!", + debug("Forwarding (%c%c%c)!", consoleComm.line[0], consoleComm.line[1], consoleComm.line[2]); toDevice((char *)consoleComm.line); |
