Azure · sandeepmistry · Apr 15, 2016 · Apr 18, 2016 · Apr 18, 2016
diff --git a/examples/command_center/command_center.ino b/examples/command_center/command_center.ino
@@ -20,7 +20,6 @@
 //#include <WiFiUdp.h>
 
 #include <Adafruit_BME280.h>
-#include <NTPClient.h>
 #include <AzureIoTHub.h>
 
 #include "rem_ctrl_http.h"
@@ -41,12 +40,19 @@ static const char pass[] = "[Your WiFi network WPA password or WEP key]";
 // and SharedAccessKey for this particular Thing on the Internet.
 static const char* connectionString = "[Device Connection String]";
 
-// change the next line to use on non-Adafruit WINC1500 based boards/shields
-Adafruit_WINC1500SSLClient sslClient; // for Adafruit WINC150
-//WiFiSSLClient sslClient; // for WiFi101
-//WiFiClientSecure sslClient; // for ESP8266
+// change the next two lines to use on non-Adafruit WINC1500 based boards/shields
+Adafruit_WINC1500SSLClient sslClient;
+Adafruit_WINC1500UDP udp;
 
-AzureIoTHubClient iotHubClient(sslClient);
+// for WiFi101
+//WiFiSSLClient sslClient;
+//WiFiUDP udp;
+
+// for ESP8266
+//WiFiClientSecure sslClient;
+//WiFiUDP udp;
+
+AzureIoTHubClient iotHubClient(sslClient, udp);
 
 #define SEALEVELPRESSURE_HPA (1013.25)
 const int Bme280_cs_pin__i = 5;
@@ -59,7 +65,6 @@ void setup() {
   Serial.println("Azure_remote_monitoring Sketch.");
 
   initWifi();
-  initTime();
   initBME();
 
   if (rem_ctrl_set_connection_string(connectionString)) {
@@ -153,50 +158,6 @@ void initWifi() {
   Serial.println("Connected to wifi");
 }
 
-void initTime() {
-  // change the next line to use on non-WINC1500 based boards/shields
-  Adafruit_WINC1500UDP ntpUdp; // for Adafruit WINC1500
-  // WiFiUDP ntpUdp; // for WiFi101 
-  // for ESP8266 boards see comment below
-  NTPClient ntpClient(ntpUdp);
-
-  ntpClient.begin();
-
-  while (!ntpClient.update()) {
-    Serial.println("Fetching NTP epoch time failed! Waiting 5 seconds to retry.");
-    delay(5000);
-  }
-
-  ntpClient.end();
-
-  unsigned long epochTime = ntpClient.getEpochTime();
-
-  Serial.print("Fetched NTP epoch time is: ");
-  Serial.println(epochTime);
-
-  iotHubClient.setEpochTime(epochTime);
-
-  // For ESP8266 boards comment out the above portion of the function and un-comment
-  // the remainder below.
-
-  // time_t epochTime;
-
-  // configTime(0, 0, "pool.ntp.org", "time.nist.gov");
-
-  // while (true) {
-  //     epochTime = time(NULL);
-
-  //     if (epochTime == 0) {
-  //         Serial.println("Fetching NTP epoch time failed! Waiting 2 seconds to retry.");
-  //         delay(2000);
-  //     } else {
-  //         Serial.print("Fetched NTP epoch time is: ");
-  //         Serial.println(epochTime);
-  //         break;
-  //     }
-  // }
-}
-
 void initBME() {
   Serial.println("Checking for the presence of the BME280 temp/humid/press module.");
   Bme_init_result = bme.begin();

diff --git a/examples/command_center/rem_ctrl_http.c b/examples/command_center/rem_ctrl_http.c
@@ -230,8 +230,8 @@ void rem_ctrl_http_send_data(float Temp_c__f, float Pres_hPa__f, float Humi_pct_
     // Don't run this function unless the initialization succeeded.
     if (Init_level__i < 4) return;
 
-    timeNow = (int)time(NULL);
-    sLogInfo(buff, "%d", timeNow);
+    timeNow = (int)get_time(NULL);
+    sprintf(buff, "%d", timeNow);
 
     myWeather->DeviceId = "FeatherM0_w_BME280";
     myWeather->MTemperature = Temp_c__f;

diff --git a/examples/remote_monitoring/remote_monitoring.c b/examples/remote_monitoring/remote_monitoring.c
@@ -125,7 +125,7 @@ void remote_monitoring_run(void)
 {
         initBme();
 
-        srand((unsigned int)time(NULL));
+        srand((unsigned int)get_time(NULL));
         if (serializer_init(NULL) != SERIALIZER_OK)
         {
             LogInfo("Failed on serializer_init\r\n");

diff --git a/examples/remote_monitoring/remote_monitoring.ino b/examples/remote_monitoring/remote_monitoring.ino
@@ -25,25 +25,30 @@
 // // Setup the WINC1500 connection with the pins above and the default hardware SPI.
 // Adafruit_WINC1500 WiFi(WINC_CS, WINC_IRQ, WINC_RST);
 
-#include <NTPClient.h>
 #include <AzureIoTHub.h>
 
 #include "remote_monitoring.h"
 
 char ssid[] = "[Your WiFi network SSID or name]";
 char pass[] = "[Your WiFi network WPA password or WEP key]";
 
-// change the next line to use on non-WiFi101 based boards/shields
+// change the next two lines to use on non-WiFi101 based boards/shields
 WiFiSSLClient sslClient;
-//WiFiClientSecure sslClient; // for ESP8266
-//Adafruit_WINC1500SSLClient sslClient; // for Adafruit WINC1500
+WiFiUDP udp;
 
-AzureIoTHubClient iotHubClient(sslClient);
+// for ESP8266
+//WiFiClientSecure sslClient;
+//WiFiUDP udp;
+
+// for Adafruit WINC1500
+//Adafruit_WINC1500SSLClient sslClient;
+//Adafruit_WINC1500UDP udp;
+
+AzureIoTHubClient iotHubClient(sslClient, udp);
 
 void setup() {
   initSerial();
   initWifi();
-  initTime();
 
   iotHubClient.begin();
 }
@@ -95,47 +100,3 @@ void initWifi() {
 
   Serial.println("Connected to wifi");
 }
-
-void initTime() {
-  // change the next line to use on non-WiFi101, for ESP8266 boards see comment below
-  WiFiUDP ntpUdp;
-  //Adafruit_WINC1500UDP ntpUdp; // for Adafruit WINC1500
-  NTPClient ntpClient(ntpUdp);
-
-  ntpClient.begin();
-
-  while (!ntpClient.update()) {
-    Serial.println("Fetching NTP epoch time failed! Waiting 5 seconds to retry.");
-    delay(5000);
-  }
-
-  ntpClient.end();
-
-  unsigned long epochTime = ntpClient.getEpochTime();
-
-  Serial.print("Fetched NTP epoch time is: ");
-  Serial.println(epochTime);
-
-  iotHubClient.setEpochTime(epochTime);
-
-  // For ESP8266 boards comment out the above portion of the function and un-comment
-  // the remainder below.
-
-  // time_t epochTime;
-
-  // configTime(0, 0, "pool.ntp.org", "time.nist.gov");
-
-  // while (true) {
-  //     epochTime = time(NULL);
-
-  //     if (epochTime == 0) {
-  //         Serial.println("Fetching NTP epoch time failed! Waiting 2 seconds to retry.");
-  //         delay(2000);
-  //     } else {
-  //         Serial.print("Fetched NTP epoch time is: ");
-  //         Serial.println(epochTime);
-  //         break;
-  //     }
-  // }
-}
-
diff --git a/examples/simplesample_http/simplesample_http.c b/examples/simplesample_http/simplesample_http.c
@@ -129,7 +129,7 @@ void simplesample_http_run(void)
     else
     {
         IOTHUB_CLIENT_LL_HANDLE iotHubClientHandle = IoTHubClient_LL_CreateFromConnectionString(connectionString, HTTP_Protocol);
-        srand((unsigned int)time(NULL));
+        srand((unsigned int)get_time(NULL));
         int avgWindSpeed = 10;
 
         if (iotHubClientHandle == NULL)

diff --git a/examples/simplesample_http/simplesample_http.ino b/examples/simplesample_http/simplesample_http.ino
@@ -25,25 +25,30 @@
 // // Setup the WINC1500 connection with the pins above and the default hardware SPI.
 // Adafruit_WINC1500 WiFi(WINC_CS, WINC_IRQ, WINC_RST);
 
-#include <NTPClient.h>
 #include <AzureIoTHub.h>
 
 #include "simplesample_http.h"
 
 char ssid[] = "yourNetwork"; //  your network SSID (name)
 char pass[] = "yourPassword";    // your network password (use for WPA, or use as key for WEP)
 
-// change the next line to use on non-WiFi101 based boards/shields
+// change the next two lines to use on non-WiFi101 based boards/shields
 WiFiSSLClient sslClient;
-//WiFiClientSecure sslClient; // for ESP8266
-//Adafruit_WINC1500SSLClient sslClient; // for Adafruit WINC1500
+WiFiUDP udp;
 
-AzureIoTHubClient iotHubClient(sslClient);
+// for ESP8266
+//WiFiClientSecure sslClient;
+//WiFiUDP udp;
+
+// for Adafruit WINC1500
+//Adafruit_WINC1500SSLClient sslClient;
+//Adafruit_WINC1500UDP udp;
+
+AzureIoTHubClient iotHubClient(sslClient, udp);
 
 void setup() {
   initSerial();
   initWifi();
-  initTime();
 
   iotHubClient.begin();
 }
@@ -92,46 +97,3 @@ void initWifi() {
 
   Serial.println("Connected to wifi");
 }
-
-void initTime() {
-  // change the next line to use on non-WiFi101, for ESP8266 boards see comment below
-  WiFiUDP ntpUdp;
-  //Adafruit_WINC1500UDP ntpUdp; // for Adafruit WINC1500
-  NTPClient ntpClient(ntpUdp);
-
-  ntpClient.begin();
-
-  while (!ntpClient.update()) {
-    Serial.println("Fetching NTP epoch time failed! Waiting 5 seconds to retry.");
-    delay(5000);
-  }
-
-  ntpClient.end();
-
-  unsigned long epochTime = ntpClient.getEpochTime();
-
-  Serial.print("Fetched NTP epoch time is: ");
-  Serial.println(epochTime);
-
-  iotHubClient.setEpochTime(epochTime);
-
-  // For ESP8266 boards comment out the above portion of the function and un-comment
-  // the remainder below.
-
-  // time_t epochTime;
-
-  // configTime(0, 0, "pool.ntp.org", "time.nist.gov");
-
-  // while (true) {
-  //     epochTime = time(NULL);
-
-  //     if (epochTime == 0) {
-  //         Serial.println("Fetching NTP epoch time failed! Waiting 2 seconds to retry.");
-  //         delay(2000);
-  //     } else {
-  //         Serial.print("Fetched NTP epoch time is: ");
-  //         Serial.println(epochTime);
-  //         break;
-  //     }
-  // }
-}
diff --git a/keywords.txt b/keywords.txt
@@ -13,7 +13,6 @@ AzureIoTHubClient	KEYWORD1
 #######################################
 
 begin	KEYWORD2
-setEpochTime	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)

diff --git a/src/AzureIoTHubClient.cpp b/src/AzureIoTHubClient.cpp
@@ -1,29 +1,30 @@
 // Copyright (c) Arduino. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#include <time.h>
-#include <sys/time.h>
-
 #include <AzureIoTHubClient.h>
 
-Client* AzureIoTHubClient::sslClient = NULL;
+extern HTTPSClient* httpsClient;
+extern NTPClient* ntpClient;
 
-AzureIoTHubClient::AzureIoTHubClient(Client& sslClient)
+AzureIoTHubClient::AzureIoTHubClient(Client& sslClient, UDP& ntpUdp):
+    _httpsClient(sslClient),
+    _ntpClient(ntpUdp)
 {
-    AzureIoTHubClient::sslClient = &sslClient;
+    httpsClient = &_httpsClient;
+    ntpClient = &_ntpClient;
 }
 
 void AzureIoTHubClient::begin()
 {
-}
+  ntpClient->begin();
 
-void AzureIoTHubClient::setEpochTime(unsigned long epochTime)
-{
-#ifndef ARDUINO_ARCH_ESP8266
-    struct timeval tv;
+  while (!ntpClient->update()) {
+    Serial.println("Fetching NTP epoch time failed! Waiting 5 seconds to retry.");
+    delay(5000);
+  }
+
+  unsigned long epochTime = ntpClient->getEpochTime();
 
-    tv.tv_sec = epochTime;
-    tv.tv_usec = 0;
-    settimeofday(&tv, NULL);
-#endif
+  Serial.print("Fetched NTP epoch time is: ");
+  Serial.println(epochTime);
 }
diff --git a/src/AzureIoTHubClient.h b/src/AzureIoTHubClient.h
@@ -4,16 +4,22 @@
 #ifdef __cplusplus
 
 #include <Client.h>
+#include <Udp.h>
+
+#include <NTPClient.h>
+
+#include "util/HTTPSClient.h"
 
 class AzureIoTHubClient
 {
 public:
-    AzureIoTHubClient(Client& sslClient);
+    AzureIoTHubClient(Client& sslClient, UDP& ntpUdp);
 
     void begin();
-    void setEpochTime(unsigned long epochTime);
 
-    static Client* sslClient;
+private:
+    HTTPSClient _httpsClient;
+    NTPClient _ntpClient;
 };
 
 #endif

diff --git a/src/agenttime.cpp b/src/agenttime.cpp
@@ -0,0 +1,26 @@
+// Copyright (c) Arduino. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#include "time.h"
+
+#include "sdk/agenttime.h"
+
+#include <NTPClient.h>
+
+NTPClient* ntpClient = NULL;
+
+time_t get_time(time_t* p)
+{
+    time_t t = ntpClient->getEpochTime();
+
+    if (p) {
+        *p = t;
+    }
+
+    return t;
+}
+
+double get_difftime(time_t stopTime, time_t startTime)
+{
+    return difftime(stopTime, startTime);
+}