~ruther/qmk_firmware

1b29f98d99d6865b6082ac0aab737519bf3eb9e7 — QMK Bot 3 years ago 4b185a5 + 0703e53
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 3 insertions(+), 13 deletions(-)

M keyboards/cradio/config.h
M keyboards/macro3/config.h
M keyboards/cradio/config.h => keyboards/cradio/config.h +3 -7
@@ 62,11 62,6 @@
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* Serial settings */
#define USE_SERIAL
/* serial.c configuration for split keyboard */


@@ 76,8 71,9 @@
#define EE_HANDS

/* Top left key on left half */
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_ROW    0
#define BOOTMAGIC_LITE_COLUMN 0
/* Top right key on right half */
#define BOOTMAGIC_LITE_ROW_RIGHT 4
#define BOOTMAGIC_LITE_ROW_RIGHT    4
#define BOOTMAGIC_LITE_COLUMN_RIGHT 4


M keyboards/macro3/config.h => keyboards/macro3/config.h +0 -6
@@ 31,9 31,3 @@
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE