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

bulk_sensor: Refactor ChipClockUpdater constructor

Browse Source 
Build the clock_sync and struct.Struct() in the ChipClockUpdater
constructor.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2024-04-13 21:02:04 -04:00
parent 56829b07d2
commit 9ceaae3847
5 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klippy/extras/ldc1612.py
View File

@@ -10,9 +10,6 @@ MIN_MSG_TIME = 0.100
BATCH_UPDATES = 0.100
BYTES_PER_SAMPLE = 4
SAMPLES_PER_BLOCK = bulk_sensor.MAX_BULK_MSG_SIZE // BYTES_PER_SAMPLE
LDC1612_ADDR = 0x2a
LDC1612_FREQ = 12000000
@@ -98,9 +95,8 @@ class LDC1612:
self.bulk_queue = bulk_sensor.BulkDataQueue(mcu, oid=oid)
# Clock tracking
chip_smooth = self.data_rate * BATCH_UPDATES * 2
self.clock_sync = bulk_sensor.ClockSyncRegression(mcu, chip_smooth)
self.clock_updater = bulk_sensor.ChipClockUpdater(self.clock_sync,
BYTES_PER_SAMPLE)
self.clock_updater = bulk_sensor.ChipClockUpdater(mcu, chip_smooth,
">I")
self.last_error_count = 0
# Process messages in batches
self.batch_bulk = bulk_sensor.BatchBulkHelper(
@@ -114,8 +110,8 @@ class LDC1612:
cmdqueue = self.i2c.get_command_queue()
self.query_ldc1612_cmd = self.mcu.lookup_command(
"query_ldc1612 oid=%c rest_ticks=%u", cq=cmdqueue)
self.clock_updater.setup_query_command(
self.mcu, "query_ldc1612_status oid=%c", oid=self.oid, cq=cmdqueue)
self.clock_updater.setup_query_command("query_ldc1612_status oid=%c",
oid=self.oid, cq=cmdqueue)
self.ldc1612_setup_home_cmd = self.mcu.lookup_command(
"ldc1612_setup_home oid=%c clock=%u threshold=%u"
" trsync_oid=%c trigger_reason=%c", cq=cmdqueue)
@@ -150,7 +146,7 @@ class LDC1612:
# Measurement decoding
def _extract_samples(self, raw_samples):
# Convert messages to samples
samples = self.clock_updater.extract_samples(">I", raw_samples)
samples = self.clock_updater.extract_samples(raw_samples)
# Convert samples
freq_conv = float(LDC1612_FREQ) / (1<<28)
count = 0