From 09596697b96ea23c15dc1ebd32e407774fba4bf0 Mon Sep 17 00:00:00 2001 From: Northern Man Date: Fri, 11 Jun 2021 22:46:22 -0400 Subject: [PATCH] Adjustment of DT24 Bluetooth voltmeter MQTT Discovery message (#983) Updating of DT24 messages to align with MQTT Discovery messages. Co-authored-by: Northern Man --- main/ZgatewayBT.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino index a22df36..c266017 100644 --- a/main/ZgatewayBT.ino +++ b/main/ZgatewayBT.ino @@ -778,9 +778,9 @@ void notifyCB( BLEdata.set("id", (char*)mac_adress.c_str()); Log.trace(F("Device identified in CB: %s" CR), (char*)mac_adress.c_str()); BLEdata.set("volt", (float)(((pData[4] * 256 * 256) + (pData[5] * 256) + pData[6]) / 10.0)); - BLEdata.set("amp", (float)(((pData[7] * 256 * 256) + (pData[8] * 256) + pData[9]) / 1000.0)); - BLEdata.set("watt", (float)(((pData[10] * 256 * 256) + (pData[11] * 256) + pData[12]) / 10.0)); - BLEdata.set("watt hour", (float)(((pData[13] * 256 * 256 * 256) + (pData[14] * 256 * 256) + (pData[15] * 256) + pData[16]) / 100.0)); + BLEdata.set("current", (float)(((pData[7] * 256 * 256) + (pData[8] * 256) + pData[9]) / 1000.0)); + BLEdata.set("power", (float)(((pData[10] * 256 * 256) + (pData[11] * 256) + pData[12]) / 10.0)); + BLEdata.set("energy", (float)(((pData[13] * 256 * 256 * 256) + (pData[14] * 256 * 256) + (pData[15] * 256) + pData[16]) / 100.0)); BLEdata.set("price", (float)(((pData[17] * 256 * 256) + (pData[18] * 256) + pData[19]) / 100.0)); pubBT(BLEdata);