diff --git a/.github/workflows/build-firmware.yml b/.github/workflows/build-firmware.yml index 82cec19..0546965 100644 --- a/.github/workflows/build-firmware.yml +++ b/.github/workflows/build-firmware.yml @@ -28,7 +28,7 @@ jobs: # path: keyboards/splitkb/kyria/keymaps/andrewjrae - name: Build firmware - run: make fingerpunch/vulpes_majora/v1:${{ github.actor }} RGBLIGHT_ENABLE=yes FP_VM_RGB_6COL_WITH_CENTER=yes FP_TRACKBALL_ENABLE=yes ENCODER_ENABLE=yes HAPTIC_ENABLE=yes AUDIO_ENABLE=yes COMBO_ENABLE=yes KEY_OVERRIDE_ENABLE=yes + run: make fingerpunch/vulpes_majora/v1:${{ github.actor }} - name: Archive firmware uses: actions/upload-artifact@v3 diff --git a/config.h b/config.h new file mode 100644 index 0000000..f5b011b --- /dev/null +++ b/config.h @@ -0,0 +1,12 @@ +#pragma once + +#define COMBO_VARIABLE_LEN +#undef COMBO_TERM +#define COMBO_TERM 30 + +#define IGNORE_MOD_TAP_INTERRUPT +#define PERMISSIVE_HOLD +#define HOLD_ON_OTHER_KEY_PRESS +#define TAPPPING_TERM 150 +#define FP_SUPER_TAB_TIMEOUT 500 +#define ONESHOT_TIMEOUT 1000 \ No newline at end of file diff --git a/keymap.c b/keymap.c index 8a694d4..4684ff3 100644 --- a/keymap.c +++ b/keymap.c @@ -1,5 +1,9 @@ #include QMK_KEYBOARD_H +#include "config.h" +#include "g/keymap_combo.h" +#include "casemodes.h" + // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, @@ -8,7 +12,7 @@ enum layer_names { _NAVI, _SYST, _MOUS, - _COMB + _COMB }; #define C_SELA C(KC_A) @@ -82,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { C_TABI, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, C_TABD, OSM_CTL, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, C_CENT, OSL_NUM, OSM_SFT, KC_BSPC, KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_ENTER, KC_SPC, OSL_NAV, - KC_VOLU, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, KCf_VOLD, KC_MUTE, KC_VOLU, KC_VOLU, + KC_VOLU, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLD ), @@ -92,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { C_TABI, _______, KC_A, KC_S, KC_D, KC_F, KC_M, KC_N, KC_E, KC_I, KC_O, C_TABD, OSM_CTL, _______, KC_Z, KC_X, KC_C, KC_D, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, C_CENT, OSL_NUM, OSM_SFT, KC_BSPC, KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_ENTER, KC_SPC, OSL_NAV, - KC_VOLU, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, KCf_VOLD, KC_MUTE, KC_VOLU, KC_VOLU, + KC_VOLU, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLD ), diff --git a/rules.mk b/rules.mk new file mode 100644 index 0000000..f6d96f0 --- /dev/null +++ b/rules.mk @@ -0,0 +1,11 @@ +RGBLIGHT_ENABLE=yes +FP_VM_RGB_6COL_WITH_CENTER=yes +FP_TRACKBALL_ENABLE=yes +ENCODER_ENABLE=yes +HAPTIC_ENABLE=yes +AUDIO_ENABLE=yes + +COMBO_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes + +VPATH += keyboards/gboards \ No newline at end of file