From 7ff9d1b94f354066398a5925a91f5fc2d5c7a839 Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Wed, 5 Jun 2024 00:12:37 +0300 Subject: restructure as external userspace --- .gitignore | 1 + Makefile | 16 +++++ README.md | 9 ++- config.h | 24 ------- keyboards/keychron/v1/ansi/keymaps/lbr/config.h | 24 +++++++ keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c | 87 +++++++++++++++++++++++++ keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk | 9 +++ keymap.c | 83 ----------------------- qmk.json | 4 ++ rules.mk | 9 --- 10 files changed, 148 insertions(+), 118 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile delete mode 100644 config.h create mode 100644 keyboards/keychron/v1/ansi/keymaps/lbr/config.h create mode 100644 keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c create mode 100644 keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk delete mode 100644 keymap.c create mode 100644 qmk.json delete mode 100644 rules.mk diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a8a0dce --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.bin diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4b045ed --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +.SILENT: + +MAKEFLAGS += --no-print-directory + +QMK_USERSPACE := $(patsubst %/,%,$(dir $(shell realpath "$(lastword $(MAKEFILE_LIST))"))) +ifeq ($(QMK_USERSPACE),) + QMK_USERSPACE := $(shell pwd) +endif + +QMK_FIRMWARE_ROOT = $(shell qmk config -ro user.qmk_home | cut -d= -f2 | sed -e 's@^None$$@@g') +ifeq ($(QMK_FIRMWARE_ROOT),) + $(error Cannot determine qmk_firmware location. `qmk config -ro user.qmk_home` is not set) +endif + +%: + +$(MAKE) -C $(QMK_FIRMWARE_ROOT) $(MAKECMDGOALS) QMK_USERSPACE=$(QMK_USERSPACE) diff --git a/README.md b/README.md index d350e23..9d1e79a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ -# keychron v1 ansi knobless qmk keymap +# qmk userspace my experiments with qmk. don't wanna go too advanced and exploring the world of customizable keyboards, while trying to figure out what i would think will be convenient for me. -## 2023-01-03 +## keyboards an layouts + +### keychron v1 ansi knobless + +_2024-01-03_ basic qwerty, f-row is used for switching workspaces in window managers (i use sway, hyprland and cwm, all of them are configured to use super+ @@ -19,3 +23,4 @@ second layer contains f-keys and numpad. third layer contains some magick keys for entering bootloader mode, clearing eeprom and toggling nkro. need to hold space and del to reach it. + diff --git a/config.h b/config.h deleted file mode 100644 index 820ab13..0000000 --- a/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* override defaults */ -#undef ENABLE_RGB_MATRIX_BREATHING -#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#undef ENABLE_RGB_MATRIX_CYCLE_ALL -#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#undef ENABLE_RGB_MATRIX_DUAL_BEACON -#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON -#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#undef ENABLE_RGB_MATRIX_PIXEL_RAIN -#undef RGB_MATRIX_KEYPRESSES -#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS - -/* set our defaults */ -#define RGB_MATRIX_DISABLE_KEYCODES -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_DEFAULT_HUE 0 -#define RGB_MATRIX_DEFAULT_SAT 154 -#define RGB_MATRIX_DEFAULT_VAL 127 diff --git a/keyboards/keychron/v1/ansi/keymaps/lbr/config.h b/keyboards/keychron/v1/ansi/keymaps/lbr/config.h new file mode 100644 index 0000000..218a1a3 --- /dev/null +++ b/keyboards/keychron/v1/ansi/keymaps/lbr/config.h @@ -0,0 +1,24 @@ +/* override defaults */ +#undef ENABLE_RGB_MATRIX_BREATHING +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#undef ENABLE_RGB_MATRIX_CYCLE_ALL +#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#undef ENABLE_RGB_MATRIX_DUAL_BEACON +#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON +#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#undef ENABLE_RGB_MATRIX_PIXEL_RAIN +#undef RGB_MATRIX_KEYPRESSES +#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS + +/* set our defaults */ +#define RGB_MATRIX_DISABLE_KEYCODES +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR +#define RGB_MATRIX_DEFAULT_HUE 0 +#define RGB_MATRIX_DEFAULT_SAT 191 +#define RGB_MATRIX_DEFAULT_VAL 204 diff --git a/keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c b/keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c new file mode 100644 index 0000000..229c634 --- /dev/null +++ b/keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c @@ -0,0 +1,87 @@ +/* Copyright 2023 la-ninpre */ + +#include QMK_KEYBOARD_H + +/* ideas: + * - figure out tap dance, may be useful + * - is nkro needed? + * - is spacebar ok to change layers? i thought it is the biggest button, so it'll be easier to use. + * - do i really need more than 6 ttys? + * - i don't use the media keys yet, maybe replace them with smth more useful + * - maybe numpad isn't that useful to have it so easily accessible, but some symbols would benefit from that + */ + +// switch to tty on linux, TTY(1) => Ctrl+Alt+F1 +#define TTY(n) (LCA(KC_F1+(n)-1)) + +enum { + BASE, + EXTR, + MGCK, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_ansi_82( + KC_CAPS, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), KC_MPLY, KC_VOLD, KC_VOLU, KC_DEL, KC_HOME, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, LT(EXTR,KC_SPC), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [EXTR] = LAYOUT_ansi_82( + _______, TTY(1), TTY(2), TTY(3), TTY(4), TTY(5), TTY(6), TTY(7), TTY(8), TTY(9), TTY(10), TTY(11), TTY(12), MO(MGCK), KC_PSCR, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_PEQL, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PAST, _______, KC_NUM, + _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, _______, + _______, _______, _______, _______, KC_P0, KC_PDOT, KC_APP, _______, _______, _______), + [MGCK] = LAYOUT_ansi_82( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#ifdef RGB_MATRIX_ENABLE +#ifdef DIP_SWITCH_ENABLE +bool +dip_switch_update_user(uint8_t index, bool active) +{ + if(index == 0){ + if(active){ + rgb_matrix_enable_noeeprom(); + } else { + rgb_matrix_disable_noeeprom(); + } + } + return false; +} +#endif // DIP_SWITCH_ENABLE + +// top-right key for numpad status +#define IND_NUMPAD 14 +#define IND_CAPSLK 0 +#define IND_COLOUR 0x00, 0xbf, 0xcc +bool +rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) +{ + if(rgb_matrix_is_enabled()){ + led_t led_state = host_keyboard_led_state(); + HSV hsv = {IND_COLOUR}; + RGB rgb = hsv_to_rgb(hsv); + if(led_state.num_lock){ + rgb_matrix_set_color(IND_NUMPAD, rgb.r, rgb.g, rgb.b); + }else{ + rgb_matrix_set_color(IND_NUMPAD, RGB_BLACK); + } + if(led_state.caps_lock){ + rgb_matrix_set_color(IND_CAPSLK, rgb.r, rgb.g, rgb.b); + }else{ + rgb_matrix_set_color(IND_CAPSLK, RGB_BLACK); + } + } + return false; +} +#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk b/keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk new file mode 100644 index 0000000..2672e9d --- /dev/null +++ b/keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk @@ -0,0 +1,9 @@ +DIPSWITCH_ENABLE = yes +RGB_MATRIX_ENABLE = yes + +# optimizations +LTO_ENABLE = yes +MOUSEKEY_ENABLE = no +SPACE_CADET_ENABLE = no +GRAVE_ESC_ENABLE = no +SEND_STRING_ENABLE = no diff --git a/keymap.c b/keymap.c deleted file mode 100644 index 90e1696..0000000 --- a/keymap.c +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright 2023 la-ninpre */ - -#include QMK_KEYBOARD_H - -/* ideas: - * - figure out tap dance, may be useful - * - is nkro needed? - * - is spacebar ok to change layers? i thought it is the biggest button, so it'll be easier to use. - * - do i really need more than 6 ttys? - */ - -// switch to tty on linux, TTY(1) => Ctrl+Alt+F1 -#define TTY(n) (LCA(KC_F1+(n)-1)) - -enum { - BASE, - EXTR, - MGCK, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_ansi_82( - KC_CAPS, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), KC_MPLY, KC_VOLD, KC_VOLU, KC_DEL, KC_HOME, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, LT(EXTR,KC_SPC), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [EXTR] = LAYOUT_ansi_82( - _______, TTY(1), TTY(2), TTY(3), TTY(4), TTY(5), TTY(6), TTY(7), TTY(8), TTY(9), TTY(10), TTY(11), TTY(12), MO(MGCK), KC_PSCR, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_PEQL, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PAST, _______, KC_NUM, - _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, _______, - _______, _______, _______, _______, KC_P0, KC_PDOT, KC_APP, _______, _______, _______), - [MGCK] = LAYOUT_ansi_82( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -}; - -#ifdef RGB_MATRIX_ENABLE -#ifdef DIP_SWITCH_ENABLE -bool -dip_switch_update_user(uint8_t index, bool active) -{ - if(index == 0){ - if(active){ - rgb_matrix_enable_noeeprom(); - } else { - rgb_matrix_disable_noeeprom(); - } - } - return false; -} -#endif // DIP_SWITCH_ENABLE - -// top-right key for numpad status -#define IND_NUMPAD 14 -#define IND_CAPSLK 0 -#define IND_COLOUR 0xCC, 0x33, 0x33 -bool -rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) -{ - if(rgb_matrix_is_enabled()){ - led_t led_state = host_keyboard_led_state(); - if(led_state.num_lock){ - rgb_matrix_set_color(IND_NUMPAD, IND_COLOUR); - }else{ - rgb_matrix_set_color(IND_NUMPAD, RGB_BLACK); - } - if(led_state.caps_lock){ - rgb_matrix_set_color(IND_CAPSLK, IND_COLOUR); - }else{ - rgb_matrix_set_color(IND_CAPSLK, RGB_BLACK); - } - } - return false; -} -#endif // RGB_MATRIX_ENABLE diff --git a/qmk.json b/qmk.json new file mode 100644 index 0000000..b4714c5 --- /dev/null +++ b/qmk.json @@ -0,0 +1,4 @@ +{ + "userspace_version": "1.0", + "build_targets": [] +} diff --git a/rules.mk b/rules.mk deleted file mode 100644 index 2672e9d..0000000 --- a/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -DIPSWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes - -# optimizations -LTO_ENABLE = yes -MOUSEKEY_ENABLE = no -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -SEND_STRING_ENABLE = no -- cgit v1.2.3