Revision 31:d9558aefb9e0, committed 2017-04-17

Comitter:

JMF

Date:

Mon Apr 17 23:58:40 2017 +0000

Parent:

30:11d88f24cde3

Child:

32:93703ebed512

Commit message:

The changes in this commit only update the UART serial routines from MODSERIAL to BufferedSerial. The BufferedSerial library has better support in mbed v5. MODSERIAL doesn't compile properly.

Changed in this revision

--- a/WncControllerK64F.cpp	Thu Apr 06 21:43:07 2017 -0400
+++ b/WncControllerK64F.cpp	Mon Apr 17 23:58:40 2017 +0000
@@ -30,7 +30,7 @@
 
 using namespace WncControllerK64F_fk;
 
-WncControllerK64F::WncControllerK64F(struct WncGpioPinListK64F * pPins, Serial * wnc_uart, Serial * debug_uart)
+WncControllerK64F::WncControllerK64F(struct WncGpioPinListK64F * pPins, BufferedSerial * wnc_uart, BufferedSerial * debug_uart)
 {
     m_logTimer.start(); // Start the log timer now!    
     m_pDbgUart = debug_uart;
@@ -38,7 +38,7 @@
     m_gpioPinList = *pPins;
 }
 
-bool WncControllerK64F::enterWncTerminalMode(Serial * pUart, bool echoOn)
+bool WncControllerK64F::enterWncTerminalMode(BufferedSerial * pUart, bool echoOn)
 {
     if (pUart == NULL)
         return (false);  // Need a uart!

--- a/WncControllerK64F.h	Thu Apr 06 21:43:07 2017 -0400
+++ b/WncControllerK64F.h	Mon Apr 17 23:58:40 2017 +0000
@@ -32,7 +32,7 @@
 #include <string>
 #include <stdint.h>
 #include "mbed.h"
-#include "Serial.h"
+#include "BufferedSerial.h"
 #include "WncController.h"
 
 namespace WncControllerK64F_fk {
@@ -77,7 +77,7 @@
      * @param wnc_uart - a pointer to the serial uart that is used to communicate with the WNC modem.
      * @param debug_uart - a pointer to a serial uart for the debug output to go out of, if NULL debug will not be output.
      */
-    WncControllerK64F(struct WncGpioPinListK64F * pPins, Serial * wnc_uart, Serial * debug_uart = NULL);
+    WncControllerK64F(struct WncGpioPinListK64F * pPins, BufferedSerial * wnc_uart, BufferedSerial * debug_uart = NULL);
     
     /**
      *
@@ -90,7 +90,7 @@
      * @param pUart - a pointer to a uart to use to collect the user input and put the output from the WNC.
      * @param echoOn - set to true to echo what is input back to the output of pUart.
      */
-    bool enterWncTerminalMode(Serial *pUart, bool echoOn);
+    bool enterWncTerminalMode(BufferedSerial *pUart, bool echoOn);
     
 private:
 
@@ -116,8 +116,8 @@
     virtual void stopTimerB(void);
     virtual int  getTimerTicksB_mS(void);
 
-    Serial * m_pDbgUart;
-    Serial * m_pWncUart;
+    BufferedSerial * m_pDbgUart;
+    BufferedSerial * m_pWncUart;
     WncGpioPinListK64F m_gpioPinList;
     Timer m_logTimer;
     Timer m_timerA;