diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-02-27 13:34:22 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-27 13:34:22 -0500 |
| commit | 2d99a1e802314d57f235fdcf843e0736098b1c04 (patch) | |
| tree | 403978f5f0962718837d1485262b7132901f7783 /klippy/extras/buttons.py | |
| parent | ef1bf60ab7e81db9fc5b87f863e2caba93bcaccc (diff) | |
| download | kutter-2d99a1e802314d57f235fdcf843e0736098b1c04.tar.gz kutter-2d99a1e802314d57f235fdcf843e0736098b1c04.tar.xz kutter-2d99a1e802314d57f235fdcf843e0736098b1c04.zip | |
buttons: Wrap code to 80 columns
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/buttons.py')
| -rw-r--r-- | klippy/extras/buttons.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/klippy/extras/buttons.py b/klippy/extras/buttons.py index e0d3ee36..9ebd3adc 100644 --- a/klippy/extras/buttons.py +++ b/klippy/extras/buttons.py @@ -9,7 +9,8 @@ QUERY_TIME = .002 RETRANSMIT_COUNT = 50 # Rotary encoder handler https://github.com/brianlow/Rotary -# Copyright 2011 Ben Buxton (bb@cactii.net). Licenced under the GNU GPL Version 3. +# Copyright 2011 Ben Buxton (bb@cactii.net). +# Licenced under the GNU GPL Version 3. R_START = 0x0 R_CW_FINAL = 0x1 R_CW_BEGIN = 0x2 @@ -77,7 +78,8 @@ class MCU_buttons: clock = self.mcu.get_query_slot(self.oid) rest_ticks = self.mcu.seconds_to_clock(QUERY_TIME) self.mcu.add_config_cmd( - "buttons_query oid=%d clock=%d rest_ticks=%d retransmit_count=%d" % ( + "buttons_query oid=%d clock=%d" + " rest_ticks=%d retransmit_count=%d" % ( self.oid, clock, rest_ticks, RETRANSMIT_COUNT), is_init=True) self.mcu.register_msg( self.handle_buttons_state, "buttons_state", self.oid) @@ -120,10 +122,11 @@ class RotaryEncoder: self.ccw_callback = ccw_callback self.encoder_state = R_START def encoder_callback(self, eventtime, state): - self.encoder_state = ENCODER_STATES[self.encoder_state & 0xf][state & 0x3] - if (self.encoder_state & R_DIR_MSK) == R_DIR_CW: + es = ENCODER_STATES[self.encoder_state & 0xf][state & 0x3] + self.encoder_state = es + if es & R_DIR_MSK == R_DIR_CW: self.cw_callback(eventtime) - elif (self.encoder_state & R_DIR_MSK) == R_DIR_CCW: + elif es & R_DIR_MSK == R_DIR_CCW: self.ccw_callback(eventtime) |