summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Colbeck <skrymir@gmail.com>2016-07-04 22:44:26 -0500
committerJosh Colbeck <skrymir@gmail.com>2016-07-04 22:44:26 -0500
commit74d848c942984334f82d84acfecc3cce9716cd82 (patch)
tree902c8fc54be6a272a86cec2e0e3b0195a4e227a1
parenta5fb2b58a5fc328da7eea42cb73c668f3b5d0f7e (diff)
parent94d3159d9dbdf711b830c6d7c5a53324097be0a5 (diff)
Merge remote-tracking branch 'jackhumbert/master' into patch-1
-rw-r--r--keyboards/planck/keymaps/default/keymap.c16
-rw-r--r--keyboards/preonic/keymaps/default/keymap.c12
2 files changed, 14 insertions, 14 deletions
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 9b4b33f821..5f71ae7d19 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -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;
}
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index 6d8ef634dd..9a957f7ee1 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -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;
};