diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2023-12-17 11:35:40 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2024-01-19 11:55:15 -0500 |
| commit | dc6182f3b339b990c8a68940f02a210e332be269 (patch) | |
| tree | 71b3d8fd5881d92ca80c65a9c3b32e4af3875551 | |
| parent | 95e1a290f125650f5131a960d685d53a1e2f5e4f (diff) | |
| download | kutter-dc6182f3b339b990c8a68940f02a210e332be269.tar.gz kutter-dc6182f3b339b990c8a68940f02a210e332be269.tar.xz kutter-dc6182f3b339b990c8a68940f02a210e332be269.zip | |
sensor_angle: No need to send messages when stopping queries
Simplify the mcu code as any messages are ignored by the host anyway.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/angle.py | 7 | ||||
| -rw-r--r-- | src/sensor_angle.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/klippy/extras/angle.py b/klippy/extras/angle.py index b1aa0d96..163168d0 100644 --- a/klippy/extras/angle.py +++ b/klippy/extras/angle.py @@ -437,7 +437,7 @@ class Angle: self.oid = oid = mcu.create_oid() self.sensor_helper = sensor_class(config, self.spi, oid) # Setup mcu sensor_spi_angle bulk query code - self.query_spi_angle_cmd = self.query_spi_angle_end_cmd = None + self.query_spi_angle_cmd = None mcu.add_config_cmd( "config_spi_angle oid=%d spi_oid=%d spi_angle_type=%s" % (oid, self.spi.get_oid(), sensor_type)) @@ -462,9 +462,6 @@ class Angle: self.query_spi_angle_cmd = self.mcu.lookup_command( "query_spi_angle oid=%c clock=%u rest_ticks=%u time_shift=%c", cq=cmdqueue) - self.query_spi_angle_end_cmd = self.mcu.lookup_query_command( - "query_spi_angle oid=%c clock=%u rest_ticks=%u time_shift=%c", - "spi_angle_end oid=%c sequence=%hu", oid=self.oid, cq=cmdqueue) def get_status(self, eventtime=None): return {'temperature': self.sensor_helper.last_temperature} def add_client(self, client_cb): @@ -543,7 +540,7 @@ class Angle: self.time_shift], reqclock=reqclock) def _finish_measurements(self): # Halt bulk reading - params = self.query_spi_angle_end_cmd.send([self.oid, 0, 0, 0]) + self.query_spi_angle_cmd.send_wait_ack([self.oid, 0, 0, 0]) self.bulk_queue.clear_samples() self.sensor_helper.last_temperature = None logging.info("Stopped angle '%s' measurements", self.name) diff --git a/src/sensor_angle.c b/src/sensor_angle.c index 4d35aadf..865670b8 100644 --- a/src/sensor_angle.c +++ b/src/sensor_angle.c @@ -230,13 +230,10 @@ command_query_spi_angle(uint32_t *args) sched_del_timer(&sa->timer); sa->flags = 0; - if (!args[2]) { + if (!args[2]) // End measurements - if (sa->data_count) - angle_report(sa, oid); - sendf("spi_angle_end oid=%c sequence=%hu", oid, sa->sequence); return; - } + // Start new measurements query sa->timer.waketime = args[1]; sa->rest_ticks = args[2]; |