fine so far

This commit is contained in:
hg
2015-05-06 19:20:25 +02:00
parent 0ec1895128
commit 71dd0747d2

View File

@ -100,11 +100,17 @@ void setup() {
lcd.setCursor(0, 2); lcd.setCursor(0, 2);
lcd.print("Connected."); lcd.print("Connected.");
printWifiStatus(); 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); delay(1000);
@ -120,7 +126,6 @@ void setup() {
// modbusAppBegin(&Mb); // modbusAppBegin(&Mb);
modbusAppBegin(); modbusAppBegin();
client.connect("arduinoClient");
} }
@ -174,22 +179,18 @@ void loop() {
char strbuf[256]; char strbuf[256];
memset(strbuf, sizeof(strbuf), 0); memset(strbuf, sizeof(strbuf), 0);
PString buf = PString(strbuf, sizeof(strbuf)); PString buf = PString(strbuf, sizeof(strbuf));
buf << "{ \"metadata\": { \"table\": \"WiFiPowerMeter\" }, \"data\": {"; buf << "{ \"metadata\": { \"device\": \"WiFiPowerMeter\" }, " <<
buf << "\"voltage\": " << getVoltage() << ", "; "\"data\": {" <<
buf << "\"current\": " << getCurrent() << ", "; "\"voltage\": " << getVoltage() << ", " <<
buf << "\"frequency\": " << getFrequency() << ", "; "\"current\": " << getCurrent() << ", " <<
buf << "\"power\": " << getPower() << ", "; "\"frequency\": " << getFrequency() << ", " <<
buf << "\"energy\": " << getEnergy() << ", "; "\"power\": " << getPower() << ", " <<
buf << "\"uptime\": " << uptime; "\"energy\": " << getEnergy() << ", " <<
buf << "}"; "\"newEnergy\": " << getNewEnergy() << ", " <<
buf << "}" << endl; "\"uptime\": " << uptime <<
// uint8_t x = uptime % 128; "}" <<
// for(uint8_t y = 1; y < x; y++) { "}" << endl;
// buf << "a"; client.publish("IoT", strbuf);
// }
// Serial.print("buflen: "); Serial.println(buf.length());
client.publish("outTopic", strbuf);
// client.publish("outTopic", "tick");
} }