chore: Enable IDE compilation

zfields · zfields · commit 37ae4804f9ee · 2024-07-25T13:56:53.000-05:00
diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h
@@ -3,7 +3,7 @@
 /* A complete list of supported boards with WiFi is available here:
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
-#if defined(BOARD_HAS_WIFI)
+#if defined(USE_NOTECARD) || defined(BOARD_HAS_WIFI)
   #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
   #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
@@ -18,6 +18,12 @@
 #ifndef ARDUINO_AIOTC_CONFIG_H_
 #define ARDUINO_AIOTC_CONFIG_H_
 
+#if defined __has_include
+  #if __has_include (<Notecard.h>)
+    #define USE_NOTECARD
+  #endif
+#endif
+
 #include <ArduinoECCX08Config.h>
 
 /******************************************************************************
diff --git a/src/ArduinoIoTCloudNotecard.cpp b/src/ArduinoIoTCloudNotecard.cpp
@@ -211,7 +211,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_ConfigureNotehub(
 #if defined(BOARD_HAS_SECRET_KEY)
   if (reinterpret_cast<NotecardConnectionHandler *>(_connection)->syncSecretDeviceKey(_secret_device_key)) {
     DEBUG_WARNING("ArduinoIoTCloudNotecard::%s failed to set secret device key", __FUNCTION__);
-    DEBUG_WARNING("You may manually enter the secret key on Notehub as a device level environment variable named `arduino_iot_cloud_secret_key`");
+    DEBUG_WARNING("You may manually enter the secret key on Notehub as a device level environment variable named `arduino_iot_cloud_secret_device_key`");
   }
 #endif
 
diff --git a/src/utility/time/RTCMillis.cpp b/src/utility/time/RTCMillis.cpp
@@ -19,6 +19,8 @@
  * INCLUDE
  **************************************************************************************/
 
+#include "AIoTC_Config.h"
+
 #if defined(USE_NOTECARD) || defined(ARDUINO_ARCH_ESP8266)
 
 #include <Arduino.h>
diff --git a/src/utility/time/TimeService.cpp b/src/utility/time/TimeService.cpp
@@ -19,35 +19,24 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <AIoTC_Config.h>
 
 #include <time.h>
-#include "TimeService.h"
-#include "NTPUtils.h"
+
+#include "AIoTC_Config.h"
 #include "AIoTC_Const.h"
+#include "NTPUtils.h"
+#include "TimeService.h"
 
-#ifdef USE_NOTECARD
+#if defined(USE_NOTECARD) || defined(ARDUINO_ARCH_ESP8266)
   #include "RTCMillis.h"
-#else
-
-#ifdef ARDUINO_ARCH_SAMD
+#elif defined(ARDUINO_ARCH_SAMD)
   #include <RTCZero.h>
-#endif
-
-#ifdef ARDUINO_ARCH_MBED
+#elif defined(ARDUINO_ARCH_MBED)
   #include <mbed_rtc_time.h>
-#endif
-
-#ifdef ARDUINO_ARCH_ESP8266
-  #include "RTCMillis.h"
-#endif
-
-#ifdef ARDUINO_ARCH_RENESAS
+#elif defined(ARDUINO_ARCH_RENESAS)
   #include "RTC.h"
 #endif
 
-#endif /* USE_NOTECARD */
-
 /**************************************************************************************
  * GLOBAL VARIABLES
  **************************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_ConfigureNotehub(`
`211`	`211`	`#if defined(BOARD_HAS_SECRET_KEY)`
`212`	`212`	`if (reinterpret_cast<NotecardConnectionHandler *>(_connection)->syncSecretDeviceKey(_secret_device_key)) {`
`213`	`213`	`DEBUG_WARNING("ArduinoIoTCloudNotecard::%s failed to set secret device key", __FUNCTION__);`
`214`		- DEBUG_WARNING("You may manually enter the secret key on Notehub as a device level environment variable named `arduino_iot_cloud_secret_key`");
	`214`	+ DEBUG_WARNING("You may manually enter the secret key on Notehub as a device level environment variable named `arduino_iot_cloud_secret_device_key`");
`215`	`215`	`}`
`216`	`216`	`#endif`
`217`	`217`