Diff: main.cpp

Revision:

3:dddd476d5967

Parent:

2:2f222449973a

Child:

9:dddf6ed7e992

--- a/main.cpp	Mon Aug 11 04:53:00 2014 -0700
+++ b/main.cpp	Mon Aug 11 13:55:39 2014 -0700
@@ -21,6 +21,7 @@
 
 
 int wiconnectLogDebug(const char *str);
+int wiconnectLogAssert(const char *str);
 
 
 static const CommandListEntry commandList[] =
@@ -33,12 +34,16 @@
     CMD_LIST_TERMINATOR
 };
 
-static const SerialConfig serialConfig(WICONNECT_RX_PIN, WICONNECT_TX_PIN, WICONNECT_CTS_PIN, WICONNECT_RTS_PIN, WICONNECT_DEFAULT_BAUD, NULL, WICONNECT_SERIAL_RX_BUFFER_SIZE);
-static Wiconnect wiconnectIfc(serialConfig, NULL, WICONNECT_INTERNAL_BUFFER_SIZE, WICONNECT_RESET_PIN, WICONNECT_WAKE_PIN, TEST_NONBLOCKING_API);
+char testBuffer[TEST_BUFFER_LENGTH];
+static uint8_t wiconnectInternalBuffer[WICONNECT_INTERNAL_BUFFER_SIZE];
+static uint8_t wiconnectSerialRxBuffer[WICONNECT_SERIAL_RX_BUFFER_SIZE];
+
+static const SerialConfig serialConfig(WICONNECT_RX_PIN, WICONNECT_TX_PIN, WICONNECT_CTS_PIN, WICONNECT_RTS_PIN, WICONNECT_DEFAULT_BAUD, wiconnectSerialRxBuffer, WICONNECT_SERIAL_RX_BUFFER_SIZE);
+static Wiconnect wiconnectIfc(serialConfig, wiconnectInternalBuffer, WICONNECT_INTERNAL_BUFFER_SIZE, WICONNECT_RESET_PIN, WICONNECT_WAKE_PIN, TEST_NONBLOCKING_API);
 
 ConsoleSerial consoleSerial(SERIAL_TX, SERIAL_RX);
 CommandProcessor cmdProcessor(&consoleSerial, commandList);
-char testBuffer[TEST_BUFFER_LENGTH];
+
 
 
 /*************************************************************************************************/
@@ -49,6 +54,8 @@
 
     consoleSerial.setBaud(CONSOLE_BAUD);
 
+    wiconnectIfc.setAssertLogger(LogFunc(wiconnectLogAssert));
+    wiconnectIfc.setCommandDefaultTimeout(5000);
 #ifdef ENABLE_WICONNECT_DEBUG
     wiconnectIfc.setDebugLogger(LogFunc(wiconnectLogDebug));
 #endif
@@ -99,3 +106,10 @@
     return 0;
 }
 
+/*************************************************************************************************/
+int wiconnectLogAssert(const char *str)
+{
+    logWrite("\r\n\r\n[ASSERT] ", 13);
+    logWrite(str, strlen(str));
+    return 0;
+}