Merge pull request #216 from mbehr1/pr211_2

Fix power calculation, proportional to impulses
volkszaehler · Nov 10, 2015 · 61c43f7 · 61c43f7
2 parents 5bbd31b + 074d340
commit 61c43f7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/protocols/MeterS0.cpp b/src/protocols/MeterS0.cpp
@@ -322,7 +322,7 @@ ssize_t MeterS0::read(std::vector<Reading> &rds, size_t n) {
 
 	if (_send_zero || t_imp > 0) {
 		if (!_first_impulse) {
-			double value = 3600000 / ((t2-t1) * (_resolution * t_imp));
+			double value = (3600000 / ((t2-t1) * _resolution)) * t_imp;
 			rds[ret].identifier(new StringIdentifier("Power"));
 			rds[ret].time(req);
 			rds[ret].value(value);
@@ -336,7 +336,7 @@ ssize_t MeterS0::read(std::vector<Reading> &rds, size_t n) {
 
 	if (_send_zero || t_imp_neg > 0) {
 		if (!_first_impulse) {
-			double value = 3600000 / ((t2-t1) * (_resolution * t_imp_neg));
+			double value = (3600000 / ((t2-t1) * _resolution)) * t_imp_neg;
 			rds[ret].identifier(new StringIdentifier("Power_neg"));
 			rds[ret].time(req);
 			rds[ret].value(value);