Autogenerated - Upstream 8394c37

klippy/.version

@@ -1 +1 @@
-8ad4739
+8394c37

klippy/docs/API_Server.md

@@ -375,9 +375,10 @@ A request may look like:
 `{"id": 123, "method":"hx71x/dump_hx71x",
 "params": {"sensor": "load_cell", "response_template": {}}}`
 and might return:
-`{"id": 123,"result":{"header":["time","counts"]}}`
+`{"id": 123,"result":{"header":["time","counts","value"]}}`
 and might later produce asynchronous messages such as:
-`{"params":{"data":[[3292.432935, 562534], [3292.4394937, 5625322]]}}`
+`{"params":{"data":[[3292.432935, 562534, 0.067059278],
+[3292.4394937, 5625322, 0.670590639]]}}`
 
 ### ads1220/dump_ads1220
 
@@ -390,9 +391,10 @@ A request may look like:
 `{"id": 123, "method":"ads1220/dump_ads1220",
 "params": {"sensor": "load_cell", "response_template": {}}}`
 and might return:
-`{"id": 123,"result":{"header":["time","counts"]}}`
+`{"id": 123,"result":{"header":["time","counts","value"]}}`
 and might later produce asynchronous messages such as:
-`{"params":{"data":[[3292.432935, 562534], [3292.4394937, 5625322]]}}`
+`{"params":{"data":[[3292.432935, 562534, 0.067059278],
+[3292.4394937, 5625322, 0.670590639]]}}`
 
 ### pause_resume/cancel
 

klippy/extras/ads1220.py

@@ -69,9 +69,9 @@ def __init__(self, config):
             self.printer, self._process_batch, self._start_measurements,
             self._finish_measurements, UPDATE_INTERVAL)
         # publish raw samples to the socket
+        hdr = {'header': ('time', 'counts', 'value')}
         self.batch_bulk.add_mux_endpoint("ads1220/dump_ads1220", "sensor",
-                                         self.name,
-                                         {'header': ('time', 'counts')})
+                                         self.name, hdr)
         # Command Configuration
         mcu.add_config_cmd(
             "config_ads1220 oid=%d spi_oid=%d data_ready_pin=%s"

klippy/extras/hx71x.py

@@ -53,8 +53,8 @@ def __init__(self, config, sensor_type,
             self._finish_measurements, UPDATE_INTERVAL)
         # publish raw samples to the socket
         dump_path = "%s/dump_%s" % (sensor_type, sensor_type)
-        self.batch_bulk.add_mux_endpoint(dump_path, "sensor", self.name,
-                                         {'header': ('time', 'counts')})
+        hdr = {'header': ('time', 'counts', 'value')}
+        self.batch_bulk.add_mux_endpoint(dump_path, "sensor", self.name, hdr)
         # Command Configuration
         self.query_hx71x_cmd = None
         mcu.add_config_cmd(