Updates for Zeal60

pull/2764/head
Joe Wasson 6 years ago
parent 509a0a34a8
commit 86a21ca40a

@ -4,4 +4,6 @@
#define PREVENT_STUCK_MODIFIERS #define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT #define IGNORE_MOD_TAP_INTERRUPT
#define RESET_LAYER 15
#endif // !USERSPACE_CONFIG_H #endif // !USERSPACE_CONFIG_H

@ -3,3 +3,5 @@ SRC += talljoe.c
ifneq ("$(wildcard users/$(KEYMAP)/config.h)","") ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
CONFIG_H += users/$(KEYMAP)/config.h CONFIG_H += users/$(KEYMAP)/config.h
endif endif
EXTRAFLAGS+=-flto

@ -56,9 +56,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, KC_BSPC, KC_0, KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ), KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, KC_BSPC, KC_0, KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
// Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards) // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
[_ADJUST] = LAYOUT( [_ADJUST] = LAYOUT(
MO_RST , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MO_RST , FX(1) , FX(2) , FX(3) , FX(4) , FX(5) , FX(6) , FX(7) , FX(8) , FX(9) , FX(10) , BR_DEC , BR_INC , XXXXXXX, MO_RST ,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL , XXXXXXX, H1_INC , S1_INC , H2_INC , S2_INC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DFAULTS, EF_DEC , EF_INC , KC_DEL ,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJ , XXXXXXX, H1_DEC , S1_DEC , H2_DEC , S2_DEC , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TG_ADJ ,
TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, TG_GAME, KC_RSFT, XXXXXXX, TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, XXXXXXX, XXXXXXX, KC_MAKE, TG_GAME, KC_RSFT, XXXXXXX,
MO_RST , AG_NORM, AG_SWAP, XXXXXXX, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS), MO_RST , AG_NORM, AG_SWAP, XXXXXXX, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS),
// To Reset hit FN + ` + Esc // To Reset hit FN + ` + Esc

@ -3,6 +3,14 @@
#include "quantum.h" #include "quantum.h"
enum userspace_custom_keycodes {
KC_MAKE = SAFE_RANGE, // can always be here
DFAULTS,
TOGGLE_BACKLIGHT,
EFFECT,
EFFECT_END = EFFECT + 10
};
enum layers { enum layers {
_BASE = 0, _BASE = 0,
_WORKMAN, _WORKMAN,
@ -13,7 +21,7 @@ enum layers {
_NAV, _NAV,
_NUM, _NUM,
_ADJUST, _ADJUST,
_RESET, _RESET = RESET_LAYER,
}; };
#define _______ KC_TRNS #define _______ KC_TRNS
@ -38,6 +46,7 @@ enum layers {
#define TG_NKRO MAGIC_TOGGLE_NKRO #define TG_NKRO MAGIC_TOGGLE_NKRO
#define KC_PTT KC_F24 #define KC_PTT KC_F24
#define MS_MID KC_MS_BTN3 #define MS_MID KC_MS_BTN3
#define FX(x) (EFFECT + x)
#define US_CAPS CTL_T(KC_ESC) #define US_CAPS CTL_T(KC_ESC)
#define US_QUOT MT(MOD_RCTL, KC_QUOT) #define US_QUOT MT(MOD_RCTL, KC_QUOT)
@ -64,8 +73,23 @@ enum layers {
#error "Unsupported space count:" SPACE_COUNT #error "Unsupported space count:" SPACE_COUNT
#endif #endif
enum userspace_custom_keycodes { #ifndef ZEAL_RGB
KC_MAKE = SAFE_RANGE, // can always be here #define BR_INC KC_NO
}; #define BR_DEC KC_NO
#define EF_INC KC_NO
#define EF_DEC KC_NO
#define ES_INC KC_NO
#define ES_DEC KC_NO
#define H1_INC KC_NO
#define H1_DEC KC_NO
#define S1_INC KC_NO
#define S1_DEC KC_NO
#define H2_INC KC_NO
#define H2_DEC KC_NO
#define S2_INC KC_NO
#define S2_DEC KC_NO
#define FN_MO13 KC_NO
#define FN_MO2 KC_NO
#endif
#endif #endif

Loading…
Cancel
Save