ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'jackhumbert/master' into patch-1

Browse source
This commit is contained in:
Josh Colbeck 2016-07-04 22:44:26 -05:00
commit 74d848c942
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
keyboards/planck/keymaps/default/keymap.c
View file

@ -197,8 +197,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_QWERTY);
}
break;
return false;
break;
case COLEMAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -206,8 +206,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_COLEMAK);
}
break;
return false;
break;
case DVORAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -215,8 +215,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_DVORAK);
}
break;
return false;
break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
@ -225,8 +225,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
break;
return false;
break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
@ -235,8 +235,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
break;
return false;
break;
case BACKLIT:
if (record->event.pressed) {
register_code(KC_RSFT);
@ -246,8 +246,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} else {
unregister_code(KC_RSFT);
}
break;
return false;
break;
case PLOVER:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -265,8 +265,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
keymap_config.nkro = 1;
eeconfig_update_keymap(keymap_config.raw);
}
break;
return false;
break;
case EXT_PLV:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -274,8 +274,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
layer_off(_PLOVER);
}
break;
return false;
break;
}
return true;
}

12
keyboards/preonic/keymaps/default/keymap.c
View file

@ -191,8 +191,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_QWERTY);
}
break;
return false;
break;
case COLEMAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -200,8 +200,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_COLEMAK);
}
break;
return false;
break;
case DVORAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
@ -209,8 +209,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
persistant_default_layer_set(1UL<<_DVORAK);
}
break;
return false;
break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
@ -219,8 +219,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
break;
return false;
break;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
@ -229,8 +229,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_off(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
break;
return false;
break;
case BACKLIT:
if (record->event.pressed) {
register_code(KC_RSFT);
@ -240,8 +240,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} else {
unregister_code(KC_RSFT);
}
break;
return false;
break;
}
return true;
};