aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/adxl345.py
diff options
context:
space:
mode:
Diffstat (limited to 'klippy/extras/adxl345.py')
-rw-r--r--klippy/extras/adxl345.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/klippy/extras/adxl345.py b/klippy/extras/adxl345.py
index 8f40c7fe..76fd4ca4 100644
--- a/klippy/extras/adxl345.py
+++ b/klippy/extras/adxl345.py
@@ -204,7 +204,7 @@ class ADXL345:
self.spi = bus.MCU_SPI_from_config(config, 3, default_speed=5000000)
self.mcu = mcu = self.spi.get_mcu()
self.oid = oid = mcu.create_oid()
- self.query_adxl345_cmd = self.query_adxl345_end_cmd = None
+ self.query_adxl345_cmd = None
self.query_adxl345_status_cmd = None
mcu.add_config_cmd("config_adxl345 oid=%d spi_oid=%d"
% (oid, self.spi.get_oid()))
@@ -230,10 +230,6 @@ class ADXL345:
cmdqueue = self.spi.get_command_queue()
self.query_adxl345_cmd = self.mcu.lookup_command(
"query_adxl345 oid=%c clock=%u rest_ticks=%u", cq=cmdqueue)
- self.query_adxl345_end_cmd = self.mcu.lookup_query_command(
- "query_adxl345 oid=%c clock=%u rest_ticks=%u",
- "adxl345_status oid=%c clock=%u query_ticks=%u next_sequence=%hu"
- " buffered=%c fifo=%c limit_count=%hu", oid=self.oid, cq=cmdqueue)
self.query_adxl345_status_cmd = self.mcu.lookup_query_command(
"query_adxl345_status oid=%c",
"adxl345_status oid=%c clock=%u query_ticks=%u next_sequence=%hu"
@@ -334,7 +330,7 @@ class ADXL345:
self.last_error_count = 0
def _finish_measurements(self):
# Halt bulk reading
- params = self.query_adxl345_end_cmd.send([self.oid, 0, 0])
+ self.query_adxl345_cmd.send_wait_ack([self.oid, 0, 0])
self.bulk_queue.clear_samples()
logging.info("ADXL345 finished '%s' measurements", self.name)
def _process_batch(self, eventtime):