Skip to content

Commit 9fbcc37

Browse files
authored
Merge branch 'main' into codex/investigate-adafruit-quad-encoder-behavior-wn0rmg
2 parents 1d2f771 + 7bd14b8 commit 9fbcc37

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/module/gpio_input.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def initialize_components(self):
8282
encoder_actions = encoder_config.get('encoder_actions', {})
8383
rotate_cw_action_method = self.extract_action_method(encoder_actions.get('rotate_clockwise'))
8484
rotate_ccw_action_method = self.extract_action_method(encoder_actions.get('rotate_counterclockwise'))
85-
detents_per_pulse = self._normalize_detents_per_pulse(encoder_config.get('detents_per_pulse'))
85+
detents_per_pulse = int(encoder_config.get('detents_per_pulse', 1))
8686

8787
self.logger.info(f"Rotary Encoder with Button on CLK pin: {encoder_config['clk_pin']}, DT pin: {encoder_config['dt_pin']}")
8888
if not "None" in str(rotate_cw_action_method): self.logger.info(f" Rotate Clockwise: {rotate_cw_action_method}")
@@ -543,7 +543,7 @@ def __init__(self, cinepi_controller, clk_pin, dt_pin, actions, detents_per_puls
543543

544544
self.actions = actions
545545
self.cinepi_controller = cinepi_controller
546-
self.detents_per_pulse = ComponentInitializer._normalize_detents_per_pulse(detents_per_pulse)
546+
self.detents_per_pulse = max(1, int(detents_per_pulse))
547547

548548
# Set up event handlers
549549
self.encoder.when_rotated_clockwise = self.on_rotated_clockwise

src/module/i2c/quad_rotary_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def update(self):
168168
change = pos - self.last_positions[idx]
169169
self.last_positions[idx] = pos
170170
setting = cfg.get("setting_name")
171-
detents_per_pulse = self._normalize_detents_per_pulse(cfg.get("detents_per_pulse"))
171+
detents_per_pulse = max(1, int(cfg.get("detents_per_pulse", 1)))
172172
if setting:
173173
self._update_setting(setting, change, detents_per_pulse)
174174
if not self.switches[idx].value:

0 commit comments

Comments
 (0)