Rename datalogger datapoint

pyleco/management/data_logger.py

@@ -174,14 +174,15 @@ def handle_subscription_data(self, data: dict[str, Any]) -> None:
             except KeyError:
                 log.error(f"Got value for {key}, but no list present.")
         if self.trigger_type == TriggerTypes.VARIABLE and self.trigger_variable in data.keys():
-            self.make_data_point()
+            self.make_datapoint()
 
-    def make_data_point(self) -> None:
+    def make_datapoint(self) -> dict[str, Any]:
         """Store a datapoint."""
         datapoint = self.calculate_data()
         self.last_datapoint = datapoint
         if self.namespace is not None:
             self.publisher.send_data(data=self.last_datapoint)
+        return datapoint
 
     def calculate_data(self) -> dict[str, Any]:
         """Calculate data for a data point and return the data point."""
@@ -294,7 +295,7 @@ def reset_data_storage(self) -> None:
     def set_timeout_trigger(self, timeout: float) -> None:
         self.trigger_type = TriggerTypes.TIMER
         self.trigger_timeout = timeout
-        self.timer = RepeatingTimer(timeout, self.make_data_point)
+        self.timer = RepeatingTimer(timeout, self.make_datapoint)
         self.timer.start()
 
     def set_variable_trigger(self, variable: str) -> None:
@@ -365,10 +366,10 @@ def get_configuration(self) -> dict[str, Any]:
             config['triggerTimer'] = int(self.trigger_timeout * 1000)  # deprecated
             config['trigger_timeout'] = self.trigger_timeout
         elif self.trigger_type == TriggerTypes.VARIABLE:
-            config['triggerVariable'] = self.trigger_variable
+            config['triggerVariable'] = self.trigger_variable  # deprecated
             config['trigger_variable'] = self.trigger_variable
         # Value
-        config['value'] = "last" if self.valuing == self.last else "mean"
+        config['valuing_mode'] = "last" if self.valuing == self.last else "mean"
         config['valueRepeat'] = self.value_repeating  # deprecated
         config['value_repeating'] = self.value_repeating
         # Header and Variables.

tests/management/test_data_logger.py

@@ -118,9 +118,9 @@ def test_handle_subscription_data_without_trigger(data_logger: DataLogger):
 
 
 def test_handle_subscription_data_triggers(data_logger: DataLogger):
-    data_logger.make_data_point = MagicMock()  # type: ignore[method-assign]
+    data_logger.make_datapoint = MagicMock()  # type: ignore[method-assign]
     data_logger.handle_subscription_data({"test": 5})
-    data_logger.make_data_point.assert_called_once()
+    data_logger.make_datapoint.assert_called_once()
 
 
 def test_set_publisher_name(data_logger: DataLogger):
@@ -133,7 +133,7 @@ class Test_make_data_point:
     @pytest.fixture
     def data_logger_mdp(self, data_logger: DataLogger):
         del data_logger.lists['time']  # for better comparison
-        data_logger.make_data_point()
+        data_logger.make_datapoint()
         return data_logger
 
     def test_last_data_point(self, data_logger_mdp: DataLogger):
@@ -149,7 +149,7 @@ def test_publish_data(self, data_logger: DataLogger):
 
         data_logger.namespace = "N1"
         # act
-        data_logger.make_data_point()
+        data_logger.make_datapoint()
         # assert
         data_logger.publisher.send_data.assert_called_once_with(data={"test": nan, "2": 1.5,
                                                                       "N1.sender.var": nan})