drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-08-13 19:29:21 +00:00
commit fcddaadc56
10 changed files with 326 additions and 566 deletions
Download patch file Download diff file Expand all files Collapse all files

19
users/jdelkins/jdelkins.c
View file

@ -193,7 +193,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case KB_MAKE:
if (!get_mods()) {
if (!record->event.pressed)
#ifdef NO_SECRETS
SEND_STRING("make NO_SECRETS=1 " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
#else
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
#endif
return false;
}
break;
@ -201,10 +205,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case KB_VRSN:
if (!get_mods()) {
if (!record->event.pressed) {
#ifdef DO_SECRETS
# define SECRET_MSG " (with secrets)"
#else
# define SECRET_MSG
#endif
if (user_config.system_mac) {
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (mac mode)");
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (mac mode)" SECRET_MSG);
} else {
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (non-mac mode)");
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (non-mac mode)" SECRET_MSG);
}
}
return false;
@ -227,7 +236,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case KB_FLSH:
if (!get_mods()) {
if (!record->event.pressed) {
#ifdef NO_SECRETS
SEND_STRING("make NO_SECRETS=1 " QMK_KEYBOARD ":" QMK_KEYMAP ":flash\n");
#else
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":flash\n");
#endif
reset_keyboard();
}
return false;
@ -235,7 +248,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;
#ifdef DO_SECRETS
case KC_SECRET_1 ... KC_SECRET_5: // Secrets! Externally defined strings, not stored in repo
case KC_SECRET_1 ... KC_SECRET_6: // Secrets! Externally defined strings, not stored in repo
if (!record->event.pressed) {
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
send_secret_string(keycode - KC_SECRET_1);

9
users/jdelkins/rules.mk
View file

@ -1,10 +1,15 @@
SRC += jdelkins.c
ifeq ($(strip $(NO_SECRETS)), yes)
OPT_DEFS += -DNO_SECRETS
ifneq ($(strip $(NO_SECRETS)),)
OPT_DEFS += -DNO_SECRETS
endif
ifeq ($(shell test -f users/jdelkins/secrets.h.gpg && echo yes || echo no),yes)
users/jdelkins/jdelkins.c: users/jdelkins/secrets.h
touch $@
users/jdelkins/secrets.h: users/jdelkins/secrets.h.gpg
gpg -d $< >$@
endif
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite