From 578f76fed22b980a27c32ca4e62db555e570285a Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Mon, 27 May 2024 10:35:25 +0100 Subject: [PATCH] fixed bugs in my firmware --- compile_my_layout.sh | 2 +- .../kyria/keymaps/my_kyria_layout/keymap.c | 16 +++++---------- .../kyria/keymaps/my_kyria_layout/rules.mk | 6 +++--- keyboards/splitkb/kyria/kyria.c | 20 ++++++++++--------- 4 files changed, 20 insertions(+), 24 deletions(-) mode change 100644 => 100755 compile_my_layout.sh diff --git a/compile_my_layout.sh b/compile_my_layout.sh old mode 100644 new mode 100755 index 397d5807e6..9c91d013d7 --- a/compile_my_layout.sh +++ b/compile_my_layout.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash make git-submodule -qmk flash -kb splitkb/kyria/rev3 -km my_kyria_layout +qmk compile -e CONVERT_TO=liatris -kb splitkb/kyria/rev3 -km my_kyria_layout diff --git a/keyboards/splitkb/kyria/keymaps/my_kyria_layout/keymap.c b/keyboards/splitkb/kyria/keymaps/my_kyria_layout/keymap.c index d27afba12c..e4903c82a3 100644 --- a/keyboards/splitkb/kyria/keymaps/my_kyria_layout/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/my_kyria_layout/keymap.c @@ -72,15 +72,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * | | | | | | | |ScLck | | | | Pause|M Prev|M Play|M Next|VolMut| PrtSc | * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' - * | | | | | | | | | | | | + * | | | | | | | | | Ctl | Alt | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ [_NAV] = LAYOUT( _______, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_VOLU, KC_DEL, _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS, - _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_LSFT, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR, + _______, KC_LGUI, _______, _______, _______, _______, _______, KC_LCTL, KC_LALT, _______ ), /* @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * | | | \ | : | ; | - | [ | { | | | | } | ] | _ | , | . | / | ? | * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' - * | | | | | | | | | | | | + * | | LGUI | | = | | | | = | Ctl | Alt | | * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_TILD , KC_EXLM, KC_AT , KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, KC_PIPE , KC_BSLS, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR, _______, _______, KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT, KC_SLSH, KC_QUES, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, KC_LGUI, _______, KC_EQL, _______, _______, KC_EQL, KC_LCTL, KC_LALT, _______ ), /* @@ -176,12 +176,6 @@ bool oled_task_user(void) { case _QWERTY: oled_write_P(PSTR("QWERTY\n"), false); break; - case _DVORAK: - oled_write_P(PSTR("Dvorak\n"), false); - break; - case _COLEMAK_DH: - oled_write_P(PSTR("Colemak-DH\n"), false); - break; case _NAV: oled_write_P(PSTR("Nav\n"), false); break; diff --git a/keyboards/splitkb/kyria/keymaps/my_kyria_layout/rules.mk b/keyboards/splitkb/kyria/keymaps/my_kyria_layout/rules.mk index 36a9c31373..5b6e83833d 100644 --- a/keyboards/splitkb/kyria/keymaps/my_kyria_layout/rules.mk +++ b/keyboards/splitkb/kyria/keymaps/my_kyria_layout/rules.mk @@ -1,4 +1,4 @@ OLED_ENABLE = yes -ENCODER_ENABLE = yes # Enables the use of one or more encoders -RGB_MATRIX_ENABLE = no # Disable keyboard RGB matrix, as it is enabled by default on rev3 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +ENCODER_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGBLIGHT_ENABLE = yes diff --git a/keyboards/splitkb/kyria/kyria.c b/keyboards/splitkb/kyria/kyria.c index df4e5aa374..f9c69a9e52 100644 --- a/keyboards/splitkb/kyria/kyria.c +++ b/keyboards/splitkb/kyria/kyria.c @@ -49,22 +49,24 @@ bool oled_task_kb(void) { case 0: oled_write_P(PSTR("QWERTY\n"), false); break; + // yes; this breaks the default layout. Do i care right now? No! This is a + // personal fork, i just need my layout working properly! + /* case 1: */ + /* oled_write_P(PSTR("Dvorak\n"), false); */ + /* break; */ + /* case 2: */ + /* oled_write_P(PSTR("Colemak-DH\n"), false); */ + /* break; */ case 1: - oled_write_P(PSTR("Dvorak\n"), false); - break; - case 2: - oled_write_P(PSTR("Colemak-DH\n"), false); - break; - case 3: oled_write_P(PSTR("Nav\n"), false); break; - case 4: + case 2: oled_write_P(PSTR("Sym\n"), false); break; - case 5: + case 3: oled_write_P(PSTR("Function\n"), false); break; - case 6: + case 4: oled_write_P(PSTR("Adjust\n"), false); break; default: