diff options
author | Olivier <olivier@gid0.org> | 2016-04-30 16:03:52 +0200 |
---|---|---|
committer | Olivier <olivier@gid0.org> | 2016-04-30 16:03:52 +0200 |
commit | 09ea12f9ca96fa89a500a5965bf074c4347d300d (patch) | |
tree | 747caedcbd529d068d6794a72e65a5bef274ed8e /keyboard/atomic/keymaps/pvc/config.h | |
parent | 9d48ba9713d17a8ebae99ef42bc7838402fc532f (diff) | |
parent | e7d56215deb253b44b190d12288076d03b206bdf (diff) | |
download | qmk_firmware-09ea12f9ca96fa89a500a5965bf074c4347d300d.tar.gz qmk_firmware-09ea12f9ca96fa89a500a5965bf074c4347d300d.tar.xz |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/atomic/keymaps/pvc/config.h')
-rw-r--r-- | keyboard/atomic/keymaps/pvc/config.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h index 8449fa06d..cc9263464 100644 --- a/keyboard/atomic/keymaps/pvc/config.h +++ b/keyboard/atomic/keymaps/pvc/config.h @@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * -*/ +*/ #define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } #define ROWS (int []){ D0, D5, B5, B6, B3 } @@ -62,17 +62,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* +// Enable Keyboard Locking via magic key +#define KEYBOARD_LOCK_ENABLE + + +/* * Force NKRO * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the * makefile for this to work.) * * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) * until the next keyboard reset. * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is * fully operational during normal computer usage. * * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) @@ -90,7 +94,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * the keyboard. They are best used in combination with the HID Listen program, * found here: https://www.pjrc.com/teensy/hid_listen.html * - * The options below allow the magic key functionality to be changed. This is + * The options below allow the magic key functionality to be changed. This is * useful if your keyboard/keypad is missing keys and you want magic key support. * */ |