aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorla-ninpre <aaoth@aaoth.xyz>2024-06-05 00:12:37 +0300
committerla-ninpre <aaoth@aaoth.xyz>2024-06-05 00:12:37 +0300
commit7ff9d1b94f354066398a5925a91f5fc2d5c7a839 (patch)
tree4babd76924b9eacc1f92b3016462ce09f6ebf403
parent2c4639a23e6f22119f190a08fb44af427b6fad60 (diff)
downloadqmk-userspace-7ff9d1b94f354066398a5925a91f5fc2d5c7a839.tar.gz
qmk-userspace-7ff9d1b94f354066398a5925a91f5fc2d5c7a839.zip
restructure as external userspace
-rw-r--r--.gitignore1
-rw-r--r--Makefile16
-rw-r--r--README.md9
-rw-r--r--keyboards/keychron/v1/ansi/keymaps/lbr/config.h (renamed from config.h)4
-rw-r--r--keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c (renamed from keymap.c)10
-rw-r--r--keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk (renamed from rules.mk)0
-rw-r--r--qmk.json4
7 files changed, 37 insertions, 7 deletions
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+<n>
@@ -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/keyboards/keychron/v1/ansi/keymaps/lbr/config.h
index 820ab13..218a1a3 100644
--- a/config.h
+++ b/keyboards/keychron/v1/ansi/keymaps/lbr/config.h
@@ -20,5 +20,5 @@
#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
+#define RGB_MATRIX_DEFAULT_SAT 191
+#define RGB_MATRIX_DEFAULT_VAL 204
diff --git a/keymap.c b/keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c
index 90e1696..229c634 100644
--- a/keymap.c
+++ b/keyboards/keychron/v1/ansi/keymaps/lbr/keymap.c
@@ -7,6 +7,8 @@
* - 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
@@ -61,19 +63,21 @@ dip_switch_update_user(uint8_t index, bool active)
// top-right key for numpad status
#define IND_NUMPAD 14
#define IND_CAPSLK 0
-#define IND_COLOUR 0xCC, 0x33, 0x33
+#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, IND_COLOUR);
+ 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, IND_COLOUR);
+ rgb_matrix_set_color(IND_CAPSLK, rgb.r, rgb.g, rgb.b);
}else{
rgb_matrix_set_color(IND_CAPSLK, RGB_BLACK);
}
diff --git a/rules.mk b/keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk
index 2672e9d..2672e9d 100644
--- a/rules.mk
+++ b/keyboards/keychron/v1/ansi/keymaps/lbr/rules.mk
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": []
+}