From 7566981966652bbb576ce1e53cbe32bd793932d6 Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Thu, 29 Oct 2020 16:42:04 -0700 Subject: [PATCH] move boards out of kmk --- Makefile | 14 ++++++++++- {kmk/boards => boards}/__init__.py | 0 {kmk/boards => boards}/converter/__init__.py | 0 .../converter/fourtypercentclub/__init__.py | 0 .../converter/fourtypercentclub/gherkin.py | 0 .../converter/fourtypercentclub/luddite.py | 0 .../converter/keebio/__init__.py | 0 .../converter/keebio/bdn9.py | 0 .../converter/keebio/fourier.py | 0 .../converter/keebio/iris_r1.py | 0 .../converter/keebio/iris_r2.py | 0 .../converter/keebio/lapace.py | 0 .../converter/keebio/levinson_r1.py | 0 .../converter/keebio/levinson_r2.py | 0 .../converter/keebio/nyquist_r1.py | 0 .../converter/keebio/nyquist_r2.py | 0 .../converter/keebio/rorschach.py | 0 .../converter/keebio/tragicforce68.py | 0 .../converter/keebio/viterbi_r1.py | 0 .../converter/keebio/viterbi_r2.py | 0 .../converter/lets-split/__init__.py | 0 .../converter/lets-split/lets-split_r1.py | 0 .../converter/lets-split/lets-split_r2.py | 0 {kmk/boards => boards}/klarank.py | 0 {kmk/boards => boards}/nice_nano/crkbd.py | 0 user_keymaps/kdb424/corne.py | 25 +++++++++---------- 26 files changed, 25 insertions(+), 14 deletions(-) rename {kmk/boards => boards}/__init__.py (100%) rename {kmk/boards => boards}/converter/__init__.py (100%) rename {kmk/boards => boards}/converter/fourtypercentclub/__init__.py (100%) rename {kmk/boards => boards}/converter/fourtypercentclub/gherkin.py (100%) rename {kmk/boards => boards}/converter/fourtypercentclub/luddite.py (100%) rename {kmk/boards => boards}/converter/keebio/__init__.py (100%) rename {kmk/boards => boards}/converter/keebio/bdn9.py (100%) rename {kmk/boards => boards}/converter/keebio/fourier.py (100%) rename {kmk/boards => boards}/converter/keebio/iris_r1.py (100%) rename {kmk/boards => boards}/converter/keebio/iris_r2.py (100%) rename {kmk/boards => boards}/converter/keebio/lapace.py (100%) rename {kmk/boards => boards}/converter/keebio/levinson_r1.py (100%) rename {kmk/boards => boards}/converter/keebio/levinson_r2.py (100%) rename {kmk/boards => boards}/converter/keebio/nyquist_r1.py (100%) rename {kmk/boards => boards}/converter/keebio/nyquist_r2.py (100%) rename {kmk/boards => boards}/converter/keebio/rorschach.py (100%) rename {kmk/boards => boards}/converter/keebio/tragicforce68.py (100%) rename {kmk/boards => boards}/converter/keebio/viterbi_r1.py (100%) rename {kmk/boards => boards}/converter/keebio/viterbi_r2.py (100%) rename {kmk/boards => boards}/converter/lets-split/__init__.py (100%) rename {kmk/boards => boards}/converter/lets-split/lets-split_r1.py (100%) rename {kmk/boards => boards}/converter/lets-split/lets-split_r2.py (100%) rename {kmk/boards => boards}/klarank.py (100%) rename {kmk/boards => boards}/nice_nano/crkbd.py (100%) diff --git a/Makefile b/Makefile index e14ddd8..09e010a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ MPY_TARGET_DIR ?= .compiled PY_KMK_TREE = $(shell find $(MPY_SOURCES) -name "*.py") DIST_DESCRIBE = $(shell $(DIST_DESCRIBE_CMD)) -all: copy-kmk copy-bootpy copy-keymap +all: copy-kmk copy-bootpy copy-keymap copy-board compile: $(MPY_TARGET_DIR)/.mpy.compiled @@ -135,6 +135,12 @@ copy-kmk: echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1 endif +copy-board: $(MOUNTPOINT)/kb.py +$(MOUNTPOINT)/kb.py: $(BOARD) + @echo "===> Copying your board to kb.py" + @rsync -rh $(BOARD) $@ + @sync + ifdef MOUNTPOINT $(MOUNTPOINT)/kmk/boot.py: boot.py @echo "===> Copying required boot.py" @@ -162,4 +168,10 @@ copy-keymap: $(MOUNTPOINT)/main.py else copy-keymap: echo "**** MOUNTPOINT must be defined (wherever your CIRCUITPY drive is mounted) ****" && exit 1 + +ifdef BOARD +copy-board: $(MOUNTPOINT)/kb.py +endif # BOARD + + endif # MOUNTPOINT diff --git a/kmk/boards/__init__.py b/boards/__init__.py similarity index 100% rename from kmk/boards/__init__.py rename to boards/__init__.py diff --git a/kmk/boards/converter/__init__.py b/boards/converter/__init__.py similarity index 100% rename from kmk/boards/converter/__init__.py rename to boards/converter/__init__.py diff --git a/kmk/boards/converter/fourtypercentclub/__init__.py b/boards/converter/fourtypercentclub/__init__.py similarity index 100% rename from kmk/boards/converter/fourtypercentclub/__init__.py rename to boards/converter/fourtypercentclub/__init__.py diff --git a/kmk/boards/converter/fourtypercentclub/gherkin.py b/boards/converter/fourtypercentclub/gherkin.py similarity index 100% rename from kmk/boards/converter/fourtypercentclub/gherkin.py rename to boards/converter/fourtypercentclub/gherkin.py diff --git a/kmk/boards/converter/fourtypercentclub/luddite.py b/boards/converter/fourtypercentclub/luddite.py similarity index 100% rename from kmk/boards/converter/fourtypercentclub/luddite.py rename to boards/converter/fourtypercentclub/luddite.py diff --git a/kmk/boards/converter/keebio/__init__.py b/boards/converter/keebio/__init__.py similarity index 100% rename from kmk/boards/converter/keebio/__init__.py rename to boards/converter/keebio/__init__.py diff --git a/kmk/boards/converter/keebio/bdn9.py b/boards/converter/keebio/bdn9.py similarity index 100% rename from kmk/boards/converter/keebio/bdn9.py rename to boards/converter/keebio/bdn9.py diff --git a/kmk/boards/converter/keebio/fourier.py b/boards/converter/keebio/fourier.py similarity index 100% rename from kmk/boards/converter/keebio/fourier.py rename to boards/converter/keebio/fourier.py diff --git a/kmk/boards/converter/keebio/iris_r1.py b/boards/converter/keebio/iris_r1.py similarity index 100% rename from kmk/boards/converter/keebio/iris_r1.py rename to boards/converter/keebio/iris_r1.py diff --git a/kmk/boards/converter/keebio/iris_r2.py b/boards/converter/keebio/iris_r2.py similarity index 100% rename from kmk/boards/converter/keebio/iris_r2.py rename to boards/converter/keebio/iris_r2.py diff --git a/kmk/boards/converter/keebio/lapace.py b/boards/converter/keebio/lapace.py similarity index 100% rename from kmk/boards/converter/keebio/lapace.py rename to boards/converter/keebio/lapace.py diff --git a/kmk/boards/converter/keebio/levinson_r1.py b/boards/converter/keebio/levinson_r1.py similarity index 100% rename from kmk/boards/converter/keebio/levinson_r1.py rename to boards/converter/keebio/levinson_r1.py diff --git a/kmk/boards/converter/keebio/levinson_r2.py b/boards/converter/keebio/levinson_r2.py similarity index 100% rename from kmk/boards/converter/keebio/levinson_r2.py rename to boards/converter/keebio/levinson_r2.py diff --git a/kmk/boards/converter/keebio/nyquist_r1.py b/boards/converter/keebio/nyquist_r1.py similarity index 100% rename from kmk/boards/converter/keebio/nyquist_r1.py rename to boards/converter/keebio/nyquist_r1.py diff --git a/kmk/boards/converter/keebio/nyquist_r2.py b/boards/converter/keebio/nyquist_r2.py similarity index 100% rename from kmk/boards/converter/keebio/nyquist_r2.py rename to boards/converter/keebio/nyquist_r2.py diff --git a/kmk/boards/converter/keebio/rorschach.py b/boards/converter/keebio/rorschach.py similarity index 100% rename from kmk/boards/converter/keebio/rorschach.py rename to boards/converter/keebio/rorschach.py diff --git a/kmk/boards/converter/keebio/tragicforce68.py b/boards/converter/keebio/tragicforce68.py similarity index 100% rename from kmk/boards/converter/keebio/tragicforce68.py rename to boards/converter/keebio/tragicforce68.py diff --git a/kmk/boards/converter/keebio/viterbi_r1.py b/boards/converter/keebio/viterbi_r1.py similarity index 100% rename from kmk/boards/converter/keebio/viterbi_r1.py rename to boards/converter/keebio/viterbi_r1.py diff --git a/kmk/boards/converter/keebio/viterbi_r2.py b/boards/converter/keebio/viterbi_r2.py similarity index 100% rename from kmk/boards/converter/keebio/viterbi_r2.py rename to boards/converter/keebio/viterbi_r2.py diff --git a/kmk/boards/converter/lets-split/__init__.py b/boards/converter/lets-split/__init__.py similarity index 100% rename from kmk/boards/converter/lets-split/__init__.py rename to boards/converter/lets-split/__init__.py diff --git a/kmk/boards/converter/lets-split/lets-split_r1.py b/boards/converter/lets-split/lets-split_r1.py similarity index 100% rename from kmk/boards/converter/lets-split/lets-split_r1.py rename to boards/converter/lets-split/lets-split_r1.py diff --git a/kmk/boards/converter/lets-split/lets-split_r2.py b/boards/converter/lets-split/lets-split_r2.py similarity index 100% rename from kmk/boards/converter/lets-split/lets-split_r2.py rename to boards/converter/lets-split/lets-split_r2.py diff --git a/kmk/boards/klarank.py b/boards/klarank.py similarity index 100% rename from kmk/boards/klarank.py rename to boards/klarank.py diff --git a/kmk/boards/nice_nano/crkbd.py b/boards/nice_nano/crkbd.py similarity index 100% rename from kmk/boards/nice_nano/crkbd.py rename to boards/nice_nano/crkbd.py diff --git a/user_keymaps/kdb424/corne.py b/user_keymaps/kdb424/corne.py index 8d46577..e522491 100644 --- a/user_keymaps/kdb424/corne.py +++ b/user_keymaps/kdb424/corne.py @@ -1,8 +1,11 @@ +# OLED +import board + import adafruit_displayio_ssd1306 import displayio import terminalio from adafruit_display_text import label -from kmk.boards.nice_nano.crkbd import KMKKeyboard +from kb import KMKKeyboard from kmk.extensions.ble_split import BLE_Split from kmk.extensions.rgb import RGB from kmk.handlers.sequences import send_string, simple_key_sequence @@ -20,23 +23,19 @@ LT2_SP = KC.LT(3, KC.SPC) TAB_SB = KC.LT(5, KC.TAB) SUPER_L = KC.LM(4, KC.LGUI) -keyboard.tap_time = 300 +keyboard.tap_time = 500 keyboard.debug_enabled = False -rgb_ext = RGB( - pixel_pin=keyboard.rgb_pixel_pin, - num_pixels=27, - val_limit=100, - hue_default=190, - sat_default=100, - val_default=5 -) +# TODO Get this out of here +rgb_pixel_pin = board.P0_06 +rgb_ext = RGB(pixel_pin=rgb_pixel_pin, num_pixels=27, val_limit=100, hue_default=190, sat_default=100, val_default=5) -ble_split = BLE_Split(split_side=split_side) -keyboard.extensions = [ble_split, rgb_ext] +split = BLE_Split(split_side=split_side) +keyboard.extensions = [split, rgb_ext] displayio.release_displays() -display_bus = displayio.I2CDisplay(keyboard.i2c, device_address=0x3c) +i2c = board.I2C() +display_bus = displayio.I2CDisplay(i2c, device_address=0x3c) display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=32) splash = displayio.Group(max_size=10) display.show(splash)