Improve example

Author: pennam

examples/ArduinoIoTCloud-AWS-Basic/ArduinoIoTCloud-AWS-Basic.ino

@@ -15,10 +15,37 @@
 */
 
 #include "thingProperties.h"
+#include "aws_secrets.h"
+
+Client& getDefaultClient() {
+  switch(ArduinoIoTPreferredConnection.getInterface()) {
+    
+#ifdef BOARD_HAS_WIFI
+    case NetworkAdapter::WIFI:
+    static WiFiClient client;
+    return client;
+#endif
+
+#ifdef BOARD_HAS_ETHERNET
+    case NetworkAdapter::ETHERNET:
+    static EthernetClient client;
+    return client;
+#endif
+
+    default:
+    Serial.println("Error: could not create default AWS client");
+    break;
+  }
+
+  
+}
 
 unsigned long publishMillis = 0;
 unsigned long connectMillis = 0;
 
+BearSSLClient sslClientAWS(getDefaultClient());
+MqttClient mqttClientAWS(sslClientAWS);
+
 void setup() {
   /* Initialize serial and wait up to 5 seconds for port to open */
   Serial.begin(9600);
@@ -55,9 +82,9 @@ void loop() {
     return;
   }
 
-  if (AWSIoTPreferredConnection.check() != NetworkConnectionState::CONNECTED) {
-    return;
-  }
+  //if (AWSIoTPreferredConnection.check() != NetworkConnectionState::CONNECTED) {
+  //  return;
+  //}
 
   if (!mqttClientAWS.connected()) {
     if (millis() - connectMillis > 5000) {

examples/ArduinoIoTCloud-AWS-Basic/arduino_secrets.h

@@ -1,25 +1,2 @@
-#include <Arduino_ConnectionHandler.h>
-
-/* A complete list of supported boards with WiFi is available here:
- * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
- */
-#if defined(BOARD_HAS_WIFI) && defined(USE_WIFI_CONNECTION)
-  #define SECRET_WIFI_SSID ""
-  #define SECRET_WIFI_PASS ""
-#endif
-
-/* Portenta H7 + Ethernet shield */
-#if defined(BOARD_HAS_ETHERNET) && defined(USE_ETHERNET_MANUAL_CONNECTION)
-  #define SECRET_ETH_OPTIONAL_IP ""
-  #define SECRET_ETH_OPTIONAL_DNS ""
-  #define SECRET_ETH_OPTIONAL_GATEWAY ""
-  #define SECRET_ETH_OPTIONAL_NETMASK ""
-#endif
-
-/* Portenta CAT.M1/NB IoT GNSS Shield */
-#if defined(BOARD_HAS_CATM1_NBIOT) && defined(USE_CATM1_NBIOT_CONNECTION)
-  #define SECRET_CATM_PIN ""
-  #define SECRET_CATM_APN ""
-  #define SECRET_CATM_LOGIN ""
-  #define SECRET_CATM_PASS ""
-#endif
+#define SECRET_SSID ""
+#define SECRET_OPTIONAL_PASS ""

examples/ArduinoIoTCloud-AWS-Basic/aws_config.h renamed to examples/ArduinoIoTCloud-AWS-Basic/aws_secrets.h

@@ -1,10 +1,11 @@
+// Code generated by Arduino IoT Cloud, DO NOT EDIT.
+
 #include <ArduinoIoTCloud.h>
 #include <Arduino_ConnectionHandler.h>
-#include "aws_config.h"
+#include "arduino_secrets.h"
 
-#if !(defined(BOARD_STM32H7))
-  #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
-#endif
+const char SSID[]     = SECRET_SSID;    // Network SSID (name)
+const char PASS[]     = SECRET_OPTIONAL_PASS;    // Network password (use for WPA, or use as key for WEP)
 
 void onLedChange();
 
@@ -18,28 +19,5 @@ void initProperties() {
   ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1);
 }
 
-//#define USE_ETHERNET_DHCP_CONNECTION
-//#define USE_ETHERNET_MANUAL_CONNECTION
-#define USE_WIFI_CONNECTION
-//#define USE_CATM1_NBIOT_CONNECTION
-
-#include "arduino_secrets.h"
-
-#if defined(BOARD_HAS_ETHERNET) && defined(USE_ETHERNET_CONNECTION)
-  /* DHCP mode */
-  EthernetConnectionHandler ArduinoIoTPreferredConnection;
-  EthernetConnectionHandler AWSIoTPreferredConnection;
-#elif defined(BOARD_HAS_ETHERNET) && defined(USE_ETHERNET_MANUAL_CONNECTION)
-  /* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
-  EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_ETH_OPTIONAL_IP, SECRET_ETH_OPTIONAL_DNS, SECRET_ETH_OPTIONAL_GATEWAY, SECRET_ETH_OPTIONAL_NETMASK);
-  EthernetConnectionHandler AWSIoTPreferredConnection(SECRET_ETH_OPTIONAL_IP, SECRET_ETH_OPTIONAL_DNS, SECRET_ETH_OPTIONAL_GATEWAY, SECRET_ETH_OPTIONAL_NETMASK);
-#elif defined(BOARD_HAS_WIFI) && defined(USE_WIFI_CONNECTION)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
-  WiFiConnectionHandler AWSIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
-#elif defined(BOARD_HAS_CATM1_NBIOT) && defined(USE_CATM1_NBIOT_CONNECTION)
-  CatM1ConnectionHandler ArduinoIoTPreferredConnection(SECRET_CATM_PIN, SECRET_CATM_APN, SECRET_CATM_LOGIN, SECRET_CATM_PASS);
-  CatM1ConnectionHandler AWSIoTPreferredConnection(SECRET_CATM_PIN, SECRET_CATM_APN, SECRET_CATM_LOGIN, SECRET_CATM_PASS);
-#endif
-
-BearSSLClient sslClientAWS(AWSIoTPreferredConnection.getClient());
-MqttClient mqttClientAWS(sslClientAWS);
+WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_OPTIONAL_PASS);
+