diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml index 69f37c87..16befc89 100755 --- a/.github/workflows/build_binaries.yaml +++ b/.github/workflows/build_binaries.yaml @@ -10,8 +10,10 @@ jobs: name: 'QMK Userspace Build' uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main with: - qmk_repo: vial-kb/vial-qmk - qmk_ref: vial + qmk_repo: qmk/qmk_firmware + qmk_ref: master + # qmk_repo: vial-kb/vial-qmk + # qmk_ref: vial publish: name: 'QMK Userspace Publish' diff --git a/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/config.h b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/config.h new file mode 100644 index 00000000..ca94c3ab --- /dev/null +++ b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/config.h @@ -0,0 +1,4 @@ +#pragma once + +#define PERMISSIVE_HOLD +#define TAPPING_TERM 190 diff --git a/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/keymap.c b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/keymap.c new file mode 100644 index 00000000..a9a27251 --- /dev/null +++ b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/keymap.c @@ -0,0 +1,31 @@ + +#include QMK_KEYBOARD_H + +enum layers { + BASE, // default layer + MDIA, // media keys +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[BASE] = LAYOUT_split_4x6_5( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_MPLY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LALT, KC_LCMD, LT(MDIA,KC_LGUI), KC_ENT, KC_SPC, LT(MDIA,KC_RGUI), KC_DEL, KC_RALT, KC_RCTL +), +[MDIA] = LAYOUT_split_4x6_5( + KC_MUTE,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + RM_TOGG,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + RM_NEXT,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, + RM_HUEU,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______, + _______,_______,_______,_______, _______, _______, _______,_______,_______,_______ +) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }, + [MDIA] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) } +}; +#endif diff --git a/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/rules.mk b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/rules.mk new file mode 100644 index 00000000..c3f9b2e9 --- /dev/null +++ b/keyboards/keebart/sofle_choc_pro/keymaps/hrm_cags/rules.mk @@ -0,0 +1,3 @@ +ENCODER_MAP_ENABLE = yes + +CAPS_WORD_ENABLE = yes diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/config.h b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/config.h new file mode 100644 index 00000000..ca94c3ab --- /dev/null +++ b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/config.h @@ -0,0 +1,4 @@ +#pragma once + +#define PERMISSIVE_HOLD +#define TAPPING_TERM 190 diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/keymap.c b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/keymap.c new file mode 100644 index 00000000..a00b1113 --- /dev/null +++ b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/keymap.c @@ -0,0 +1,25 @@ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_5_hlc(KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_ESC, LCTL_T(KC_A), LALT_T(KC_S), LGUI_T(KC_D), LSFT_T(KC_F), HYPR_T(KC_G), MEH_T(KC_H), RSFT_T(KC_J), RGUI_T(KC_K), RALT_T(KC_L), RCTL_T(KC_SCLN), KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, LT(6,KC_B), KC_MINS, KC_UP, KC_DOWN, KC_EQL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSPC, CW_TOGG, KC_LBRC, LT(5,KC_ENT), LT(3,KC_SPC), KC_RGHT, KC_LEFT, LT(3,KC_SPC), LT(4,KC_ENT), KC_RBRC, MO(7), KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX), + [1] = LAYOUT_split_3x6_5_hlc(_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [2] = LAYOUT_split_3x6_5_hlc(_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [3] = LAYOUT_split_3x6_5_hlc(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_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_HYPR, KC_MEH, KC_RSFT, KC_RGUI, KC_RALT, KC_RCTL, KC_EQL, _______, LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), _______, _______, _______, _______, LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [4] = LAYOUT_split_3x6_5_hlc(_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MEH, KC_RSFT, KC_RGUI, KC_RALT, KC_RCTL, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [5] = LAYOUT_split_3x6_5_hlc(_______, _______, LCTL(KC_LEFT), LGUI(KC_TAB), LCTL(KC_RGHT), LSG(KC_F12), KC_PGUP, KC_HOME, KC_UP, KC_END, KC_INS, _______, _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, KC_HYPR, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, _______, _______, _______, LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [6] = LAYOUT_split_3x6_5_hlc(_______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_MUTE, _______, _______, _______, RM_HUEU, RM_SATU, RM_SPDU, RM_NEXT, RM_VALU, RM_TOGG, KC_BRIU, KC_MPLY, KC_VOLU, KC_MSTP, _______, _______, RM_HUED, RM_SATD, RM_SPDD, RM_PREV, RM_VALD, _______, _______, _______, _______, _______, KC_BRID, KC_MPRV, KC_VOLD, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [7] = LAYOUT_split_3x6_5_hlc(_______, _______, _______, DF(0), _______, _______, _______, _______, _______, _______, _______, QK_REBOOT, _______, _______, _______, DF(1), BL_UP, BL_TOGG, _______, _______, _______, _______, _______, QK_BOOTLOADER, _______, _______, _______, DF(2), BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_CLEAR_EEPROM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_DOWN, KC_UP)}, + [1] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)}, + [2] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)}, + [3] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)}, + [4] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)}, + [5] = {ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_LEFT, KC_RGHT)}, + [6] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)}, + [7] = {ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)} +}; +#endif diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/rules.mk b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/rules.mk new file mode 100644 index 00000000..48e34911 --- /dev/null +++ b/keyboards/splitkb/halcyon/kyria/keymaps/hrm_cags/rules.mk @@ -0,0 +1,4 @@ +ENCODER_MAP_ENABLE = yes + +# This adds module functionality to your keyboard (files found in users/halcyon_modules) +USER_NAME := halcyon_modules diff --git a/qmk.json b/qmk.json index 7ae3b696..d6f09e80 100644 --- a/qmk.json +++ b/qmk.json @@ -3,33 +3,33 @@ "build_targets": [ [ "splitkb/halcyon/kyria/rev4", - "vial_hrm_cags", + "hrm_cags", { "HLC_TFT_DISPLAY": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_vial_hrm_cags_display" + "TARGET": "splitkb_halcyon_kyria_rev4_qmk_hrm_cags_display" } ], [ "splitkb/halcyon/kyria/rev4", - "vial_hrm_cags", + "hrm_cags", { "HLC_ENCODER": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_vial_hrm_cags_encoder" + "TARGET": "splitkb_halcyon_kyria_rev4_qmk_hrm_cags_encoder" } ], [ "splitkb/halcyon/kyria/rev4", - "vial_hrm_cags", + "hrm_cags", { "HLC_NONE": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_vial_hrm_cags" + "TARGET": "splitkb_halcyon_kyria_rev4_qmk_hrm_cags" } ], [ "keebart/sofle_choc_pro", - "vial_hrm_cags", + "hrm_cags", { - "TARGET": "keebart_sofle_choc_pro_vial_hrm_cags" + "TARGET": "keebart_sofle_choc_pro_qmk_hrm_cags" } ] ] diff --git a/qmk_default.json b/qmk_default.json deleted file mode 100644 index e86ae117..00000000 --- a/qmk_default.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "userspace_version": "1.1", - "build_targets": [ - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_TFT_DISPLAY": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_default_hlc_display" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_ENCODER": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_default_hlc_encoder" - } - ], - [ - "splitkb/halcyon/kyria/rev4", - "default_hlc", - { - "HLC_NONE": "1", - "TARGET": "splitkb_halcyon_kyria_rev4_default_hlc" - } - ] - ] -}