h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bulk_sensor: Rework ChipClockUpdater class into FixedFreqReader

Browse Source 
Move the sensor_bulk_data message queuing into the class, and then
rename that class.  This simplifies the users of the code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2024-04-14 12:33:22 -04:00
parent 9ceaae3847
commit abb7910316
5 changed files with 66 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
klippy/extras/adxl345.py
View File

@@ -205,11 +205,9 @@ class ADXL345:
mcu.add_config_cmd("query_adxl345 oid=%d rest_ticks=0"
% (oid,), on_restart=True)
mcu.register_config_callback(self._build_config)
self.bulk_queue = bulk_sensor.BulkDataQueue(mcu, oid=oid)
# Clock tracking
# Bulk sample message reading
chip_smooth = self.data_rate * BATCH_UPDATES * 2
self.clock_updater = bulk_sensor.ChipClockUpdater(mcu, chip_smooth,
"BBBBB")
self.ffreader = bulk_sensor.FixedFreqReader(mcu, chip_smooth, "BBBBB")
self.last_error_count = 0
# Process messages in batches
self.batch_bulk = bulk_sensor.BatchBulkHelper(
@@ -223,8 +221,8 @@ class ADXL345:
cmdqueue = self.spi.get_command_queue()
self.query_adxl345_cmd = self.mcu.lookup_command(
"query_adxl345 oid=%c rest_ticks=%u", cq=cmdqueue)
self.clock_updater.setup_query_command("query_adxl345_status oid=%c",
oid=self.oid, cq=cmdqueue)
self.ffreader.setup_query_command("query_adxl345_status oid=%c",
oid=self.oid, cq=cmdqueue)
def read_reg(self, reg):
params = self.spi.spi_transfer([reg | REG_MOD_READ, 0x00])
response = bytearray(params['response'])
@@ -243,10 +241,7 @@ class ADXL345:
self.batch_bulk.add_client(aqh.handle_batch)
return aqh
# Measurement decoding
def _extract_samples(self, raw_samples):
# Convert messages to samples
samples = self.clock_updater.extract_samples(raw_samples)
# Convert samples
def _convert_samples(self, samples):
(x_pos, x_scale), (y_pos, y_scale), (z_pos, z_scale) = self.axes_map
count = 0
for ptime, xlow, ylow, zlow, xzhigh, yzhigh in samples:
@@ -264,7 +259,6 @@ class ADXL345:
samples[count] = (round(ptime, 6), x, y, z)
count += 1
del samples[count:]
return samples
# Start, stop, and process message batches
def _start_measurements(self):
# In case of miswiring, testing ADXL345 device ID prevents treating
@@ -283,30 +277,26 @@ class ADXL345:
self.set_reg(REG_BW_RATE, QUERY_RATES[self.data_rate])
self.set_reg(REG_FIFO_CTL, SET_FIFO_CTL)
# Start bulk reading
self.bulk_queue.clear_samples()
rest_ticks = self.mcu.seconds_to_clock(4. / self.data_rate)
self.query_adxl345_cmd.send([self.oid, rest_ticks])
self.set_reg(REG_POWER_CTL, 0x08)
logging.info("ADXL345 starting '%s' measurements", self.name)
# Initialize clock tracking
self.clock_updater.note_start()
self.ffreader.note_start()
self.last_error_count = 0
def _finish_measurements(self):
# Halt bulk reading
self.set_reg(REG_POWER_CTL, 0x00)
self.query_adxl345_cmd.send_wait_ack([self.oid, 0])
self.bulk_queue.clear_samples()
self.ffreader.note_end()
logging.info("ADXL345 finished '%s' measurements", self.name)
def _process_batch(self, eventtime):
self.clock_updater.update_clock()
raw_samples = self.bulk_queue.pull_samples()
if not raw_samples:
return {}
samples = self._extract_samples(raw_samples)
samples = self.ffreader.pull_samples()
self._convert_samples(samples)
if not samples:
return {}
return {'data': samples, 'errors': self.last_error_count,
'overflows': self.clock_updater.get_last_overflows()}
'overflows': self.ffreader.get_last_overflows()}
def load_config(config):
return ADXL345(config)