Use pointer (not ref) internally, to allow different ports

PaulStoffregen · Dec 7, 2014 · 498a662 · 498a662
1 parent 5e597a0
commit 498a662
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/src/Bridge.cpp b/src/Bridge.cpp
@@ -19,7 +19,7 @@
 #include "Bridge.h"
 
 BridgeClass::BridgeClass(Stream &_stream) :
-  index(0), stream(_stream), started(false), max_retries(0) {
+  index(0), stream(&_stream), started(false), max_retries(0) {
   // Empty
 }
 
@@ -32,7 +32,7 @@ void BridgeClass::begin() {
   do {
     dropAll();
     delay(1000);
-  } while (stream.available() > 0);
+  } while (stream->available() > 0);
 
   while (true) {
     // Bridge interrupt:
@@ -43,15 +43,15 @@ void BridgeClass::begin() {
 
     // Bridge startup:
     // - If the bridge is not running starts it safely
-    stream.print(CTRL_C);
+    stream->print(CTRL_C);
     delay(250);
-    stream.print(F("\n"));
+    stream->print(F("\n"));
     delay(250);
-    stream.print(F("\n"));
+    stream->print(F("\n"));
     delay(500);
     // Wait for OpenWRT message
     // "Press enter to activate console"
-    stream.print(F("run-bridge\n"));
+    stream->print(F("run-bridge\n"));
     delay(500);
     dropAll();
 
@@ -125,8 +125,8 @@ void BridgeClass::crcReset() {
 }
 
 void BridgeClass::crcWrite() {
-  stream.write((char)(CRC >> 8));
-  stream.write((char)(CRC & 0xFF));
+  stream->write((char)(CRC >> 8));
+  stream->write((char)(CRC & 0xFF));
 }
 
 bool BridgeClass::crcCheck(uint16_t _CRC) {
@@ -143,24 +143,24 @@ uint16_t BridgeClass::transfer(const uint8_t *buff1, uint16_t len1,
   for ( ; retries < max_retries; retries++, delay(100), dropAll() /* Delay for retransmission */) {
     // Send packet
     crcReset();
-    stream.write((char)0xFF);                // Start of packet (0xFF)
+    stream->write((char)0xFF);                // Start of packet (0xFF)
     crcUpdate(0xFF);
-    stream.write((char)index);               // Message index
+    stream->write((char)index);               // Message index
     crcUpdate(index);
-    stream.write((char)((len >> 8) & 0xFF)); // Message length (hi)
+    stream->write((char)((len >> 8) & 0xFF)); // Message length (hi)
     crcUpdate((len >> 8) & 0xFF);
-    stream.write((char)(len & 0xFF));        // Message length (lo)
+    stream->write((char)(len & 0xFF));        // Message length (lo)
     crcUpdate(len & 0xFF);
     for (uint16_t i = 0; i < len1; i++) { // Payload
-      stream.write((char)buff1[i]);
+      stream->write((char)buff1[i]);
       crcUpdate(buff1[i]);
     }
     for (uint16_t i = 0; i < len2; i++) { // Payload
-      stream.write((char)buff2[i]);
+      stream->write((char)buff2[i]);
       crcUpdate(buff2[i]);
     }
     for (uint16_t i = 0; i < len3; i++) { // Payload
-      stream.write((char)buff3[i]);
+      stream->write((char)buff3[i]);
       crcUpdate(buff3[i]);
     }
     crcWrite();                     // CRC
@@ -227,22 +227,26 @@ int BridgeClass::timedRead(unsigned int timeout) {
   int c;
   unsigned long _startMillis = millis();
   do {
-    c = stream.read();
+    c = stream->read();
     if (c >= 0) return c;
   } while (millis() - _startMillis < timeout);
   return -1;     // -1 indicates timeout
 }
 
 void BridgeClass::dropAll() {
-  while (stream.available() > 0) {
-    stream.read();
+  while (stream->available() > 0) {
+    stream->read();
   }
 }
 
 // Bridge instance
-#if defined(__AVR_ATmega32U4__) || defined(SERIAL_PORT_USBVIRTUAL)
+#if defined(SERIAL_PORT_LINUXBRIDGE)
+// Arduino Yun or other boards that explicitly specify the default port
+SerialBridgeClass Bridge(SERIAL_PORT_LINUXBRIDGE);
+#elif defined(__AVR_ATmega32U4__) || defined(SERIAL_PORT_USBVIRTUAL)
 // Leonardo variants (where HardwareSerial is Serial1)
 SerialBridgeClass Bridge(Serial1);
 #else
+// Anything else, fall back to Serial
 SerialBridgeClass Bridge(Serial);
 #endif
diff --git a/src/Bridge.h b/src/Bridge.h
@@ -83,7 +83,7 @@ class BridgeClass {
 
   protected:
     static const char CTRL_C = 3;
-    Stream &stream;
+    Stream *stream;
     bool started;
     uint8_t max_retries;
 };
@@ -92,30 +92,30 @@ class BridgeClass {
 class SerialBridgeClass : public BridgeClass {
   public:
     SerialBridgeClass(HardwareSerial &_serial)
-      : BridgeClass(_serial), serial(_serial) {
+      : BridgeClass(_serial), serial(&_serial) {
       // Empty
     }
 
     void begin(unsigned long baudrate = 250000) {
-      serial.begin(baudrate);
+      serial->begin(baudrate);
       BridgeClass::begin();
     }
 
     // allow the user to begin with another port, which
     // must already be running at the correct baud rate
     void begin(Stream &port) {
-      stream = port;
+      stream = &port;
     }
 
     void begin(HardwareSerial &_serial, unsigned long baudrate = 250000) {
-      serial = _serial;
-      stream = _serial;
-      serial.begin(baudrate);
+      serial = &_serial;
+      serial->begin(baudrate);
+      stream = &_serial;
       BridgeClass::begin();
     }
 
   private:
-    HardwareSerial &serial;
+    HardwareSerial *serial;
 };
 
 extern SerialBridgeClass Bridge;