diff options
author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 19:16:33 +0100 |
---|---|---|
committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 19:16:33 +0100 |
commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx | |
parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
download | qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz qmk_firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.xz |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx')
-rw-r--r-- | keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c | 4 | ||||
-rw-r--r-- | keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c index 173fc4ecd..9971b834c 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c @@ -108,11 +108,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) }; // Runs just one time when the keyboard initializes. -void * matrix_init_user(void) { +void matrix_init_user(void) { }; // Runs constantly in the background, in a loop. -void * matrix_scan_user(void) { +void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); ergodox_board_led_off(); ergodox_right_led_1_off(); diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md index 6f182d0d8..9eb4c24db 100644 --- a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md @@ -28,7 +28,11 @@ There are four layers: - Tap `F2` to copy screenshot to the clipboard. - Hold `SHIFT` and tap `F2` to save screenshot as a file. - Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/). -- Tap `F14`, `F15` to adjust display brightness. +- Tap `F14`, `F15` to adjust display brightness. + +**IMPORTANT**: If you have another keyboard connected via Bluetooth, then `F14` and `F15` will not work. +Turn off that Bluetooth keyboard. Re-plug you ErgoDox. Enjoy! + ## CTRL/ESC |