diff --git a/esp32/nvs_prog/nvs_prog.ino b/esp32/nvs_prog/nvs_prog.ino index cb05d1f..7e20b68 100644 --- a/esp32/nvs_prog/nvs_prog.ino +++ b/esp32/nvs_prog/nvs_prog.ino @@ -31,8 +31,10 @@ const char* ssid = SECRET_SSID; const char* password = SECRET_PASSWORD; struct netConfig { - IPAddress address = REMOTE_IP; - unsigned int port = REMOTE_PORT; + IPAddress iot_address = IOT_IP; + unsigned int iot_port = IOT_PORT; + IPAddress ntp_address = NTP_IP; + unsigned int ntp_port = NTP_PORT; } config; void setup() { diff --git a/esp32/nvs_prog/settings.h.tmpl b/esp32/nvs_prog/settings.h.tmpl index b260549..6f45458 100644 --- a/esp32/nvs_prog/settings.h.tmpl +++ b/esp32/nvs_prog/settings.h.tmpl @@ -19,7 +19,9 @@ */ #define SERIAL "" -#define REMOTE_IP {192, 168, 0, 1} -#define REMOTE_PORT 80 +#define IOT_IP {192, 168, 10, 1} +#define IOT_PORT 80 +#define NTP_IP {192, 168, 10, 1} +#define NTP_PORT 123 #define SECRET_SSID "" #define SECRET_PASSWORD "" diff --git a/esp32/rssiHall/rssiHall.ino b/esp32/rssiHall/rssiHall.ino index e18413f..4361213 100644 --- a/esp32/rssiHall/rssiHall.ino +++ b/esp32/rssiHall/rssiHall.ino @@ -48,8 +48,10 @@ WiFiClient ethClient; PubSubClient clientMQTT(ethClient); struct netConfig { - IPAddress address; - unsigned int port; + IPAddress iot_address; + unsigned int iot_port; + IPAddress ntp_address; + unsigned int ntp_port; } config; char* serial; @@ -94,15 +96,17 @@ void setup(void) { Serial.println(WiFi.localIP()); Serial.println(); Serial.print("Connecting to: "); - Serial.print(config.address.toString()); + Serial.print(config.iot_address.toString()); Serial.print(":"); - Serial.print(config.port); + Serial.print(config.iot_port); Serial.print(" every "); Serial.print(TELEMETRY_DELAY); Serial.println("s"); #if USE_INTERNAL_NTP - timeClient.setPoolServerIP(config.address); + Serial.print("Using NTP: "); + Serial.println(config.ntp_address.toString()); + timeClient.setPoolServerIP(config.ntp_address); #endif timeClient.begin(); if (timeClient.update()) { @@ -120,7 +124,7 @@ void setup(void) { // payload["id"] = serverName; #if USE_MQTT - clientMQTT.setServer(config.address, 1883); + clientMQTT.setServer(config.iot_address, 1883); #endif } @@ -172,14 +176,14 @@ void publishData(const netConfig &mqtt, const DynamicJsonDocument &json) { #endif void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) { - if (ethClient.connect(postAPI.address, postAPI.port)) { + if (ethClient.connect(postAPI.iot_address, postAPI.iot_port)) { ethClient.print("POST "); ethClient.print(URL); ethClient.println(" HTTP/1.1"); ethClient.print("Host: "); - ethClient.print(postAPI.address.toString()); + ethClient.print(postAPI.iot_address.toString()); ethClient.print(":"); - ethClient.println(postAPI.port); + ethClient.println(postAPI.iot_port); ethClient.println("Content-Type: application/json"); ethClient.print("Content-Length: "); ethClient.println(measureJson(json));