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

adxl345: Use "clock" suffix instead of "time" in commands 

The debugging code knows how to handle fields that end in "clock".

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-04-29 20:49:43 -04:00
parent b611e72a19
commit 470b1e2e46
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
klippy/extras/adxl345.py
View File

@ -174,14 +174,14 @@ class ADXL345:
cq=self.spi.get_command_queue()) cq=self.spi.get_command_queue())
self.query_adxl345_end_cmd = self.mcu.lookup_query_command( self.query_adxl345_end_cmd = self.mcu.lookup_query_command(
"query_adxl345 oid=%c clock=%u rest_ticks=%u", "query_adxl345 oid=%c clock=%u rest_ticks=%u",
"adxl345_end oid=%c end1_time=%u end2_time=%u" "adxl345_end oid=%c end1_clock=%u end2_clock=%u"
" limit_count=%hu sequence=%hu", " limit_count=%hu sequence=%hu",
oid=self.oid, cq=self.spi.get_command_queue()) oid=self.oid, cq=self.spi.get_command_queue())
def _clock_to_print_time(self, clock): def _clock_to_print_time(self, clock):
return self.mcu.clock_to_print_time(self.mcu.clock32_to_clock64(clock)) return self.mcu.clock_to_print_time(self.mcu.clock32_to_clock64(clock))
def _handle_adxl345_start(self, params): def _handle_adxl345_start(self, params):
self.samples_start1 = self._clock_to_print_time(params['start1_time']) self.samples_start1 = self._clock_to_print_time(params['start1_clock'])
self.samples_start2 = self._clock_to_print_time(params['start2_time']) self.samples_start2 = self._clock_to_print_time(params['start2_clock'])
def _handle_adxl345_data(self, params): def _handle_adxl345_data(self, params):
last_sequence = self.last_sequence last_sequence = self.last_sequence
sequence = (last_sequence & ~0xffff) | params['sequence'] sequence = (last_sequence & ~0xffff) | params['sequence']
@ -252,8 +252,8 @@ class ADXL345:
raw_samples = self.raw_samples raw_samples = self.raw_samples
self.raw_samples = [] self.raw_samples = []
# Generate results # Generate results
end1_time = self._clock_to_print_time(params['end1_time']) end1_time = self._clock_to_print_time(params['end1_clock'])
end2_time = self._clock_to_print_time(params['end2_time']) end2_time = self._clock_to_print_time(params['end2_clock'])
end_sequence = self._convert_sequence(params['sequence']) end_sequence = self._convert_sequence(params['sequence'])
overflows = params['limit_count'] overflows = params['limit_count']
res = ADXL345Results() res = ADXL345Results()

4
src/sensor_adxl345.c
View File

@ -104,7 +104,7 @@ adxl_start(struct adxl345 *ax, uint8_t oid)
ax->timer.waketime = start2_time + ax->rest_ticks; ax->timer.waketime = start2_time + ax->rest_ticks;
sched_add_timer(&ax->timer); sched_add_timer(&ax->timer);
irq_enable(); irq_enable();
sendf("adxl345_start oid=%c start1_time=%u start2_time=%u" sendf("adxl345_start oid=%c start1_clock=%u start2_clock=%u"
, oid, start1_time, start2_time); , oid, start1_time, start2_time);
} }
@ -132,7 +132,7 @@ adxl_stop(struct adxl345 *ax, uint8_t oid)
// Report final data // Report final data
if (ax->data_count) if (ax->data_count)
adxl_report(ax, oid); adxl_report(ax, oid);
sendf("adxl345_end oid=%c end1_time=%u end2_time=%u" sendf("adxl345_end oid=%c end1_clock=%u end2_clock=%u"
" limit_count=%hu sequence=%hu" " limit_count=%hu sequence=%hu"
, oid, end1_time, end2_time, ax->limit_count, ax->sequence); , oid, end1_time, end2_time, ax->limit_count, ax->sequence);
} }