Fix getting started CloudSerial sketch

Alberto Iannaccone · facchinm · commit 88e9cdec740d · 2018-08-31T16:49:53.000+02:00
diff --git a/examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino b/examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino
@@ -1,11 +1,14 @@
-#include <WiFi101.h>
+#include <WiFi101.h> // change to WiFiNINA.h if you are using the MKR WiFi 1010 or MKR Vidor 4000
 #include <ArduinoCloudV2.h>
-
 #include "arduino_secrets.h"
+
+#define TIMEOUT 7000
+
 ///////please enter your sensitive data in the Secret tab/arduino_secrets.h
 char ssid[] = SECRET_SSID;        // your network SSID (name)
 char pass[] = SECRET_PASS;    // your network password (use for WPA, or use as key for WEP)
 int status = WL_IDLE_STATUS;     // the WiFi radio's status
+String cloudSerialBuffer = "";   // the string used to compose network messages from the received characters
 
 WiFiClient wifiClient;
 
@@ -16,9 +19,8 @@ unsigned long getTime() {
 void setup() {
   //Initialize serial and wait for port to open:
   Serial.begin(9600);
-  while (!Serial) {
-    ; // wait for serial port to connect. Needed for native USB port only
-  }
+  int timeout = millis() + TIMEOUT;
+  while (!Serial && (millis() < timeout)) {}
 
   // check for the presence of the shield:
   if (WiFi.status() == WL_NO_SHIELD) {
@@ -33,42 +35,106 @@ void setup() {
   }
 
   // attempt to connect to WiFi network:
-  while (status != WL_CONNECTED) {
+  int attempts = 0;
+  while (status != WL_CONNECTED && attempts < 6) {
     Serial.print("Attempting to connect to WPA SSID: ");
     Serial.println(ssid);
     // Connect to WPA/WPA2 network:
     status = WiFi.begin(ssid, pass);
 
     // wait 10 seconds for connection:
     delay(10000);
+    attempts++;
+  }
+
+  if (status != WL_CONNECTED) {
+    Serial.println("Failed to connect to Wifi!");
+    while (true);
   }
 
   // you're connected now, so print out the data:
   Serial.print("You're connected to the network");
 
   Serial.println();
-  Serial.println("Attempting to connect to Arduino Cloud ...");
+  Serial.println("Attempting to connect to Arduino Cloud");
 
   ArduinoCloud.onGetTime(getTime);
-  if (!ArduinoCloud.connect()) {
+
+  attempts = 0;
+  while (!ArduinoCloud.connect() && attempts < 10) {
+    Serial.print(".");
+    attempts++;
+  }
+
+  if (attempts >= 10) {
     Serial.println("Failed to connect to Arduino Cloud!");
     while (1);
   }
 
   Serial.println("Successfully connected to Arduino Cloud :)");
 
   CloudSerial.begin(9600);
+  CloudSerial.print("I'm ready for blinking!\n");
 }
 
 void loop() {
   ArduinoCloud.poll();
 
+  // check if there is something waiting to be read
   if (CloudSerial.available()) {
-    Serial.write(CloudSerial.read());
+    char character = CloudSerial.read();
+    cloudSerialBuffer += character;
+
+    // if a \n character has been received, there should be a complete command inside cloudSerialBuffer
+    if (character == '\n') {
+      manageString();
+    }
+  }
+  else // if there is nothing to read, it could be that the last command didn't end with a '\n'. Check.
+  {
+    manageString();
   }
 
+  // Just to be able to simulate the board responses through the serial monitor
   if (Serial.available()) {
     CloudSerial.write(Serial.read());
   }
 }
 
+void manageString() {
+  // Don't proceed if the string is empty
+  if (cloudSerialBuffer.equals("")) return;
+
+  // Remove whitespaces
+  cloudSerialBuffer.trim();
+
+  // Make it uppercase;
+  cloudSerialBuffer.toUpperCase();
+
+  if (cloudSerialBuffer.equals("ON")) {
+    digitalWrite(6, HIGH);
+  }
+  if (cloudSerialBuffer.equals("OFF")) {
+    digitalWrite(6, LOW);
+  }
+
+  sendString(cloudSerialBuffer);
+
+  // Reset cloudSerialBuffer
+  cloudSerialBuffer = "";
+}
+
+// sendString sends a string to the Arduino Cloud.
+void sendString(String stringToSend) {
+  // send the characters one at a time
+  char lastSentChar = 0;
+  for (int i = 0; i < stringToSend.length(); i++) {
+    lastSentChar = stringToSend.charAt(i);
+    CloudSerial.write(lastSentChar);
+  }
+
+  // if the last sent character wasn't a '\n' add it
+  if (lastSentChar != '\n') {
+    CloudSerial.write('\n');
+  }
+}
