x8: rpc: allow using Serial in libraries

Author: facchinm

cores/arduino/Arduino.h

@@ -115,6 +115,7 @@ extern analogin_config_t adcCurrentConfig;
 #if defined(RPC_SERIAL)
 #undef Serial
 #if __has_include("RPC.h")
+#include "SerialRPC.h"
 #define Serial SerialRPC
 #else
 extern ErrorSerialClass ErrorSerial;

libraries/RPC/src/SerialRPC.cpp

@@ -1,3 +1,25 @@
 #include "SerialRPC.h"
+#include "RPC.h"
+
+size_t arduino::SerialRPCClass::write(uint8_t* buf, size_t len) {
+    tx_buffer.clear();
+    for (size_t i=0; i < len; i++) {
+        tx_buffer.push_back(buf[i]);
+    }
+    RPC.send("tty", tx_buffer);
+    return len;
+}
+
+int arduino::SerialRPCClass::begin(long unsigned int, uint16_t) {
+    if (RPC.begin() == 0) {
+        return 0;
+    }
+    RPC.bind("tty", mbed::callback(this, &SerialRPCClass::onWrite));
+    return 1;
+}
+
+arduino::SerialRPCClass::operator bool() {
+    return RPC;
+}
 
 arduino::SerialRPCClass SerialRPC;

libraries/RPC/src/SerialRPC.h

@@ -1,5 +1,8 @@
-#include "RPC.h"
+#ifndef __SERIAL_RPC__
+#define __SERIAL_RPC__
+
 #include "Arduino.h"
+#include <vector>
 
 namespace arduino {
 
@@ -29,6 +32,9 @@ class SerialRPCClass : public Stream {
 	  }
 	}
 
+	int begin(long unsigned int = 0, uint16_t = 0);
+	size_t write(uint8_t* buf, size_t len);
+
 	size_t write(uint8_t c) {
 		return write(&c, 1);
 	}
@@ -43,28 +49,9 @@ class SerialRPCClass : public Stream {
 		return write((uint8_t*)buf, len);
 	}
 
-	size_t write(uint8_t* buf, size_t len) {
-		tx_buffer.clear();
-		for (size_t i=0; i < len; i++) {
-			tx_buffer.push_back(buf[i]);
-		}
-		RPC.send("tty", tx_buffer);
-		return len;
-	}
-
 	using Print::write;
 
-	int begin(long unsigned int = 0, uint16_t = 0) {
-		if (RPC.begin() == 0) {
-			return 0;
-		}
-		RPC.bind("tty", mbed::callback(this, &SerialRPCClass::onWrite));
-		return 1;
-	}
-
-	operator bool() {
-		return RPC;
-	}
+	operator bool();
 
     void attach(void (*fptr)(void))
     {
@@ -80,4 +67,6 @@ class SerialRPCClass : public Stream {
 };
 }
 
-extern arduino::SerialRPCClass SerialRPC;
+extern arduino::SerialRPCClass SerialRPC;
+
+#endif