Skip to content

Commit

Permalink
Merge pull request #6 from paulianttila/dev
Browse files Browse the repository at this point in the history
Fix consumption logging
  • Loading branch information
paulianttila committed Mar 23, 2023
2 parents 4ffb068 + dea0988 commit 5a66d4d
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def init(self, callbacks: Callbacks) -> None:
self.logger.debug(f"{self.meter}")

def get_version(self) -> str:
return "2.0.5"
return "2.0.6"

def stop(self) -> None:
def wait_until(condition, interval=0.1, timeout=1, *args):
Expand Down Expand Up @@ -132,24 +132,27 @@ def convert_dialeye_value_to_litre(self, retval: int, value: str) -> float | Non
def handle_update(self, litre: float):
self.meter.update_litre(litre)
self.logger.debug(f"{self.meter}")
self.logger.info(
"Current value = %.5f m3, consumption = %.2f l/min",
self.meter.value,
self.meter.instant_consumption_l_per_min,
)
self.store_data(
self.meter.m3,
self.meter.m3_already_increased,
self.meter.value,
)
if self.meter.instant_consumption_l_per_min >= 0:
self.publish_consumption_values(
self.meter.value,
self.meter.instant_consumption_l_per_min,
)
self.handle_consumption()
else:
self.handle_negative_consumption()

def handle_consumption(self) -> None:
self.logger.info(
"Current value = %.5f m3, consumption = %.2f l/min",
self.meter.value,
self.meter.instant_consumption_l_per_min,
)
self.publish_consumption_values(
self.meter.value,
self.meter.instant_consumption_l_per_min,
)

def handle_negative_consumption(self) -> None:
self.logger.error(
"Consuption %.2f l/min is less than 0, ignore update",
Expand Down

0 comments on commit 5a66d4d

Please sign in to comment.