From 3476eb0420793e4c8f86c6ee8c8d67970e6e9f74 Mon Sep 17 00:00:00 2001 From: sodoku Date: Thu, 5 Nov 2020 22:17:27 +0100 Subject: [PATCH 1/3] feat(simple_menu): Make scroll buttons configurable --- Documentation/card10-cfg.rst | 2 ++ pycardium/modules/py/simple_menu.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/card10-cfg.rst b/Documentation/card10-cfg.rst index 7a0173b3..13401488 100644 --- a/Documentation/card10-cfg.rst +++ b/Documentation/card10-cfg.rst @@ -48,4 +48,6 @@ Option name Type Description ``ble_mac`` Boolean MAC address used for BLE. Format: ``ca:4d:10:xx:xx:xx``. ------------------ ---------- ----------- ``ble_log_enable`` Boolean Activate HCI level logging of BLE data. Creates a new btsnoop compatible log file named ``ble.log`` in the ``logs`` folder after each boot if BLE is activated. Keeps the last 10 files. +------------------ ---------- ----------- +``right_scroll`` Boolean Use both right buttons to scroll up and down. Lower left button is SELECT. ================== ========== =========== diff --git a/pycardium/modules/py/simple_menu.py b/pycardium/modules/py/simple_menu.py index 5701d80b..fb4ffb45 100644 --- a/pycardium/modules/py/simple_menu.py +++ b/pycardium/modules/py/simple_menu.py @@ -3,6 +3,7 @@ import color import display import sys import time +import config TIMEOUT = 0x100 """:py:func:`~simple_menu.button_events` timeout marker.""" @@ -193,11 +194,18 @@ class Menu: self.idx = 0 self.select_time = time.time_ms() self.disp = display.open() + try: + config_right_buttons_scroll = config.get_string("right_scroll") + if config_right_buttons_scroll.lower() == "true" or config_right_buttons_scroll == "1": + right_buttons_scroll = True + except OSError: + right_buttons_scroll = self.right_buttons_scroll + self.button_scroll_up = ( - buttons.TOP_RIGHT if self.right_buttons_scroll else buttons.BOTTOM_LEFT + buttons.TOP_RIGHT if right_buttons_scroll else buttons.BOTTOM_LEFT ) self.button_select = ( - buttons.BOTTOM_LEFT if self.right_buttons_scroll else buttons.TOP_RIGHT + buttons.BOTTOM_LEFT if right_buttons_scroll else buttons.TOP_RIGHT ) def entry2name(self, value): -- GitLab From 2f204129a094fea0a6c53d15a201140cd85f74a8 Mon Sep 17 00:00:00 2001 From: sodoku Date: Fri, 6 Nov 2020 10:48:25 +0100 Subject: [PATCH 2/3] style(simple_menu): use code style --- pycardium/modules/py/simple_menu.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pycardium/modules/py/simple_menu.py b/pycardium/modules/py/simple_menu.py index fb4ffb45..844faccc 100644 --- a/pycardium/modules/py/simple_menu.py +++ b/pycardium/modules/py/simple_menu.py @@ -196,7 +196,10 @@ class Menu: self.disp = display.open() try: config_right_buttons_scroll = config.get_string("right_scroll") - if config_right_buttons_scroll.lower() == "true" or config_right_buttons_scroll == "1": + if ( + config_right_buttons_scroll.lower() == "true" + or config_right_buttons_scroll == "1" + ): right_buttons_scroll = True except OSError: right_buttons_scroll = self.right_buttons_scroll -- GitLab From 0b489600f2a27962c687d5832a91cfee4012f9fa Mon Sep 17 00:00:00 2001 From: sodoku Date: Fri, 6 Nov 2020 13:23:31 +0100 Subject: [PATCH 3/3] style(simple_menu): make code more readable --- pycardium/modules/py/simple_menu.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pycardium/modules/py/simple_menu.py b/pycardium/modules/py/simple_menu.py index 844faccc..506c5f89 100644 --- a/pycardium/modules/py/simple_menu.py +++ b/pycardium/modules/py/simple_menu.py @@ -195,11 +195,8 @@ class Menu: self.select_time = time.time_ms() self.disp = display.open() try: - config_right_buttons_scroll = config.get_string("right_scroll") - if ( - config_right_buttons_scroll.lower() == "true" - or config_right_buttons_scroll == "1" - ): + right_scroll_str = config.get_string("right_scroll") + if right_scroll_str.lower() in ["true", "1"]: right_buttons_scroll = True except OSError: right_buttons_scroll = self.right_buttons_scroll -- GitLab