aboutsummaryrefslogtreecommitdiffstats
path: root/klippy
diff options
context:
space:
mode:
authorGareth Farrington <gareth@waves.ky>2024-06-15 19:10:08 -0700
committerKevin O'Connor <kevin@koconnor.net>2025-05-29 19:07:49 -0400
commit69507a0354e88d68d57671b3bab8aca278f2cefb (patch)
tree65dff8910c24a194dc98fec919a99fe3bd2776b1 /klippy
parent42c9031c8119adc0d2f881aac9c5d222c1beab91 (diff)
downloadkutter-69507a0354e88d68d57671b3bab8aca278f2cefb.tar.gz
kutter-69507a0354e88d68d57671b3bab8aca278f2cefb.tar.xz
kutter-69507a0354e88d68d57671b3bab8aca278f2cefb.zip
sensor_hx71x: Update Sensors to report to load_cell_probe
Signed-off-by: Gareth Farrington <gareth@waves.ky>
Diffstat (limited to 'klippy')
-rw-r--r--klippy/extras/ads1220.py6
-rw-r--r--klippy/extras/hx71x.py7
2 files changed, 13 insertions, 0 deletions
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)