Thing integration

examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino

@@ -1,24 +1,33 @@
-#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;
 
 unsigned long getTime() {
   return WiFi.getTime();
 }
 
+int position;
+
+void onPositionUpdate() {
+  Serial.print("New position value: ");
+  Serial.println(position);
+}
+
 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 +42,108 @@ 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 :)");
 
+  ArduinoCloud.addProperty(position, READ, 10*SECONDS, onPositionUpdate);
+
   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');
+  }
+}

examples/utility/Provisioning/Provisioning.ino

@@ -3,12 +3,13 @@
 #include <utility/ECCX08TLSConfig.h>
 
 #include <ArduinoBearSSL.h>
-#include <utility/ECCX08.h>
+#include <ArduinoECCX08.h>
 
-const int keySlot            = 0;
-const int compressedCertSlot = 10;
-const int serialNumberSlot   = 11;
-const int thingIdSlot        = 12;
+const bool DEBUG = true;
+const int keySlot                                   = 0;
+const int compressedCertSlot                        = 10;
+const int serialNumberAndAuthorityKeyIdentifierSlot = 11;
+const int thingIdSlot                               = 12;
 
 void setup() {
   Serial.begin(9600);
@@ -55,7 +56,8 @@ void setup() {
     while (1);
   }
 
-  ECCX08Cert.setSubjectCommonName(ECCX08.serialNumber());
+  String thingId = promptAndReadLine("Please enter the thing id: ");
+  ECCX08Cert.setSubjectCommonName(thingId);
 
   String csr = ECCX08Cert.endCSR();
 
@@ -68,37 +70,37 @@ void setup() {
   Serial.println();
   Serial.println(csr);
 
-  String thingId      = promptAndReadLine("Please enter the thing id: ");
-  String issueYear    = promptAndReadLine("Please enter the issue year of the certificate (2000 - 2031): ");
-  String issueMonth   = promptAndReadLine("Please enter the issue month of the certificate (1 - 12): ");
-  String issueDay     = promptAndReadLine("Please enter the issue day of the certificate (1 - 31): ");
-  String issueHour    = promptAndReadLine("Please enter the issue hour of the certificate (0 - 23): ");
-  String expireYears  = promptAndReadLine("Please enter how many years the certificate is valid for (0 - 31): ");
-  String serialNumber = promptAndReadLine("Please enter the certificates serial number: ");
-  String signature    = promptAndReadLine("Please enter the certificates signature: ");
-
-  serialNumber.toUpperCase();
-  signature.toUpperCase();
+  String issueYear              = promptAndReadLine("Please enter the issue year of the certificate (2000 - 2031): ");
+  String issueMonth             = promptAndReadLine("Please enter the issue month of the certificate (1 - 12): ");
+  String issueDay               = promptAndReadLine("Please enter the issue day of the certificate (1 - 31): ");
+  String issueHour              = promptAndReadLine("Please enter the issue hour of the certificate (0 - 23): ");
+  String expireYears            = promptAndReadLine("Please enter how many years the certificate is valid for (0 - 31): ");
+  String serialNumber           = promptAndReadLine("Please enter the certificates serial number: ");
+  String authorityKeyIdentifier = promptAndReadLine("Please enter the certificates authority key identifier: ");
+  String signature              = promptAndReadLine("Please enter the certificates signature: ");
 
   byte thingIdBytes[72];
   byte serialNumberBytes[16];
+  byte authorityKeyIdentifierBytes[20];
   byte signatureBytes[64];
 
   thingId.getBytes(thingIdBytes, sizeof(thingIdBytes));
   hexStringToBytes(serialNumber, serialNumberBytes, sizeof(serialNumberBytes));
-  hexStringToBytes(signature, signatureBytes, 64);
+  hexStringToBytes(authorityKeyIdentifier, authorityKeyIdentifierBytes, sizeof(authorityKeyIdentifierBytes));
+  hexStringToBytes(signature, signatureBytes, sizeof(signatureBytes));
 
   if (!ECCX08.writeSlot(thingIdSlot, thingIdBytes, sizeof(thingIdBytes))) {
     Serial.println("Error storing thing id!");
     while (1);
   }
 
-  if (!ECCX08Cert.beginStorage(compressedCertSlot, serialNumberSlot)) {
+  if (!ECCX08Cert.beginStorage(compressedCertSlot, serialNumberAndAuthorityKeyIdentifierSlot)) {
     Serial.println("Error starting ECCX08 storage!");
     while (1);
   }
 
   ECCX08Cert.setSignature(signatureBytes);
+  ECCX08Cert.setAuthorityKeyIdentifier(authorityKeyIdentifierBytes);
   ECCX08Cert.setSerialNumber(serialNumberBytes);
   ECCX08Cert.setIssueYear(issueYear.toInt());
   ECCX08Cert.setIssueMonth(issueMonth.toInt());
@@ -111,7 +113,7 @@ void setup() {
     while (1);
   }
 
-  if (!ECCX08Cert.beginReconstruction(keySlot, compressedCertSlot, serialNumberSlot)) {
+  if (!ECCX08Cert.beginReconstruction(keySlot, compressedCertSlot, serialNumberAndAuthorityKeyIdentifierSlot)) {
     Serial.println("Error starting ECCX08 cert reconstruction!");
     while (1);
   }
@@ -126,6 +128,10 @@ void setup() {
     while (1);
   }
 
+  if (!DEBUG) {
+    return;
+  }
+
   Serial.println("Compressed cert = ");
 
   const byte* certData = ECCX08Cert.bytes();
@@ -175,8 +181,9 @@ String readLine() {
   return line;
 }
 
-void hexStringToBytes(const String& in, byte out[], int length) {
+void hexStringToBytes(String& in, byte out[], int length) {
   int inLength = in.length();
+  in.toUpperCase();
   int outLength = 0;
 
   for (int i = 0; i < inLength && outLength < length; i += 2) {
@@ -186,7 +193,6 @@ void hexStringToBytes(const String& in, byte out[], int length) {
     byte highByte = (highChar <= '9') ? (highChar - '0') : (highChar + 10 - 'A');
     byte lowByte = (lowChar <= '9') ? (lowChar - '0') : (lowChar + 10 - 'A');
 
-    out[outLength++] = (highByte << 4) | lowByte;
+    out[outLength++] = (highByte << 4) | (lowByte & 0xF);
   }
 }
-