From b729569b5605da78dbcb2a58a74189a7b4145551 Mon Sep 17 00:00:00 2001 From: Oleksii Vilchanskyi Date: Fri, 10 Feb 2017 18:07:13 +0100 Subject: [PATCH 1/8] clarify project status --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 05aaddaecc..8c7ea0dea6 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,10 @@ See also: * [Manual for the driver daemon](https://github.com/mattanger/ckb-next/blob/master/DAEMON.md) * [ckb testing repository](https://github.com/mattanger/ckb-next/tree/testing) (updated more frequently, but may be unstable) +Current Status +-------------- +Right now ckb-next is under active development. *We will cut a release and ship a macOS binary as soon as some important changes are done*. You can always build the software from source with just one command. See [Linux Installation](#linux-installation) and [OS X/macOS Installation](#os-xmacos-installation). Thank you for the interest in this software and your patience. + Device Support -------------- From cd57ffedaeeec02b30348e74384b1104b3748be7 Mon Sep 17 00:00:00 2001 From: Karl Fleischmann Date: Thu, 16 Feb 2017 10:13:59 +0100 Subject: [PATCH 2/8] Add `CMD/Shift+select` issue to Known Issues This was a recommendation of @clodal in #29. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8c7ea0dea6..f67d0ba145 100644 --- a/README.md +++ b/README.md @@ -250,6 +250,7 @@ Known issues - The tray icon doesn't appear in some desktop environments. This is a known Qt bug. If you can't see the icon, reopen ckb to bring the window back. - When starting the driver manually, the Terminal window sometimes gets spammed with enter keys. You can stop it by unplugging and replugging the keyboard or by moving the poll rate switch. - When stopping the driver manually, the keyboard sometimes stops working completely. You can reconnect it by moving the poll rate switch. +- On newer versions of Mac OS (i.e. 10.12 and up) CMD/Shift+select does not work, yet. Stopping the `ckb-next` daemon will bypass this issue temporarily. Contributing ------------ From d62b7ff9a8c095edada214154226ef1baea1fb65 Mon Sep 17 00:00:00 2001 From: Karl Fleischmann Date: Thu, 16 Feb 2017 11:47:53 +0100 Subject: [PATCH 3/8] Amend changes Incorporate suggestions from @light2yellow from the PR. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f67d0ba145..abb60a2766 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ Known issues - The tray icon doesn't appear in some desktop environments. This is a known Qt bug. If you can't see the icon, reopen ckb to bring the window back. - When starting the driver manually, the Terminal window sometimes gets spammed with enter keys. You can stop it by unplugging and replugging the keyboard or by moving the poll rate switch. - When stopping the driver manually, the keyboard sometimes stops working completely. You can reconnect it by moving the poll rate switch. -- On newer versions of Mac OS (i.e. 10.12 and up) CMD/Shift+select does not work, yet. Stopping the `ckb-next` daemon will bypass this issue temporarily. +- On newer versions of macOS (i.e. 10.12 and up) CMD/Shift+select does not work, yet. Stopping the daemon and GUI for `ckb-next` will fix this issue temporarily. Contributing ------------ From 15615d59fd7dd551edcaf279b5d8a3723edcb854 Mon Sep 17 00:00:00 2001 From: makz27 Date: Sat, 18 Feb 2017 22:36:54 +0100 Subject: [PATCH 4/8] Add ckb-next-git AUR package --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8c7ea0dea6..165e4bfaee 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ Linux Installation * Fedora 24/25, CentOS/RHEL 7 (maintained by [@hevanaa](https://github.com/hevanaa)): * [`johanh/ckb`](https://copr.fedorainfracloud.org/coprs/johanh/ckb/) - based on `master` branch +* Arch Linux (maintained by [@makz27](https://github.com/light2yellow)): + * [`aur/ckb-next-git`](https://aur.archlinux.org/packages/ckb-next-git/) - based on `master` branch (more stable) **ckb** packages (deprecated): From e5312ad324cbeacac27d22c1137ed7ea45286241 Mon Sep 17 00:00:00 2001 From: makz27 Date: Sat, 18 Feb 2017 22:44:05 +0100 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 165e4bfaee..673054ce72 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Linux Installation * Fedora 24/25, CentOS/RHEL 7 (maintained by [@hevanaa](https://github.com/hevanaa)): * [`johanh/ckb`](https://copr.fedorainfracloud.org/coprs/johanh/ckb/) - based on `master` branch -* Arch Linux (maintained by [@makz27](https://github.com/light2yellow)): +* Arch Linux (maintained by [@makz27](https://github.com/makz27)): * [`aur/ckb-next-git`](https://aur.archlinux.org/packages/ckb-next-git/) - based on `master` branch (more stable) **ckb** packages (deprecated): From d509ff8af7ed581f7d2b93ec5662e23247d40c63 Mon Sep 17 00:00:00 2001 From: Oleksii Vilchanskyi Date: Sat, 18 Feb 2017 23:42:38 +0100 Subject: [PATCH 6/8] binaries are still called ckb --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abb60a2766..ad1fedf1b5 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ Known issues - The tray icon doesn't appear in some desktop environments. This is a known Qt bug. If you can't see the icon, reopen ckb to bring the window back. - When starting the driver manually, the Terminal window sometimes gets spammed with enter keys. You can stop it by unplugging and replugging the keyboard or by moving the poll rate switch. - When stopping the driver manually, the keyboard sometimes stops working completely. You can reconnect it by moving the poll rate switch. -- On newer versions of macOS (i.e. 10.12 and up) CMD/Shift+select does not work, yet. Stopping the daemon and GUI for `ckb-next` will fix this issue temporarily. +- On newer versions of macOS (i.e. 10.12 and up) CMD/Shift+select does not work, yet. Stopping the daemon and GUI for `ckb` will fix this issue temporarily. Contributing ------------ From b59d179dc6cab50bd65c10bb484c5fbd8357a592 Mon Sep 17 00:00:00 2001 From: Oleksii Vilchanskyi Date: Sun, 19 Feb 2017 01:14:20 +0100 Subject: [PATCH 7/8] update pre-made packages info --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1f93af096e..84fe287950 100644 --- a/README.md +++ b/README.md @@ -65,14 +65,12 @@ Linux Installation * Fedora 24/25, CentOS/RHEL 7 (maintained by [@hevanaa](https://github.com/hevanaa)): * [`johanh/ckb`](https://copr.fedorainfracloud.org/coprs/johanh/ckb/) - based on `master` branch -* Arch Linux (maintained by [@makz27](https://github.com/makz27)): - * [`aur/ckb-next-git`](https://aur.archlinux.org/packages/ckb-next-git/) - based on `master` branch (more stable) +* Arch Linux (maintained by [@makz27](https://github.com/makz27), [@light2yellow](https://github.com/light2yellow)): + * [`aur/ckb-next-git`](https://aur.archlinux.org/packages/ckb-next-git) - based on `master` branch (more stable) + * [`aur/ckb-next-latest-git`](https://aur.archlinux.org/packages/ckb-next-latest-git) - based on `testing` branch (less stable but fresher) **ckb** packages (deprecated): -* Arch Linux (maintained by [@light2yellow](https://github.com/light2yellow)): - * [`aur/ckb-git`](https://aur.archlinux.org/packages/ckb-git/) - based on `master` branch (more stable) - * [`aur/ckb-git-latest`](https://aur.archlinux.org/packages/ckb-git-latest/) - based on `testing` branch (less stable but fresher) * Gentoo (maintained by [@mrueg](https://github.com/mrueg)): `emerge -av app-misc/ckb` If you are a package maintainer or want to discuss something with package maintainers let us know in the issues, so we can have an accountable and centralized communication about this. *If you would like to maintain a package for your favorite distro/OS, please let us know as well.* From 335896883571a7667a0874f8e25b2eab6d990ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Heikkil=C3=A4?= Date: Sun, 26 Feb 2017 11:17:55 +0200 Subject: [PATCH 8/8] Add support for K70 Rapidfire (non-RGB) 0x1b3a --- src/ckb-daemon/usb.c | 2 +- src/ckb-daemon/usb.h | 4 +++- src/ckb-daemon/usb_linux.c | 1 + src/ckb-daemon/usb_mac.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ckb-daemon/usb.c b/src/ckb-daemon/usb.c index 73c62886b7..065dd14d47 100644 --- a/src/ckb-daemon/usb.c +++ b/src/ckb-daemon/usb.c @@ -26,7 +26,7 @@ const char* vendor_str(short vendor){ const char* product_str(short product){ if(product == P_K95 || product == P_K95_NRGB) return "k95"; - if(product == P_K70 || product == P_K70_NRGB || product == P_K70_LUX || product == P_K70_LUX_NRGB || product == P_K70_RFIRE) + if(product == P_K70 || product == P_K70_NRGB || product == P_K70_LUX || product == P_K70_LUX_NRGB || product == P_K70_RFIRE || product == P_K70_RFIRE_NRGB) return "k70"; if(product == P_K65 || product == P_K65_LUX || product == P_K65_RFIRE) return "k65"; diff --git a/src/ckb-daemon/usb.h b/src/ckb-daemon/usb.h index 288a3c1c53..b35b6456c3 100644 --- a/src/ckb-daemon/usb.h +++ b/src/ckb-daemon/usb.h @@ -26,7 +26,9 @@ #define P_K70_LUX_NRGB_STR "1b36" #define P_K70_RFIRE 0x1b38 #define P_K70_RFIRE_STR "1b38" -#define IS_K70(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_K70 || (kb)->product == P_K70_NRGB || (kb)->product == P_K70_RFIRE || (kb)->product == P_K70_LUX || (kb)->product == P_K70_LUX_NRGB)) +#define P_K70_RFIRE_NRGB 0x1b3a +#define P_K70_RFIRE_NRGB_STR "1b3a" +#define IS_K70(kb) ((kb)->vendor == V_CORSAIR && ((kb)->product == P_K70 || (kb)->product == P_K70_NRGB || (kb)->product == P_K70_RFIRE || (kb)->product == P_K70_RFIRE_NRGB || (kb)->product == P_K70_LUX || (kb)->product == P_K70_LUX_NRGB)) #define P_K95 0x1b11 #define P_K95_STR "1b11" diff --git a/src/ckb-daemon/usb_linux.c b/src/ckb-daemon/usb_linux.c index 30c8341a86..ec25365269 100644 --- a/src/ckb-daemon/usb_linux.c +++ b/src/ckb-daemon/usb_linux.c @@ -360,6 +360,7 @@ static _model models[] = { { P_K70_LUX_STR, P_K70_LUX }, { P_K70_LUX_NRGB_STR, P_K70_LUX_NRGB }, { P_K70_RFIRE_STR, P_K70_RFIRE }, + { P_K70_RFIRE_NRGB_STR, P_K70_RFIRE_NRGB }, { P_K95_STR, P_K95 }, { P_K95_NRGB_STR, P_K95_NRGB }, { P_STRAFE_STR, P_STRAFE }, diff --git a/src/ckb-daemon/usb_mac.c b/src/ckb-daemon/usb_mac.c index 4144cb483f..59016b44e0 100644 --- a/src/ckb-daemon/usb_mac.c +++ b/src/ckb-daemon/usb_mac.c @@ -770,7 +770,7 @@ int usbmain(){ int vendor = V_CORSAIR; int products[] = { // Keyboards - P_K65, P_K65_LUX, P_K65_RFIRE, P_K70, P_K70_NRGB, P_K70_LUX, P_K70_LUX_NRGB, P_K70_RFIRE, P_K95, P_K95_NRGB, P_STRAFE, P_STRAFE_NRGB, + P_K65, P_K65_LUX, P_K65_RFIRE, P_K70, P_K70_NRGB, P_K70_LUX, P_K70_LUX_NRGB, P_K70_RFIRE, P_K70_RFIRE_NRGB, P_K95, P_K95_NRGB, P_STRAFE, P_STRAFE_NRGB, // Mice P_M65, P_M65_PRO, P_SABRE_O, P_SABRE_L, P_SABRE_N, P_SCIMITAR, P_SABRE_O2 };