Moves NTP configuration to header

Author: gguuss

examples/Esp32-lwmqtt/Esp32-lwmqtt.ino

@@ -1,42 +1,38 @@
-/******************************************************************************
- * Copyright 2018 Google
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *****************************************************************************/
-#include "esp32-mqtt.h"
-
-#ifndef LED_BUILTIN
-  #define LED_BUILTIN 13
-#endif
-
-void setup() {
-  // put your setup code here, to run once:
-  Serial.begin(115200);
-  pinMode(LED_BUILTIN, OUTPUT);
-  setupCloudIoT();
-}
-
-unsigned long lastMillis = 0;
-void loop() {
-  mqttClient->loop();
-  delay(10);  // <- fixes some issues with WiFi stability
-
-  if (!mqttClient->connected()) {
-    connect();
-  }
-
-  // publish a message roughly every second.
-  if (millis() - lastMillis > 1000) {
-    lastMillis = millis();
-    publishTelemetry(getDefaultSensor());
-  }
-}
+/******************************************************************************
+ * Copyright 2018 Google
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *****************************************************************************/
+#include "esp32-mqtt.h"
+
+void setup() {
+  // put your setup code here, to run once:
+  Serial.begin(115200);
+  pinMode(LED_BUILTIN, OUTPUT);
+  setupCloudIoT();
+}
+
+unsigned long lastMillis = 0;
+void loop() {
+  mqttClient->loop();
+  delay(10);  // <- fixes some issues with WiFi stability
+
+  if (!mqttClient->connected()) {
+    connect();
+  }
+
+  // publish a message roughly every second.
+  if (millis() - lastMillis > 1000) {
+    lastMillis = millis();
+    publishTelemetry(getDefaultSensor());
+  }
+}

examples/Esp32-lwmqtt/ciotc_config.h

@@ -24,6 +24,14 @@ const char *location = "us-central1";
 const char *registry_id = "my-registry";
 const char *device_id = "my-esp32-device";
 
+// Configuration for NTP
+const char* ntp_primary = "pool.ntp.org";
+const char* ntp_secondary = "time.nist.gov";
+
+#ifndef LED_BUILTIN
+#define LED_BUILTIN 13
+#endif
+
 // To get the private key run (where private-key.pem is the ec private key
 // used to create the certificate uploaded to google cloud iot):
 // openssl ec -in <private-key.pem> -noout -text

examples/Esp32-lwmqtt/esp32-mqtt.h

@@ -15,9 +15,11 @@
 // This file contains static methods for API requests using Wifi / MQTT
 #ifndef __ESP32_MQTT_H__
 #define __ESP32_MQTT_H__
+#include <String.h>
 #include <WiFi.h>
 #include <WiFiClientSecure.h>
 
+#include <rBase64.h>
 #include <MQTT.h>
 
 #include <CloudIoTCore.h>
@@ -60,7 +62,7 @@ void setupWifi() {
     delay(100);
   }
 
-  configTime(0, 0, "pool.ntp.org", "time.nist.gov");
+  configTime(0, 0, ntp_primary, ntp_secondary);
   Serial.println("Waiting on time sync...");
   while (time(nullptr) < 1510644967) {
     delay(10);