summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCallum Oakley <c.oakley108@gmail.com>2016-09-02 09:03:39 +0100
committerCallum Oakley <c.oakley108@gmail.com>2016-09-02 09:03:39 +0100
commite4167c8c53b0cf7c68192bbe4db368785f24b970 (patch)
tree94ea81c9e852bd2fb3003813032b9ca71b8d6fc7
parent4c67ccc81ee8006190438c5f54cda871bcb2afa6 (diff)
fixed incorrect key combination for locking screen on macOS
-rw-r--r--keyboards/planck/keymaps/callum/keymap.c4
-rw-r--r--keyboards/planck/keymaps/callum/readme.md6
2 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c
index 572756a383..6c34311339 100644
--- a/keyboards/planck/keymaps/callum/keymap.c
+++ b/keyboards/planck/keymaps/callum/keymap.c
@@ -137,11 +137,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case LOCK:
if (record->event.pressed) {
register_code(KC_RSFT);
- register_code(KC_RGUI);
+ register_code(KC_RCTL);
register_code(KC_POWER);
} else {
unregister_code(KC_POWER);
- unregister_code(KC_RGUI);
+ unregister_code(KC_RCTL);
unregister_code(KC_RSFT);
}
return false;
diff --git a/keyboards/planck/keymaps/callum/readme.md b/keyboards/planck/keymaps/callum/readme.md
index 2d38e6355a..b70de3f1e2 100644
--- a/keyboards/planck/keymaps/callum/readme.md
+++ b/keyboards/planck/keymaps/callum/readme.md
@@ -14,7 +14,7 @@ We have four layers. A `BASE` layer, in colemak; a `MOVE` layer, with an arrow c
This is the default layer; in [colemak](https://colemak.com). `esc` and `del` are conspicuously absent but are especially easy to reach from either of the other main layers (see below). The `backspace` location is standard colemak. The `caps` key is still on the `BASE` layer but only because I don’t really use the bottom corners so there’s nothing else I would rather put there. Having `enter` on a thumb means I can still have `quote` immediately to the right of `O`, something that would have annoyed me endlessly otherwise. `minus` is in the upper right because I had an extra space and it’s probably my next most used key that didn’t yet have a home.
-The `MOVE` and `SYMB` layers are reached by holding down the `move` and `symb` keys respectively. The `FUNC` layer is reached by holding down both the `move` and `symb` keys simultaneously, *or* by holding down the `fn` key. The intended use is that whenever both hands are on the keyboard, the former method is used, and the latter is only used when, for example, reaching over to the keyboard with one hand to access the media controls.
+The `MOVE` and `SYMB` layers are reached by holding down the `move` and `symb` keys respectively. The `FUNC` layer is reached by holding down both the `move` and `symb` keys simultaneously, *or* by holding down the `fn` key. The intended use is that whenever both hands are on the keyboard, the former method is used, and the latter is only used when, for example, reaching over to the keyboard with one hand to access the media controls.
## The `MOVE` layer
![](http://i.imgur.com/KXRSuHT.png)
@@ -37,7 +37,7 @@ Again none of the modifiers are overwritten so that shortcuts involving numbers
## The `FUNC` layer
![](http://i.imgur.com/1VKFBBU.png)
-The only things of note here are that `bl+` and `bl-` are short for *backlight up* and *backlight down*, and in firmware are actually `KC_PAUS` and `KC_SLCK` respectively, since *macOS* interprets these as the backlight keys. And that `lock` is currently a macro hard coded to turn off the screen on *macOS*. (By activating the shortcut `shift-cmd-power`.)
+The only things of note here are that `bl+` and `bl-` are short for *backlight up* and *backlight down*, and in firmware are actually `KC_PAUS` and `KC_SLCK` respectively, since *macOS* interprets these as the backlight keys. And that `lock` is currently a macro hard coded to turn off the screen on *macOS*. (By activating the shortcut `shift-ctrl-power`.)
## Other changes from the default
-I have LEDs and sound disabled, simply because I have no need of them. \ No newline at end of file
+I have LEDs and sound disabled, simply because I have no need of them.