From 71dd0747d2ab7d6fa74e85396592e65e006134ae Mon Sep 17 00:00:00 2001
From: hg <devnull@localhost>
Date: Wed, 6 May 2015 19:20:25 +0200
Subject: [PATCH] fine so far

---
 WiModbusGateway.cpp | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/WiModbusGateway.cpp b/WiModbusGateway.cpp
index 91384e8..e2e0c88 100644
--- a/WiModbusGateway.cpp
+++ b/WiModbusGateway.cpp
@@ -100,11 +100,17 @@ void setup() {
   lcd.setCursor(0, 2);
   lcd.print("Connected.");
 
-
-
-
   printWifiStatus();
 
+  if (! client.connect("WiFiPowerMeter")) {
+    Serial.println("MQTT broker not found");
+    lcd.home();
+    lcd.clear();
+    lcd.print("MQTT broker not found");
+    while (true);
+  } else {
+    lcd.print(" *");
+  }
 
 
   delay(1000);
@@ -120,7 +126,6 @@ void setup() {
 
   // modbusAppBegin(&Mb);
   modbusAppBegin();
-  client.connect("arduinoClient");
 }
 
 
@@ -174,22 +179,18 @@ void loop() {
     char strbuf[256];
     memset(strbuf, sizeof(strbuf), 0);
     PString buf = PString(strbuf, sizeof(strbuf));
-    buf << "{ \"metadata\": { \"table\": \"WiFiPowerMeter\" }, \"data\": {";
-    buf << "\"voltage\": " << getVoltage() << ", ";
-    buf << "\"current\": " << getCurrent() << ", ";
-    buf << "\"frequency\": " << getFrequency() << ", ";
-    buf << "\"power\": " << getPower() << ", ";
-    buf << "\"energy\": " << getEnergy() << ", ";
-    buf << "\"uptime\": " << uptime;
-    buf << "}";
-    buf << "}" << endl;
-//    uint8_t x = uptime % 128;
-//    for(uint8_t y = 1; y < x; y++) {
-//      buf << "a";
-//    }
-//    Serial.print("buflen: "); Serial.println(buf.length());
-    client.publish("outTopic", strbuf);
-//    client.publish("outTopic", "tick");
+    buf << "{ \"metadata\": { \"device\": \"WiFiPowerMeter\" }, " <<
+        "\"data\": {" <<
+        "\"voltage\": " << getVoltage() << ", " <<
+        "\"current\": " << getCurrent() << ", " <<
+        "\"frequency\": " << getFrequency() << ", " <<
+        "\"power\": " << getPower() << ", " <<
+        "\"energy\": " << getEnergy() << ", " <<
+        "\"newEnergy\": " << getNewEnergy() << ", " <<
+        "\"uptime\": " << uptime <<
+        "}" <<
+        "}" << endl;
+    client.publish("IoT", strbuf);
 
 
   }