From 69507a0354e88d68d57671b3bab8aca278f2cefb Mon Sep 17 00:00:00 2001 From: Gareth Farrington Date: Sat, 15 Jun 2024 19:10:08 -0700 Subject: sensor_hx71x: Update Sensors to report to load_cell_probe Signed-off-by: Gareth Farrington --- klippy/extras/ads1220.py | 6 ++++++ klippy/extras/hx71x.py | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'klippy') diff --git a/klippy/extras/ads1220.py b/klippy/extras/ads1220.py index 75fcbfd2..16080dc7 100644 --- a/klippy/extras/ads1220.py +++ b/klippy/extras/ads1220.py @@ -96,6 +96,7 @@ class ADS1220: self.printer, self._process_batch, self._start_measurements, self._finish_measurements, UPDATE_INTERVAL) # Command Configuration + self.attach_probe_cmd = None mcu.add_config_cmd( "config_ads1220 oid=%d spi_oid=%d data_ready_pin=%s" % (self.oid, self.spi.get_oid(), self.data_ready_pin)) @@ -108,6 +109,8 @@ class ADS1220: cmdqueue = self.spi.get_command_queue() self.query_ads1220_cmd = self.mcu.lookup_command( "query_ads1220 oid=%c rest_ticks=%u", cq=cmdqueue) + self.attach_probe_cmd = self.mcu.lookup_command( + "ads1220_attach_load_cell_probe oid=%c load_cell_probe_oid=%c") self.ffreader.setup_query_command("query_ads1220_status oid=%c", oid=self.oid, cq=cmdqueue) @@ -126,6 +129,9 @@ class ADS1220: def add_client(self, callback): self.batch_bulk.add_client(callback) + def attach_load_cell_probe(self, load_cell_probe_oid): + self.attach_probe_cmd.send([self.oid, load_cell_probe_oid]) + # Measurement decoding def _convert_samples(self, samples): adc_factor = 1. / (1 << 23) diff --git a/klippy/extras/hx71x.py b/klippy/extras/hx71x.py index 4ef90d6f..a7f49f8a 100644 --- a/klippy/extras/hx71x.py +++ b/klippy/extras/hx71x.py @@ -53,6 +53,7 @@ class HX71xBase: self._finish_measurements, UPDATE_INTERVAL) # Command Configuration self.query_hx71x_cmd = None + self.attach_probe_cmd = None mcu.add_config_cmd( "config_hx71x oid=%d gain_channel=%d dout_pin=%s sclk_pin=%s" % (self.oid, self.gain_channel, self.dout_pin, self.sclk_pin)) @@ -64,10 +65,13 @@ class HX71xBase: def _build_config(self): self.query_hx71x_cmd = self.mcu.lookup_command( "query_hx71x oid=%c rest_ticks=%u") + self.attach_probe_cmd = self.mcu.lookup_command( + "hx71x_attach_load_cell_probe oid=%c load_cell_probe_oid=%c") self.ffreader.setup_query_command("query_hx71x_status oid=%c", oid=self.oid, cq=self.mcu.alloc_command_queue()) + def get_mcu(self): return self.mcu @@ -83,6 +87,9 @@ class HX71xBase: def add_client(self, callback): self.batch_bulk.add_client(callback) + def attach_load_cell_probe(self, load_cell_probe_oid): + self.attach_probe_cmd.send([self.oid, load_cell_probe_oid]) + # Measurement decoding def _convert_samples(self, samples): adc_factor = 1. / (1 << 23) -- cgit v1.2.3-70-g09d2