From 61a65940bdd2debc48a0e2f67a0cd7e5959e6b12 Mon Sep 17 00:00:00 2001
From: Giampaolo Mancini <giampaolo@trampolineup.com>
Date: Mon, 30 Oct 2023 17:07:02 +0100
Subject: [PATCH 1/3] Add gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..59b9456
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.vscode/
+build/
+*.bin
+*.elf
+*.log

From b9fcf0077c0fddc9100bb25266edc30cc82d49f0 Mon Sep 17 00:00:00 2001
From: Giampaolo Mancini <giampaolo@trampolineup.com>
Date: Mon, 30 Oct 2023 17:07:43 +0100
Subject: [PATCH 2/3] Add reference examples for Arduino Opta

---
 .../AWS_IoT_Opta_Ethernet.ino                 | 206 +++++++++++++++
 .../AWS_IoT_Opta_Ethernet/arduino_secrets.h   |   9 +
 .../AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino   | 247 ++++++++++++++++++
 .../AWS_IoT_Opta_WiFi/arduino_secrets.h       |  13 +
 4 files changed, 475 insertions(+)
 create mode 100644 examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/AWS_IoT_Opta_Ethernet.ino
 create mode 100644 examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/arduino_secrets.h
 create mode 100644 examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino
 create mode 100644 examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/arduino_secrets.h

diff --git a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/AWS_IoT_Opta_Ethernet.ino b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/AWS_IoT_Opta_Ethernet.ino
new file mode 100644
index 0000000..9bc2851
--- /dev/null
+++ b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/AWS_IoT_Opta_Ethernet.ino	
@@ -0,0 +1,206 @@
+#include <ArduinoBearSSL.h>
+#include <ArduinoECCX08.h>
+#include <ArduinoMqttClient.h>
+#include <Arduino_ConnectionHandler.h>
+#include <Arduino_JSON.h>
+#include <NTPClient.h>
+#include <mbed_mktime.h>
+
+#include "arduino_secrets.h"
+
+// Enter your sensitive data in arduino_secrets.h
+constexpr char broker[] { SECRET_BROKER };
+constexpr unsigned port { SECRET_PORT };
+const char* certificate { SECRET_CERTIFICATE };
+
+#include <Ethernet.h>
+#include <EthernetUdp.h>
+EthernetConnectionHandler conMan;
+EthernetClient tcpClient;
+EthernetUDP NTPUdp;
+
+NTPClient timeClient(NTPUdp);
+BearSSLClient sslClient(tcpClient);
+MqttClient mqttClient(sslClient);
+
+unsigned long lastMillis { 0 };
+
+void setup()
+{
+    Serial.begin(115200);
+
+    // Wait for Serial Monitor or start after 2.5s
+    for (const auto startNow = millis() + 2500; !Serial && millis() < startNow; delay(250));
+
+    // Set the callbacks for connectivity management
+    conMan.addCallback(NetworkConnectionEvent::CONNECTED, onNetworkConnect);
+    conMan.addCallback(NetworkConnectionEvent::DISCONNECTED, onNetworkDisconnect);
+    conMan.addCallback(NetworkConnectionEvent::ERROR, onNetworkError);
+
+    // Check for HSM
+    if (!ECCX08.begin()) {
+        Serial.println("No ECCX08 present!");
+        while (1)
+            ;
+    }
+
+    // Configure TLS to use HSM and the key/certificate pair
+    ArduinoBearSSL.onGetTime(getTime);
+    sslClient.setEccSlot(0, certificate);
+    // mqttClient.setId("Your Thing ID");
+    mqttClient.onMessage(onMessageReceived);
+
+    timeClient.begin();
+}
+
+void loop()
+{
+    // Automatically manage connectivity
+    const auto conStatus = conMan.check();
+
+    if (conStatus != NetworkConnectionState::CONNECTED)
+        return;
+
+    if (!mqttClient.connected()) {
+        // MQTT client is disconnected, connect
+        connectMQTT();
+    }
+
+    // poll for new MQTT messages and send keep alives
+    mqttClient.poll();
+
+    // publish a message roughly every 5 seconds.
+    if (millis() - lastMillis > 5000) {
+        lastMillis = millis();
+
+        publishMessage();
+    }
+}
+
+void setNtpTime()
+{
+    timeClient.forceUpdate();
+    const auto epoch = timeClient.getEpochTime();
+    set_time(epoch);
+}
+
+unsigned long getTime()
+{
+    const auto now = time(NULL);
+    return now;
+}
+
+void connectMQTT()
+{
+    Serial.print("Attempting to MQTT broker: ");
+    Serial.print(broker);
+    Serial.print(":");
+    Serial.print(port);
+    Serial.println();
+
+    int status;
+    while ((status = mqttClient.connect(broker, port)) == 0) {
+        // failed, retry
+        Serial.println(status);
+        delay(1000);
+    }
+    Serial.println();
+
+    Serial.println("You're connected to the MQTT broker");
+    Serial.println();
+
+    // subscribe to a topic with QoS 1
+    constexpr char incomingTopic[] { "arduino/incoming" };
+    constexpr int incomingQoS { 1 };
+    Serial.print("Subscribing to topic: ");
+    Serial.print(incomingTopic);
+    Serial.print(" with QoS ");
+    Serial.println(incomingQoS);
+    mqttClient.subscribe(incomingTopic, incomingQoS);    
+}
+
+void publishMessage()
+{
+    Serial.println("Publishing message");
+
+    JSONVar payload;
+    String msg = "Hello, World! ";
+    msg += millis();
+    payload["message"] = msg;
+
+    JSONVar message;
+    message["ts"] = static_cast<unsigned long>(time(nullptr));
+    message["payload"] = payload;
+
+    String messageString = JSON.stringify(message);
+    Serial.println(messageString);
+
+    // send message, the Print interface can be used to set the message contents
+    constexpr char outgoingTopic[] { "arduino/outgoing" };
+
+    mqttClient.beginMessage(outgoingTopic);
+    mqttClient.print(messageString);
+    mqttClient.endMessage();
+}
+
+void onMessageReceived(int messageSize)
+{
+    // we received a message, print out the topic and contents
+    Serial.println();
+    Serial.print("Received a message with topic '");
+    Serial.print(mqttClient.messageTopic());
+    Serial.print("', length ");
+    Serial.print(messageSize);
+    Serial.println(" bytes:");
+
+    /*
+    // Message from AWS MQTT Test Client
+    {
+      "message": "Hello from AWS IoT console"
+    }
+    */
+
+    char bytes[messageSize] {};
+    for (int i = 0; i < messageSize; i++)
+        bytes[i] = mqttClient.read();
+
+    JSONVar jsonMessage = JSON.parse(bytes);
+    auto text = jsonMessage["message"];
+
+    Serial.print("[");
+    Serial.print(time(nullptr));
+    Serial.print("] ");
+    Serial.print("Message: ");
+    Serial.println(text);
+
+    Serial.println();
+}
+
+void onNetworkConnect()
+{
+    Serial.println(">>>> CONNECTED to network");
+    printEthernetStatus();
+
+    setNtpTime();
+    connectMQTT();
+}
+
+void onNetworkDisconnect()
+{
+    Serial.println(">>>> DISCONNECTED from network");
+}
+
+void onNetworkError()
+{
+    Serial.println(">>>> ERROR");
+}
+
+void printEthernetStatus()
+{
+    // print your board's IP address:
+    Serial.print("Local IP: ");
+    Serial.println(Ethernet.localIP());
+    Serial.print("Local GW: ");
+    Serial.println(Ethernet.gatewayIP());
+    Serial.println();
+}
diff --git a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/arduino_secrets.h b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/arduino_secrets.h
new file mode 100644
index 0000000..6badab9
--- /dev/null
+++ b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_Ethernet/arduino_secrets.h	
@@ -0,0 +1,9 @@
+// Fill in the hostname of your AWS IoT broker
+#define SECRET_BROKER "xxxxxxxxxxxxxxxxxx.iot.xxxxxxxxx.amazonaws.com"
+#define SECRET_PORT 8883
+
+// Fill in the boards public certificate
+const char SECRET_CERTIFICATE[] = R"(
+-----BEGIN CERTIFICATE-----
+-----END CERTIFICATE-----
+)";
diff --git a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino
new file mode 100644
index 0000000..0d23a60
--- /dev/null
+++ b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino	
@@ -0,0 +1,247 @@
+#include <ArduinoBearSSL.h>
+#include <ArduinoECCX08.h>
+#include <ArduinoMqttClient.h>
+#include <Arduino_ConnectionHandler.h>
+#include <Arduino_JSON.h>
+#include <NTPClient.h>
+#include <mbed_mktime.h>
+
+#include "arduino_secrets.h"
+
+// Enter your sensitive data in arduino_secrets.h
+constexpr char broker[] { SECRET_BROKER };
+constexpr unsigned port { SECRET_PORT };
+const char* certificate { SECRET_CERTIFICATE };
+
+// Remove comment for using the Ethernet connection
+// #define USE_ETHERNET_CONNECTION
+
+#if defined(USE_ETHERNET_CONNECTION)
+#include <Ethernet.h>
+#include <EthernetUdp.h>
+EthernetConnectionHandler conMan;
+EthernetClient tcpClient;
+EthernetUDP NTPUdp;
+#else
+#include <WiFi.h>
+#include <WiFiUdp.h>
+// Enter your sensitive data in arduino_secrets.h
+constexpr char ssid[] { SECRET_SSID };
+constexpr char pass[] { SECRET_PASS };
+WiFiConnectionHandler conMan(SECRET_SSID, SECRET_PASS);
+WiFiClient tcpClient;
+WiFiUDP NTPUdp;
+#endif
+
+NTPClient timeClient(NTPUdp);
+BearSSLClient sslClient(tcpClient);
+MqttClient mqttClient(sslClient);
+
+unsigned long lastMillis { 0 };
+
+void setup()
+{
+    Serial.begin(115200);
+
+    // Wait for Serial Monitor or start after 2.5s
+    for (const auto startNow = millis() + 2500; !Serial && millis() < startNow; delay(250));
+
+    // Set the callbacks for connectivity management
+    conMan.addCallback(NetworkConnectionEvent::CONNECTED, onNetworkConnect);
+    conMan.addCallback(NetworkConnectionEvent::DISCONNECTED, onNetworkDisconnect);
+    conMan.addCallback(NetworkConnectionEvent::ERROR, onNetworkError);
+
+    // Check for HSM
+    if (!ECCX08.begin()) {
+        Serial.println("No ECCX08 present!");
+        while (1)
+            ;
+    }
+
+    // Configure TLS to use HSM and the key/certificate pair
+    ArduinoBearSSL.onGetTime(getTime);
+    sslClient.setEccSlot(0, certificate);
+    // mqttClient.setId("Your Thing ID");
+    mqttClient.onMessage(onMessageReceived);
+
+    timeClient.begin();
+}
+
+void loop()
+{
+    // Automatically manage connectivity
+    const auto conStatus = conMan.check();
+
+    if (conStatus != NetworkConnectionState::CONNECTED)
+        return;
+
+    if (!mqttClient.connected()) {
+        // MQTT client is disconnected, connect
+        connectMQTT();
+    }
+
+    // poll for new MQTT messages and send keep alives
+    mqttClient.poll();
+
+    // publish a message roughly every 5 seconds.
+    if (millis() - lastMillis > 5000) {
+        lastMillis = millis();
+
+        publishMessage();
+    }
+}
+
+void setNtpTime()
+{
+    timeClient.forceUpdate();
+    const auto epoch = timeClient.getEpochTime();
+    set_time(epoch);
+}
+
+unsigned long getTime()
+{
+    const auto now = time(NULL);
+    return now;
+}
+
+void connectMQTT()
+{
+    Serial.print("Attempting to MQTT broker: ");
+    Serial.print(broker);
+    Serial.print(":");
+    Serial.print(port);
+    Serial.println();
+
+    int status;
+    while ((status = mqttClient.connect(broker, port)) == 0) {
+        // failed, retry
+        Serial.println(status);
+        delay(1000);
+    }
+    Serial.println();
+
+    Serial.println("You're connected to the MQTT broker");
+    Serial.println();
+
+    // subscribe to a topic with QoS 1
+    constexpr char incomingTopic[] { "arduino/incoming" };
+    constexpr int incomingQoS { 1 };
+    Serial.print("Subscribing to topic: ");
+    Serial.print(incomingTopic);
+    Serial.print(" with QoS ");
+    Serial.println(incomingQoS);
+    mqttClient.subscribe(incomingTopic, incomingQoS);   
+}
+
+void publishMessage()
+{
+    Serial.println("Publishing message");
+
+    JSONVar payload;
+    String msg = "Hello, World! ";
+    msg += millis();
+    payload["message"] = msg;
+
+#if !defined(USE_ETHERNET_CONNECTION)
+    payload["rssi"] = WiFi.RSSI();
+#endif
+
+    JSONVar message;
+    message["ts"] = static_cast<unsigned long>(time(nullptr));
+    message["payload"] = payload;
+
+    String messageString = JSON.stringify(message);
+    Serial.println(messageString);
+
+    // send message, the Print interface can be used to set the message contents
+    constexpr char outgoingTopic[] { "arduino/outgoing" };
+
+    mqttClient.beginMessage(outgoingTopic);
+    mqttClient.print(messageString);
+    mqttClient.endMessage();
+}
+
+void onMessageReceived(int messageSize)
+{
+    // we received a message, print out the topic and contents
+    Serial.println();
+    Serial.print("Received a message with topic '");
+    Serial.print(mqttClient.messageTopic());
+    Serial.print("', length ");
+    Serial.print(messageSize);
+    Serial.println(" bytes:");
+
+    /*
+    // Message from AWS MQTT Test Client
+    {
+      "message": "Hello from AWS IoT console"
+    }
+    */
+
+    char bytes[messageSize] {};
+    for (int i = 0; i < messageSize; i++)
+        bytes[i] = mqttClient.read();
+
+    JSONVar jsonMessage = JSON.parse(bytes);
+    auto text = jsonMessage["message"];
+
+    Serial.print("[");
+    Serial.print(time(nullptr));
+    Serial.print("] ");
+    Serial.print("Message: ");
+    Serial.println(text);
+
+    Serial.println();
+}
+
+void onNetworkConnect()
+{
+    Serial.println(">>>> CONNECTED to network");
+#if defined(USE_ETHERNET_CONNECTION)
+    printEthernetStatus();
+#else
+    printWifiStatus();
+#endif
+    setNtpTime();
+    connectMQTT();
+}
+
+void onNetworkDisconnect()
+{
+    Serial.println(">>>> DISCONNECTED from network");
+}
+
+void onNetworkError()
+{
+    Serial.println(">>>> ERROR");
+}
+
+void printWifiStatus()
+{
+    // print the SSID of the network you're attached to:
+    Serial.print("SSID: ");
+    Serial.println(WiFi.SSID());
+
+    // print the received signal strength:
+    Serial.print("signal strength (RSSI):");
+    Serial.print(WiFi.RSSI());
+    Serial.println(" dBm");
+    Serial.println();
+
+    // print your board's IP address:
+    Serial.print("Local IP: ");
+    Serial.println(WiFi.localIP());
+    Serial.print("Local GW: ");
+    Serial.println(WiFi.gatewayIP());
+    Serial.println();
+}
+
+void printEthernetStatus()
+{
+    // print your board's IP address:
+    Serial.print("Local IP: ");
+    Serial.println(Ethernet.localIP());
+    Serial.print("Local GW: ");
+    Serial.println(Ethernet.gatewayIP());
+    Serial.println();
+}
diff --git a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/arduino_secrets.h b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/arduino_secrets.h
new file mode 100644
index 0000000..99568d7
--- /dev/null
+++ b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/arduino_secrets.h	
@@ -0,0 +1,13 @@
+// Fill in  your WiFi networks SSID and password
+#define SECRET_SSID ""
+#define SECRET_PASS ""
+
+// Fill in the hostname of your AWS IoT broker
+#define SECRET_BROKER "xxxxxxxxxxxxxxxxxx.iot.xxxxxxxxx.amazonaws.com"
+#define SECRET_PORT 8883
+
+// Fill in the boards public certificate
+const char SECRET_CERTIFICATE[] = R"(
+-----BEGIN CERTIFICATE-----
+-----END CERTIFICATE-----
+)";

From 8a7216005d59512123d50b2ab2172335d9c932b9 Mon Sep 17 00:00:00 2001
From: Giampaolo Mancini <giampaolo@trampolineup.com>
Date: Tue, 31 Oct 2023 10:07:46 +0100
Subject: [PATCH 3/3] Remove optional Ethernet setup

---
 .../AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino   | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino
index 0d23a60..fa5e766 100644
--- a/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino	
+++ b/examples/AWS IoT/AWS_IoT_Opta/AWS_IoT_Opta_WiFi/AWS_IoT_Opta_WiFi.ino	
@@ -13,16 +13,6 @@ constexpr char broker[] { SECRET_BROKER };
 constexpr unsigned port { SECRET_PORT };
 const char* certificate { SECRET_CERTIFICATE };
 
-// Remove comment for using the Ethernet connection
-// #define USE_ETHERNET_CONNECTION
-
-#if defined(USE_ETHERNET_CONNECTION)
-#include <Ethernet.h>
-#include <EthernetUdp.h>
-EthernetConnectionHandler conMan;
-EthernetClient tcpClient;
-EthernetUDP NTPUdp;
-#else
 #include <WiFi.h>
 #include <WiFiUdp.h>
 // Enter your sensitive data in arduino_secrets.h
@@ -31,7 +21,6 @@ constexpr char pass[] { SECRET_PASS };
 WiFiConnectionHandler conMan(SECRET_SSID, SECRET_PASS);
 WiFiClient tcpClient;
 WiFiUDP NTPUdp;
-#endif
 
 NTPClient timeClient(NTPUdp);
 BearSSLClient sslClient(tcpClient);
@@ -141,10 +130,7 @@ void publishMessage()
     String msg = "Hello, World! ";
     msg += millis();
     payload["message"] = msg;
-
-#if !defined(USE_ETHERNET_CONNECTION)
     payload["rssi"] = WiFi.RSSI();
-#endif
 
     JSONVar message;
     message["ts"] = static_cast<unsigned long>(time(nullptr));
@@ -197,11 +183,8 @@ void onMessageReceived(int messageSize)
 void onNetworkConnect()
 {
     Serial.println(">>>> CONNECTED to network");
-#if defined(USE_ETHERNET_CONNECTION)
-    printEthernetStatus();
-#else
+
     printWifiStatus();
-#endif
     setNtpTime();
     connectMQTT();
 }
@@ -235,13 +218,3 @@ void printWifiStatus()
     Serial.println(WiFi.gatewayIP());
     Serial.println();
 }
-
-void printEthernetStatus()
-{
-    // print your board's IP address:
-    Serial.print("Local IP: ");
-    Serial.println(Ethernet.localIP());
-    Serial.print("Local GW: ");
-    Serial.println(Ethernet.gatewayIP());
-    Serial.println();
-}