diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2024-04-14 12:39:27 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2024-04-20 12:52:47 -0400 |
| commit | 819599362cad73316759e003b048545d09258a54 (patch) | |
| tree | faa974930f5e3eecbb751baae3faccfd885407e1 | |
| parent | abb79103162af2b7437c7a82f1c88d7fb1abfb68 (diff) | |
| download | kutter-819599362cad73316759e003b048545d09258a54.tar.gz kutter-819599362cad73316759e003b048545d09258a54.tar.xz kutter-819599362cad73316759e003b048545d09258a54.zip | |
bulk_sensor: Rename BulkDataQueue methods
Rename pull_samples() to pull_queue() and rename clear_sample() to
clear_queue(). This avoids confusion between the queue of response
messages and the larger list of samples stored within those messages.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/angle.py | 6 | ||||
| -rw-r--r-- | klippy/extras/bulk_sensor.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/klippy/extras/angle.py b/klippy/extras/angle.py index 23f402a7..c51d8bf0 100644 --- a/klippy/extras/angle.py +++ b/klippy/extras/angle.py @@ -529,7 +529,7 @@ class Angle: logging.info("Starting angle '%s' measurements", self.name) self.sensor_helper.start() # Start bulk reading - self.bulk_queue.clear_samples() + self.bulk_queue.clear_queue() self.last_sequence = 0 systime = self.printer.get_reactor().monotonic() print_time = self.mcu.estimated_print_time(systime) + MIN_MSG_TIME @@ -541,13 +541,13 @@ class Angle: def _finish_measurements(self): # Halt bulk reading self.query_spi_angle_cmd.send_wait_ack([self.oid, 0, 0, 0]) - self.bulk_queue.clear_samples() + self.bulk_queue.clear_queue() self.sensor_helper.last_temperature = None logging.info("Stopped angle '%s' measurements", self.name) def _process_batch(self, eventtime): if self.sensor_helper.is_tcode_absolute: self.sensor_helper.update_clock() - raw_samples = self.bulk_queue.pull_samples() + raw_samples = self.bulk_queue.pull_queue() if not raw_samples: return {} samples, error_count = self._extract_samples(raw_samples) diff --git a/klippy/extras/bulk_sensor.py b/klippy/extras/bulk_sensor.py index 6a63447b..1720c052 100644 --- a/klippy/extras/bulk_sensor.py +++ b/klippy/extras/bulk_sensor.py @@ -123,13 +123,13 @@ class BulkDataQueue: def _handle_data(self, params): with self.lock: self.raw_samples.append(params) - def pull_samples(self): + def pull_queue(self): with self.lock: raw_samples = self.raw_samples self.raw_samples = [] return raw_samples - def clear_samples(self): - self.pull_samples() + def clear_queue(self): + self.pull_queue() ###################################################################### @@ -230,14 +230,14 @@ class FixedFreqReader: self.last_sequence = 0 self.last_overflows = 0 # Clear local queue (clear any stale samples from previous session) - self.bulk_queue.clear_samples() + self.bulk_queue.clear_queue() # Set initial clock self._clear_duration_filter() self._update_clock(is_reset=True) self._clear_duration_filter() def note_end(self): # Clear local queue (free no longer needed memory) - self.bulk_queue.clear_samples() + self.bulk_queue.clear_queue() def _update_clock(self, is_reset=False): params = self.query_status_cmd.send([self.oid]) mcu_clock = self.mcu.clock32_to_clock64(params['clock']) @@ -269,7 +269,7 @@ class FixedFreqReader: # Query MCU for sample timing and update clock synchronization self._update_clock() # Pull sensor_bulk_data messages from local queue - raw_samples = self.bulk_queue.pull_samples() + raw_samples = self.bulk_queue.pull_queue() if not raw_samples: return [] # Load variables to optimize inner loop below |