Revision 29:76e8acbafc80, committed 2017-04-06

Comitter:

JMF

Date:

Thu Apr 06 19:19:55 2017 +0000

Parent:

28:4a3244fcc463

Child:

30:11d88f24cde3

Commit message:

Switched to standard 'Serial' used in Mbed v5.4

Changed in this revision

--- a/MODSERIAL.lib	Thu Apr 06 13:57:24 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://developer.mbed.org/users/JMF/code/MODSERIAL-JMF/#3ad97b872bd6

--- a/WncControllerK64F.cpp	Thu Apr 06 13:57:24 2017 +0000
+++ b/WncControllerK64F.cpp	Thu Apr 06 19:19:55 2017 +0000
@@ -30,7 +30,7 @@
 
 using namespace WncControllerK64F_fk;
 
-WncControllerK64F::WncControllerK64F(struct WncGpioPinListK64F * pPins, MODSERIAL * wnc_uart, MODSERIAL * debug_uart)
+WncControllerK64F::WncControllerK64F(struct WncGpioPinListK64F * pPins, Serial * wnc_uart, Serial * debug_uart)
 {
     m_logTimer.start(); // Start the log timer now!    
     m_pDbgUart = debug_uart;
@@ -38,7 +38,7 @@
     m_gpioPinList = *pPins;
 }
 
-bool WncControllerK64F::enterWncTerminalMode(MODSERIAL * pUart, bool echoOn)
+bool WncControllerK64F::enterWncTerminalMode(Serial * pUart, bool echoOn)
 {
     if (pUart == NULL)
         return (false);  // Need a uart!

--- a/WncControllerK64F.h	Thu Apr 06 13:57:24 2017 +0000
+++ b/WncControllerK64F.h	Thu Apr 06 19:19:55 2017 +0000
@@ -32,7 +32,7 @@
 #include <string>
 #include <stdint.h>
 #include "mbed.h"
-#include "MODSERIAL.h"
+//jmf #include "MODSERIAL.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, MODSERIAL * wnc_uart, MODSERIAL * debug_uart = NULL);
+    WncControllerK64F(struct WncGpioPinListK64F * pPins, Serial * wnc_uart, Serial * 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(MODSERIAL *pUart, bool echoOn);
+    bool enterWncTerminalMode(Serial *pUart, bool echoOn);
     
 private:
 
@@ -116,8 +116,8 @@
     virtual void stopTimerB(void);
     virtual int  getTimerTicksB_mS(void);
 
-    MODSERIAL * m_pDbgUart;
-    MODSERIAL * m_pWncUart;
+    Serial * m_pDbgUart;
+    Serial * m_pWncUart;
     WncGpioPinListK64F m_gpioPinList;
     Timer m_logTimer;
     Timer m_timerA;