Add CloudSerial and bridge stdout + stdin topics

Author: sandeepmistry

examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino

@@ -57,9 +57,19 @@ void setup() {
   }
 
   Serial.println("Successfully connected to Arduino Cloud :)");
+
+  CloudSerial.begin(9600);
 }
 
 void loop() {
   ArduinoCloud.poll();
+
+  if (CloudSerial.available()) {
+    Serial.write(CloudSerial.read());
+  }
+
+  if (Serial.available()) {
+    CloudSerial.write(Serial.read());
+  }
 }
 

src/ArduinoCloud.cpp

@@ -3,6 +3,8 @@
 #include <utility/ECCX08.h>
 #include <utility/ECCX08Cert.h>
 
+#include "CloudSerial.h"
+
 const static char server[] = "a19g5nbe27wn47.iot.eu-west-1.amazonaws.com"; //"xxxxxxxxxxxxxx.iot.xx-xxxx-x.amazonaws.com";
 
 const static int keySlot            = 0;
@@ -48,10 +50,14 @@ int ArduinoCloudClass::begin(Client& net, const String& id)
   _bearSslClient = new BearSSLClient(net);
   _bearSslClient->setEccSlot(keySlot, ECCX08Cert.bytes(), ECCX08Cert.length());
 
+  _mqttClient.onMessageAdvanced(ArduinoCloudClass::onMessage);
   _mqttClient.begin(server, 8883, *_bearSslClient);
 
   _id = id;
 
+  _stdoutTopic = "$aws/things/" + _id + "/stdout";
+  _stdinTopic = "$aws/things/" + _id + "/stdin";
+
   return 1;
 }
 
@@ -61,6 +67,8 @@ int ArduinoCloudClass::connect()
     return 0;
   }
 
+  _mqttClient.subscribe(_stdinTopic);
+
   return 1;
 }
 
@@ -74,4 +82,26 @@ void ArduinoCloudClass::onGetTime(unsigned long(*callback)(void))
   ArduinoBearSSL.onGetTime(callback);
 }
 
+int ArduinoCloudClass::connected()
+{
+  return _mqttClient.connected();
+}
+
+int ArduinoCloudClass::writeStdout(const byte data[], int length)
+{
+  return _mqttClient.publish(_stdoutTopic.c_str(), (const char*)data, length);
+}
+
+void ArduinoCloudClass::onMessage(MQTTClient* /*client*/, char topic[], char bytes[], int length)
+{
+  ArduinoCloud.handleMessage(topic, bytes, length);
+}
+
+void ArduinoCloudClass::handleMessage(char topic[], char bytes[], int length)
+{
+  if (_stdinTopic == topic) {
+    CloudSerial.appendStdin((uint8_t*)bytes, length);
+  }
+}
+
 ArduinoCloudClass ArduinoCloud;

src/ArduinoCloudV2.h

@@ -1,9 +1,11 @@
-#ifndef ARDUINO_CLOUD_V2
-#define ARDUINO_CLOUD_V2
+#ifndef ARDUINO_CLOUD_V2_H
+#define ARDUINO_CLOUD_V2_H
 
 #include <MQTTClient.h>
 #include <ArduinoBearSSL.h>
 
+#include "CloudSerial.h"
+
 class ArduinoCloudClass {
 
 public:
@@ -18,10 +20,24 @@ class ArduinoCloudClass {
 
   void onGetTime(unsigned long(*)(void));
 
+  int connected();
+
+protected:
+  friend class CloudSerialClass;
+  int writeStdout(const byte data[], int length);
+
+private:
+  static void onMessage(MQTTClient *client, char topic[], char bytes[], int length);
+
+  void handleMessage(char topic[], char bytes[], int length);
+
 private:
   String _id;
   BearSSLClient* _bearSslClient;
   MQTTClient _mqttClient;
+
+  String _stdinTopic;
+  String _stdoutTopic;
 };
 
 

src/CloudSerial.cpp

@@ -0,0 +1,85 @@
+#include "ArduinoCloudV2.h"
+
+#include "CloudSerial.h"
+
+CloudSerialClass::CloudSerialClass()
+{
+}
+
+CloudSerialClass::~CloudSerialClass()
+{
+}
+
+void CloudSerialClass::begin(int /*baud*/)
+{
+  _rxBuffer.clear();
+}
+
+void CloudSerialClass::end()
+{
+}
+
+int CloudSerialClass::available()
+{
+  ArduinoCloud.poll();
+
+  return _rxBuffer.available();
+}
+
+int CloudSerialClass::availableForWrite()
+{
+  ArduinoCloud.poll();
+
+  return 1;
+}
+
+int CloudSerialClass::peek()
+{
+  ArduinoCloud.poll();
+
+  return _rxBuffer.peek();
+}
+
+int CloudSerialClass::read()
+{
+  ArduinoCloud.poll();
+
+  return _rxBuffer.read_char();
+}
+
+void CloudSerialClass::flush()
+{
+  ArduinoCloud.poll();
+}
+
+size_t CloudSerialClass::write(const uint8_t data)
+{
+  return write(&data, sizeof(data));
+}
+
+size_t CloudSerialClass::write(const uint8_t *buffer, size_t size)
+{
+  ArduinoCloud.poll();
+Serial.write(buffer, size);
+  if (!ArduinoCloud.writeStdout(buffer, size)) {
+    return 0;
+  }
+
+  return size;
+}
+
+CloudSerialClass::operator bool()
+{
+  ArduinoCloud.poll();
+
+  return ArduinoCloud.connected();
+}
+
+void CloudSerialClass::appendStdin(const uint8_t *buffer, size_t size)
+{
+  while (!_rxBuffer.isFull() && size--) {
+    _rxBuffer.store_char(*buffer++);
+  }
+}
+
+CloudSerialClass CloudSerial;

src/CloudSerial.h

@@ -0,0 +1,40 @@
+#ifndef CLOUD_SERIAL_H
+#define CLOUD_SERIAL_H
+
+#include <Arduino.h>
+
+#include <RingBuffer.h>
+
+class ArduinoCloudClass;
+
+class CloudSerialClass : public Stream
+{
+public:
+  CloudSerialClass();
+  ~CloudSerialClass();
+
+  void begin(int baud);
+  void end();
+  int available();
+  int availableForWrite();
+  int peek();
+  int read();
+  void flush();
+  size_t write(const uint8_t data);
+  size_t write(const uint8_t *buffer, size_t size);
+  using Print::write; // pull in write(str) and write(buf, size) from Print
+
+  operator bool();
+
+protected:
+  friend class ArduinoCloudClass;
+
+  void appendStdin(const uint8_t *buffer, size_t size);
+
+private:
+  RingBufferN<512> _rxBuffer;
+};
+
+extern CloudSerialClass CloudSerial;
+
+#endif