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

pulse_counter: 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:46:57 -04:00
parent 8f76e53c0e
commit b611e72a19
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
klippy/extras/pulse_counter.py
View File

@ -13,6 +13,7 @@ class MCU_counter:
self._pin = pin_params['pin'] self._pin = pin_params['pin']
self._pullup = pin_params['pullup'] self._pullup = pin_params['pullup']
self._poll_time = poll_time self._poll_time = poll_time
self._poll_ticks = 0
self._sample_time = sample_time self._sample_time = sample_time
self._callback = None self._callback = None
self._last_count = 0 self._last_count = 0
@ -22,11 +23,11 @@ class MCU_counter:
self._mcu.add_config_cmd("config_counter oid=%d pin=%s pull_up=%d" self._mcu.add_config_cmd("config_counter oid=%d pin=%s pull_up=%d"
% (self._oid, self._pin, self._pullup)) % (self._oid, self._pin, self._pullup))
clock = self._mcu.get_query_slot(self._oid) clock = self._mcu.get_query_slot(self._oid)
poll_ticks = self._mcu.seconds_to_clock(self._poll_time) self._poll_ticks = self._mcu.seconds_to_clock(self._poll_time)
sample_ticks = self._mcu.seconds_to_clock(self._sample_time) sample_ticks = self._mcu.seconds_to_clock(self._sample_time)
self._mcu.add_config_cmd( self._mcu.add_config_cmd(
"query_counter oid=%d clock=%d poll_ticks=%d sample_ticks=%d" "query_counter oid=%d clock=%d poll_ticks=%d sample_ticks=%d"
% (self._oid, clock, poll_ticks, sample_ticks), is_init=True) % (self._oid, clock, self._poll_ticks, sample_ticks), is_init=True)
self._mcu.register_response(self._handle_counter_state, self._mcu.register_response(self._handle_counter_state,
"counter_state", self._oid) "counter_state", self._oid)
@ -35,10 +36,10 @@ class MCU_counter:
self._callback = cb self._callback = cb
def _handle_counter_state(self, params): def _handle_counter_state(self, params):
clock = self._mcu.clock32_to_clock64(params['time']) next_clock = self._mcu.clock32_to_clock64(params['next_clock'])
time = self._mcu.clock_to_print_time(clock) time = self._mcu.clock_to_print_time(next_clock - self._poll_ticks)
count_clock = self._mcu.clock32_to_clock64(params['count_time']) count_clock = self._mcu.clock32_to_clock64(params['count_clock'])
count_time = self._mcu.clock_to_print_time(count_clock) count_time = self._mcu.clock_to_print_time(count_clock)
# handle 32-bit counter overflow # handle 32-bit counter overflow

6
src/pulse_counter.c
View File

@ -87,13 +87,13 @@ counter_task(void)
if (!(c->flags & CF_PENDING)) if (!(c->flags & CF_PENDING))
continue; continue;
irq_disable(); irq_disable();
uint32_t time = c->timer.waketime - c->poll_ticks; uint32_t waketime = c->timer.waketime;
uint32_t count = c->count; uint32_t count = c->count;
uint32_t count_time = c->last_count_time; uint32_t count_time = c->last_count_time;
c->flags &= ~CF_PENDING; c->flags &= ~CF_PENDING;
irq_enable(); irq_enable();
sendf("counter_state oid=%c time=%u count=%u count_time=%u", sendf("counter_state oid=%c next_clock=%u count=%u count_clock=%u",
oid, time, count, count_time); oid, waketime, count, count_time);
} }
} }
DECL_TASK(counter_task); DECL_TASK(counter_task);