From efb642c3741734ed09b44864842cb62b58f87806 Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Sat, 9 Mar 2019 11:29:45 -0800 Subject: [PATCH] Fix some issues if you don't define some things --- kmk/boards/converter/fourtypercentclub/luddite.py | 1 + kmk/firmware.py | 8 ++++++-- kmk/rgb.py | 4 ++-- .../Default/converter/fourtypercentclub/luddite.py | 3 +++ user_keymaps/kdb424/luddite.py | 3 +++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/kmk/boards/converter/fourtypercentclub/luddite.py b/kmk/boards/converter/fourtypercentclub/luddite.py index 46a2024..99e5ca5 100644 --- a/kmk/boards/converter/fourtypercentclub/luddite.py +++ b/kmk/boards/converter/fourtypercentclub/luddite.py @@ -10,3 +10,4 @@ class Firmware(_Firmware): row_pins = (P.TX, P.RX, P.SDA, P.SCL, P.D13, P.D12, P.D11, P.D10) diode_orientation = DiodeOrientation.COLUMNS rgb_pixel_pin = board.D9 + rgb_num_pixels = 12 diff --git a/kmk/firmware.py b/kmk/firmware.py index ed7c47c..b5de854 100644 --- a/kmk/firmware.py +++ b/kmk/firmware.py @@ -95,7 +95,7 @@ class Firmware: # RGB config rgb_pixel_pin = None rgb_pixels = None - rgb_num_pixels = None + rgb_num_pixels = 0 rgb_order = (1, 0, 2) # GRB WS2812 rgb_val_limit = 255 rgb_hue_default = 0 @@ -240,7 +240,7 @@ class Firmware: if self.uart_pin is not None: self.uart = self.init_uart(self.uart_pin) - if self.rgb_pixel_pin is not None: + if self.rgb_pixel_pin: self.pixels = rgb.RGB(self.rgb_pixel_pin, self.rgb_order, self.rgb_num_pixels, self.rgb_hue_step, self.rgb_sat_step, self.rgb_val_step, self.rgb_hue_default, self.rgb_sat_default, self.rgb_val_default, @@ -248,12 +248,16 @@ class Firmware: self.rgb_val_limit, self.rgb_animation_mode, self.rgb_animation_speed, ) + else: + self.pixels = None if self.led_pin: self.led = led.led(self.led_pin, self.led_brightness_step, self.led_brightness_limit, self.led_animation_mode, self.led_animation_speed, self.led_breathe_center, ) + else: + self.led = None self.matrix = MatrixScanner( cols=self.col_pins, diff --git a/kmk/rgb.py b/kmk/rgb.py index d405165..0d29b40 100644 --- a/kmk/rgb.py +++ b/kmk/rgb.py @@ -50,8 +50,8 @@ class RGB: self.breath_center = breath_center self.knight_effect_length = knight_effect_length self.val_limit = val_limit - self.animation_mode = animation_mode - self.animation_speed = animation_speed + self.rgb_animation_mode = animation_mode + self.rgb_animation_speed = animation_speed except ImportError as e: print(e) diff --git a/user_keymaps/Default/converter/fourtypercentclub/luddite.py b/user_keymaps/Default/converter/fourtypercentclub/luddite.py index 7be1533..8085ae0 100644 --- a/user_keymaps/Default/converter/fourtypercentclub/luddite.py +++ b/user_keymaps/Default/converter/fourtypercentclub/luddite.py @@ -26,3 +26,6 @@ keyboard.keymap = [ [KC.GRV, _______, _______, _______, _______, _______, _______, _______], ], ] + +if __name__ == '__main__': + keyboard.go() diff --git a/user_keymaps/kdb424/luddite.py b/user_keymaps/kdb424/luddite.py index 2918197..dd18e82 100644 --- a/user_keymaps/kdb424/luddite.py +++ b/user_keymaps/kdb424/luddite.py @@ -63,3 +63,6 @@ keyboard.keymap = [ [KC.GRV, _______, _______, _______, KC.LALT, _______, _______, _______], ], ] + +if __name__ == '__main__': + keyboard.go()