From 05dd3165ecc05e50c4c3bebac0c8d76a42b2dfe0 Mon Sep 17 00:00:00 2001 From: hg Date: Tue, 19 May 2015 07:42:08 +0200 Subject: [PATCH] changes --- ModbusApp.cpp | 2 +- ModbusApp.h | 2 +- WiModbusGateway.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ModbusApp.cpp b/ModbusApp.cpp index e0b6bec..5bd19c7 100644 --- a/ModbusApp.cpp +++ b/ModbusApp.cpp @@ -37,7 +37,7 @@ float startEnergy = 0; float getVoltage() { return (float)voltage; } float getCurrent() { return (float)current * 0.1; } float getCosPhi() { return (float)cosphi * 0.01; } -float getPower() { return (float)power * 10; } +float getPower() { return (float)power * 0.01; } float getEnergy() { uint32_t v = ((uint32_t)energy[1]) + (((uint32_t)energy[0]) << 16); diff --git a/ModbusApp.h b/ModbusApp.h index a7ea623..39fbad6 100644 --- a/ModbusApp.h +++ b/ModbusApp.h @@ -14,7 +14,7 @@ -const uint32_t MODBUS_BAUD = 19200; +const uint32_t MODBUS_BAUD = 9600; const uint16_t MODBUS_TIMEOUT = 10000; const uint16_t MODBUS_SCANRATE = 1000; const uint8_t MODBUS_RETRY_COUNT = 25; diff --git a/WiModbusGateway.cpp b/WiModbusGateway.cpp index 2696439..8996a24 100644 --- a/WiModbusGateway.cpp +++ b/WiModbusGateway.cpp @@ -185,7 +185,7 @@ void updateDisplay() { lcd.setCursor(0, 2); lcd.print(getCosPhi()); lcd.print(""); lcd.setCursor(10, 2); - lcd.print(getPower()); lcd.print("W"); + lcd.print(getPower()); lcd.print("kW"); lcd.setCursor(0, 3); lcd.print(getEnergy()); lcd.print(" "); lcd.print(getNewEnergy()); lcd.print(" "); lcd.print("kWh");