Paul bearne / HC05

Bluetooth module HC-05 Lib. suppotrs printf(); support IrqAttach, with using RTOS. include feature as background rxIrq attach. the lib store rx buf of serial, therefore can have over 16 bytes string. if you want to get string, you call read() or getLine(). read() is ALL string, getLine() is under CR('\r').

Dependencies:   RingBuffer

Fork of HC05 by Akinori Hashimoto

Diff: HC05.cpp

Revision:
4:488e26ebc411
Parent:
3:df094ed45a88
--- a/HC05.cpp	Wed Oct 28 06:14:40 2015 +0000
+++ b/HC05.cpp	Mon Nov 02 07:19:11 2015 +0000
@@ -1,6 +1,5 @@
 #include "HC05.h"
 
-
 HC05::HC05(PinName TX, PinName RX)
     : hc05(TX, RX)
 {
@@ -26,43 +25,36 @@
     return;
 }
 
-void HC05::setAttachRx(void (*fptr)(unsigned int))
+void HC05::setAttachRx(void (*fptr)(char))
 {
-//    hc05.attach(fptr, Serial::RxIrq);
+    // Serial.attachから呼ばれる_readIrq()内から、fptrをCall.
     fptrRxIrq= fptr;
     return;
 }
 
 bool HC05::readable()
 {
-//    return hc05.readable();
-    return hc05.readable() || !rxStr.empty();
+    return hc05.readable() || !ringBuf.empty();
 }
 
 string HC05::read() // public:
 {
     _read();
-    if(rxStr.empty())
+    if(ringBuf.empty())
         return "";
-
-    // rxStr is not empty.
-    string tmp= rxStr;
-    rxStr.erase();
-    return tmp;
+    return ringBuf.get();
 }
 
 string HC05::getLine()
 {
     string tmp= this->read();
-// rxStr is NULL;
-
     if(tmp.empty())
         return "";
 
     // tmp is not empty.
     int idx= tmp.rfind('\r');
     if(idx == string::npos) {
-        rxStr= tmp;     // 戻す
+        ringBuf.set(tmp);   // 戻す
         return "";
     }
 
@@ -72,28 +64,11 @@
 
     // idxは改行後の文字先頭Indexを示す。
     string rtn= tmp.substr(0, idx);
-    rxStr= tmp.substr(idx);
+    tmp= tmp.substr(idx);
+    ringBuf.set(tmp);
     return rtn;
 }
 
-/*
-
-string HC05::getLine()
-{
-    static string rxStr;
-
-    rxStr= "";
-    if(!hc05.readable())
-        return rxStr;
-
-    // Bufferを吸い尽くす
-    while(true) { //(;;) {
-        rxStr += (char)hc05.getc();
-        if(!hc05.readable())
-            return rxStr;//return; //break;    // Bufferになくなった
-    } // end for
-}
-*/
 void HC05::sendLine(string str, bool addCR)
 {
     if(addCR)
@@ -101,40 +76,26 @@
     hc05.printf(str.c_str());
     return;
 }
-/*
-void HC05::sendFloat(float num, string foreword)
-{
-    hc05.printf("%s%f\r\n", foreword.c_str(), num);
-    return;
-}
-void HC05::sendInt(int num, string foreword)
-{
-    hc05.printf("%s%d\r\n", foreword.c_str(), num);
-    return;
-}
-*/
+
 int HC05::_putc(int val)     // for printf()
 {
     hc05.putc(val);
     return val;
 }
 
-// for "Stream"
-int HC05::_getc()
+int HC05::_getc()       // for "Stream"
 {
     return -1;//hc05.getc();
 }
 
+// Internal READ()
 void HC05::_readIrq(void)
 {
-//    if(hc05.readable())
-//        rxStr += (char)hc05.getc();
-
     if(!hc05.readable())
         return;
 
-    unsigned int chr= hc05.getc();
-    rxStr += chr;
+    char chr= hc05.getc();
+    ringBuf.set(chr);
 
     if(this->fptrRxIrq == NULL)
         return;
@@ -146,7 +107,7 @@
 {
     // Bufferを吸い尽くす
     while(hc05.readable())
-        rxStr += (char)hc05.getc();
+        ringBuf.set((char)hc05.getc());
     return;         // Bufferになくなった
 }