aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/crkbd
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-11-28 21:59:14 +0000
committerGitHub <noreply@github.com>2019-11-28 21:59:14 +0000
commit99f3321e2634547b57ec07f0d1d8b107670be824 (patch)
treefc13e4d297b29c9974b1f0fc004d9da19c03eb69 /keyboards/crkbd
parent235da6973d34c3cffc4bd8f8cd0b9c8537d6b811 (diff)
downloadfirmware-99f3321e2634547b57ec07f0d1d8b107670be824.tar.gz
firmware-99f3321e2634547b57ec07f0d1d8b107670be824.tar.bz2
firmware-99f3321e2634547b57ec07f0d1d8b107670be824.zip
Fix processing of RGB keycodes on slave half (#7404)
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/rev1/split_util.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/keyboards/crkbd/rev1/split_util.c b/keyboards/crkbd/rev1/split_util.c
index c0d44af29..35aa54d78 100644
--- a/keyboards/crkbd/rev1/split_util.c
+++ b/keyboards/crkbd/rev1/split_util.c
@@ -48,13 +48,13 @@ __attribute__((weak)) bool is_keyboard_left(void) {
#elif defined(EE_HANDS)
return eeconfig_read_handedness();
#elif defined(MASTER_RIGHT)
- return !is_keyboard_master();
+ return !has_usb();
#endif
- return is_keyboard_master();
+ return has_usb();
}
-__attribute__((weak)) bool is_keyboard_master(void) {
+__attribute__((weak)) bool has_usb(void) {
static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN;
// only check once, as this is called often
@@ -103,8 +103,3 @@ void split_keyboard_setup(void) {
}
sei();
}
-
-// backwards compat
-bool has_usb(void) {
- return is_keyboard_master();
-}