From ec53a2e4badbce4bd3b7846f16e31d54179924c2 Mon Sep 17 00:00:00 2001
From: Kristian Lauszus <lauszus@gmail.com>
Date: Sun, 5 Aug 2012 01:14:39 +0200
Subject: [PATCH] Added printNumber()

Still not working 100% - crashes sometimes
---
 SPP.cpp | 65 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 SPP.h   |  6 ++++++
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/SPP.cpp b/SPP.cpp
index 4f12f4e6..d208e39d 100644
--- a/SPP.cpp
+++ b/SPP.cpp
@@ -361,18 +361,18 @@ void SPP::ACLData(uint8_t* l2capinbuf) {
             Notify(PSTR(" "));
             PrintHex<uint8_t>(l2capinbuf[6]);
 #endif                
-        }        
-        if(waitForLastCommand && (millis() - timer) > 100) { // We will only wait 100ms and see if the UIH Remote Port Negotiation Command is send, as some deviced don't send it
-#ifdef DEBUG
-            Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"));
-#endif
-            creditSent = false;
-            waitForLastCommand = false;
-            connected = true; // The RFCOMM channel is now established
         }
     }
 }
 void SPP::Poll() {
+    if(waitForLastCommand && (millis() - timer) > 100) { // We will only wait 100ms and see if the UIH Remote Port Negotiation Command is send, as some deviced don't send it
+#ifdef DEBUG
+        Notify(PSTR("\r\nRFCOMM Connection is now established - Automatic\r\n"));
+#endif
+        creditSent = false;
+        waitForLastCommand = false;
+        connected = true; // The RFCOMM channel is now established
+    }
     SDP_task();
     RFCOMM_task();
 }
@@ -619,7 +619,10 @@ void SPP::l2capResponse2(uint8_t transactionIDHigh, uint8_t transactionIDLow) {
 /*                    RFCOMM Commands                       */
 /************************************************************/
 void SPP::RFCOMM_Command(uint8_t* data, uint8_t nbytes) {
+    if ((millis() - printTimer) < 10)// Check if is has been more than 10ms since last command
+        delay((uint32_t)(10 - (millis() - printTimer))); // There have to be a delay between commands
     pBtd->L2CAP_Command(hci_handle,data,nbytes,rfcomm_scid[0],rfcomm_scid[1]);
+    printTimer = millis();
 }
 
 void SPP::sendRfcomm(uint8_t channel, uint8_t direction, uint8_t CR, uint8_t channelType, uint8_t pfBit, uint8_t* data, uint8_t length) {
@@ -722,7 +725,6 @@ void SPP::print(const __FlashStringHelper *ifsh) {
     
     print(buf,size);
 }
-
 void SPP::println(const String &str) {
     str + "\r\n";
     print(str);
@@ -762,6 +764,51 @@ void SPP::println(const __FlashStringHelper *ifsh) {
     buf[size+1] = '\n';
     print(buf,size+2);
 }
+void SPP::println(void) {
+    print("\r\n");    
+}
+
+/* These must be used to print numbers */
+void SPP::printNumber(uint16_t n) {
+    uint16_t temp = n;
+    uint8_t digits = 0;
+    while (temp) {
+        temp /= 10;
+        digits++;
+    }        
+    if(digits == 0)
+        print("0");
+    else {
+        uint8_t buf[digits];
+        for(uint8_t i = 1; i < digits+1; i++) {
+            buf[digits-i] = n%10; // Get number and convert to ASCII Character
+            buf[digits-i] += 48;
+            n /= 10;
+        }
+        print(buf,digits);
+    }
+}
+void SPP::printNumberln(uint16_t n) {
+    uint16_t temp = n;
+    uint8_t digits = 0;
+    while (temp) {
+        temp /= 10;
+        digits++;
+    }
+    if(digits == 0)
+        print("0\r\n");
+    else {
+        uint8_t buf[digits+2];
+        for(uint8_t i = 1; i < digits+1; i++) {
+            buf[digits-i] = n%10; // Get number and convert to ASCII Character
+            buf[digits-i] += 48;
+            n /= 10;
+        }
+        buf[digits] = '\r';
+        buf[digits+1] = '\n';
+        print(buf,digits+2);
+    }
+}
 
 uint8_t SPP::read() {
     uint8_t output = rfcommDataBuffer[0];
diff --git a/SPP.h b/SPP.h
index a6b736a1..41d8a729 100644
--- a/SPP.h
+++ b/SPP.h
@@ -117,6 +117,10 @@ public:
     void println(uint8_t data); // Include newline and carriage return
     void println(uint8_t* array, uint8_t length); // Include newline and carriage return
     void println(const __FlashStringHelper *); // Include newline and carriage return
+    void println(void);
+    
+    void printNumber(uint16_t n);
+    void printNumberln(uint16_t n);
     
     uint8_t available() { return rfcommAvailable; }; // Get the bytes waiting to be read
     uint8_t read(); // Used to read the buffer
@@ -164,6 +168,8 @@ private:
     bool firstMessage; // Used to see if it's the first SDP request received    
     uint8_t bytesRead; // Counter to see when it's time to send more credit
     
+    unsigned long printTimer; // Used to set a delay, so it doesn't try to print too fast
+    
     /* State machines */
     void SDP_task(); // SDP state machine
     void RFCOMM_task(); // RFCOMM state machine