SW-1317 add pressure sensor data to analytics (mrbeam#1504)

Author: JFSolution

octoprint_mrbeam/analytics/analytics_handler.py

@@ -36,7 +36,7 @@ def analyticsHandler(plugin):
 
 class AnalyticsHandler(object):
     QUEUE_MAXSIZE = 1000
-    ANALYTICS_LOG_VERSION = 22  # bumped for SW-653 - added frontend event update_info_call_failure to see when this backend call fails
+    ANALYTICS_LOG_VERSION = 23  # bumped for SW-1317 - added pressure to test fan rpm event
 
     def __init__(self, plugin):
         self._plugin = plugin

octoprint_mrbeam/iobeam/dust_manager.py

@@ -72,6 +72,7 @@ def __init__(self, plugin):
         self._just_initialized = False
 
         self._last_rpm_values = deque(maxlen=5)
+        self._last_pressure_values = deque(maxlen=5)
         self._job_dust_values = []
 
         self.extraction_limit = 0.3
@@ -120,6 +121,9 @@ def shutdown(self):
 
     def _subscribe(self):
         self._iobeam.subscribe(IoBeamValueEvents.DYNAMIC_VALUE, self._handle_fan_data)
+        self._iobeam.subscribe(
+            IoBeamValueEvents.EXHAUST_DYNAMIC_VALUE, self._handle_exhaust_data
+        )
         self._iobeam.subscribe(
             IoBeamValueEvents.FAN_ON_RESPONSE, self._on_command_response
         )
@@ -142,6 +146,25 @@ def _subscribe(self):
         self._event_bus.subscribe(OctoPrintEvents.PRINT_RESUMED, self._onEvent)
         self._event_bus.subscribe(OctoPrintEvents.SHUTDOWN, self._onEvent)
 
+    def _handle_exhaust_data(self, args):
+        """
+        hanldes exhaust data comming from iobeam EXHAUST_DYNAMIC_VALUE event
+
+        Args:
+            args: data from the iobeam event
+
+        Returns:
+
+        """
+        pressure = args.get("pressure", None)
+        if pressure is not None:
+            self._logger.debug(
+                "last pressure values append {} - {}".format(
+                    pressure, self._last_pressure_values
+                )
+            )
+            self._last_pressure_values.append(pressure)
+
     def _handle_fan_data(self, args):
         err = False
         if args["state"] is not None:
@@ -247,19 +270,13 @@ def _finish_test_fan_rpm(self):
         try:
             # Write to analytics if the values are valid
             if self._validate_values():
-                if len(self._last_rpm_values):
-                    rpm_average = sum(self._last_rpm_values) / len(
-                        self._last_rpm_values
-                    )
-                else:
-                    rpm_average = -1
-
                 data = dict(
-                    rpm_val=rpm_average,
+                    rpm_val=list(self._last_rpm_values),
                     fan_state=self._state,
                     usage_count=self._usage_handler.get_total_usage(),
                     prefilter_count=self._usage_handler.get_prefilter_usage(),
                     carbon_filter_count=self._usage_handler.get_carbon_filter_usage(),
+                    pressure_val=list(self._last_pressure_values),
                 )
                 self._analytics_handler.add_fan_rpm_test(data)
 
@@ -463,12 +480,15 @@ def _validate_values(self):
 
         if not result and not self._plugin.is_boot_grace_period():
             msg = "Fan error: {errs}".format(errs=", ".join(errs))
-            log_message = msg + " - Data from iobeam: state:{state}, rpm:{rpm}, dust:{dust}, connected:{connected}, age:{age:.2f}s".format(
-                state=self._state,
-                rpm=self._rpm,
-                dust=self._dust,
-                connected=self._connected,
-                age=(time.time() - self._data_ts),
+            log_message = (
+                msg
+                + " - Data from iobeam: state:{state}, rpm:{rpm}, dust:{dust}, connected:{connected}, age:{age:.2f}s".format(
+                    state=self._state,
+                    rpm=self._rpm,
+                    dust=self._dust,
+                    connected=self._connected,
+                    age=(time.time() - self._data_ts),
+                )
             )
             self._pause_laser(
                 trigger=msg, analytics="invalid-old-fan-data", log_message=msg

octoprint_mrbeam/iobeam/iobeam_handler.py

@@ -55,6 +55,7 @@ class IoBeamValueEvents(object):
     RPM_VALUE = "iobeam.rpm.value"
     STATE_VALUE = "iobeam.state.value"
     DYNAMIC_VALUE = "iobeam.dynamic.value"
+    EXHAUST_DYNAMIC_VALUE = "iobeam.exhaust.dynamic"
     CONNECTED_VALUE = "iobeam.connected.value"
     FAN_ON_RESPONSE = "iobeam.fan.on.response"
     FAN_OFF_RESPONSE = "iobeam.fan.off.response"
@@ -1068,7 +1069,13 @@ def _handle_exhaust(self, dataset):
         :param dataset:
         :return: error count
         """
-        # self._logger.info("exhaust dataset: '%s'", dataset)
+        self._logger.debug("exhaust dataset: '%s'", dataset)
+        # get the pressure sensor reading this will come as dust with the current iobeam version
+        if "dust" in dataset:
+            vals = {
+                "pressure": dataset["dust"],
+            }
+            self._call_callback(IoBeamValueEvents.EXHAUST_DYNAMIC_VALUE, dataset, vals)
         return 0
 
     def _handle_link_quality(self, dataset):