Remove table height to prevent bugs

aw_watcher_table/config.py

@@ -4,13 +4,11 @@
 default_settings = {
     "poll_time": "5",  # seconds
     "standing_min_height": "90",  # cm
-    "min_change_height": "3",  # cm
     "esp_ip": "192.168.2.4"
 }
 default_testing_settings = {
     "poll_time": "5",  # seconds
     "standing_min_height": "90",  # cm
-    "min_change_height": "3",  # cm
     "esp_ip": "192.168.2.4"
 }
 

aw_watcher_table/settings.py

@@ -3,8 +3,6 @@ def __init__(self, config_section):
         self.poll_time = config_section.getfloat("poll_time")
         self.ip = config_section.get("esp_ip")
         self.standing_min_height = config_section.getfloat("standing_min_height")
-        self.min_change_height = config_section.getfloat("min_change_height")
 
         assert self.poll_time > 0
-        assert self.min_change_height > 0
         assert self.ip is not None, "IP address cannot be None! Please check the aw-watcher-table config!"

aw_watcher_table/watcher.py

@@ -1,7 +1,6 @@
 import logging
 import requests
 import datetime
-import sys
 from time import sleep
 from typing import Optional
 
@@ -22,8 +21,6 @@ def __init__(self, testing=False):
         self.client = ActivityWatchClient("aw-watcher-table", testing=testing)
         self.bucket_id = "{}_{}".format(self.client.client_name, self.client.client_hostname)
 
-        self.last_table_height = None
-
     def run(self):
         logger.info("aw-watcher-table started")
 
@@ -40,8 +37,7 @@ def ping(self, table_height: Optional[int]):
         event = Event(
             timestamp=datetime.datetime.now(datetime.timezone.utc),
             data={
-                "status": self.get_table_status(table_height),
-                "table_height": table_height
+                "status": self.get_table_status(table_height)
             }
         )
         # 10 seconds request timeout
@@ -50,16 +46,7 @@ def ping(self, table_height: Optional[int]):
     def get_table_height(self) -> Optional[int]:
         try:
             r = requests.get(f'http://{self.settings.ip}/measure')
-            table_height = r.json()['table_height']
-
-            if self.last_table_height is None:
-                self.last_table_height = table_height
-                return table_height
-
-            if abs(self.last_table_height - table_height) < self.settings.min_change_height:
-                table_height = self.last_table_height
-
-            return table_height
+            return r.json()['table_height']
 
         except Exception as ex:
             logger.warning(f'aw-watcher-table: Measurement failed! Please make sure http://{self.settings.ip}/measure '

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aw-watcher-table"
-version = "1.0.1"
+version = "1.0.2"
 description = "Monitors whether you have set your height-adjustable table to sitting or standing."
 authors = ["Alwin Schuster"]
 license = "MPL-2.0"