From 300df0380818e1e84867a9f5a07ecdba0d25250e Mon Sep 17 00:00:00 2001 From: Siwat Sirichai Date: Wed, 21 Aug 2019 19:51:02 +0700 Subject: [PATCH] branding --- waterishos-gen2-mesh/waterishos-gen2-mesh.ino | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/waterishos-gen2-mesh/waterishos-gen2-mesh.ino b/waterishos-gen2-mesh/waterishos-gen2-mesh.ino index c122ded..9e3abd4 100644 --- a/waterishos-gen2-mesh/waterishos-gen2-mesh.ino +++ b/waterishos-gen2-mesh/waterishos-gen2-mesh.ino @@ -2,7 +2,9 @@ #include #include - +// |----------------------------------| +// | SIWAT INC | +// |----------------------------------| #define FIRMWARE_ID 0x1337 #define FIRMWARE_VER "0.1" wifi_conn networks[] = {WIFI_CONN("ssid 1", "Password", NULL, 0),WIFI_CONN("ssid 2", "Another Password", NULL, 0),NULL,}; @@ -15,19 +17,16 @@ String ID = String(ESP.getChipId()); unsigned long previousMillis = 0; const long interval = 5000; int cnt = 0; - -// Note: All of the '.set' options below are optional. The default values can be -// found in ESP8266MQTTMeshBuilder.h -ESP8266MQTTMesh mesh = ESP8266MQTTMesh::Builder(networks, mqtt_server, mqtt_port).setVersion(FIRMWARE_VER, FIRMWARE_ID).setMeshPassword(mesh_password).build(); - -void callback(const char *topic, const char *msg); +ESP8266MQTTMesh mesh = ESP8266MQTTMesh::Builder(networks, mqtt_server, mqtt_port).setMqttAuth(mqtt_user, mqtt_password).setVersion(FIRMWARE_VER, FIRMWARE_ID).setMeshPassword(mesh_password).build(); +, +void callback(const char *topic, const char *msg); //define initial callback void setup() { Serial.begin(115200); - delay(1000); //This is only here to make it easier to catch the startup messages. It isn't required + delay(1000); mesh.setCallback(callback); mesh.begin(); @@ -35,23 +34,13 @@ void setup() { void loop() { - - - if (! mesh.connected()) - return; - + if (! mesh.connected())return; unsigned long currentMillis = millis(); - if (currentMillis - previousMillis >= interval) { - - String cntStr = String(cnt); - String msg = "hello from " + ID + " cnt: " + cntStr; - mesh.publish(ID.c_str(), msg.c_str()); + mesh.publish("", msg.c_str()); previousMillis = currentMillis; cnt++; - } - }