Merge remote-tracking branch 'qmk/master' into merge-2022-09-10

This commit is contained in:
Ilya Zhuravlev
2022-09-10 04:10:44 -06:00
9866 changed files with 143396 additions and 44465 deletions

View File

@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4342 // CB
#define PRODUCT_ID 0x1818
#define DEVICE_VER 0x0001
#define MANUFACTURER CherryB.Studio
#define PRODUCT CB1800
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 11
@@ -39,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4 }
//#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "cb1800",
"keyboard_name": "CB1800",
"manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
"usb": {
"vid": "0x4342",
"pid": "0x1818",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4342 // CB
#define PRODUCT_ID 0x8787
#define DEVICE_VER 0x0001
#define MANUFACTURER CherryB Studio
#define PRODUCT CB87
/* key matrix size */
#define MATRIX_ROWS 9
#define MATRIX_COLS 10
@@ -39,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3 }
#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
//#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "CB87",
"manufacturer": "CherryB Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
"usb": {
"vid": "0x4342",
"pid": "0x8787",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4342 // CB
#define PRODUCT_ID 0x8785
#define DEVICE_VER 0x0001
#define MANUFACTURER CherryB.Studio
#define PRODUCT CB87RGB
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
@@ -39,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
//#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "cb87v2",
"keyboard_name": "CB87RGB",
"manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
"usb": {
"vid": "0x4342",
"pid": "0x8785",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@@ -15,13 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4342 // CB
#define PRODUCT_ID 0x8788
#define DEVICE_VER 0x0001
#define MANUFACTURER CherryB.Studio
#define PRODUCT CB87v2
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 10
@@ -39,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
//#define UNUSED_PINS
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "cb87v2",
"keyboard_name": "CB87v2",
"manufacturer": "CherryB.Studio",
"url": "https://discord.gg/qVwv3gcq83",
"maintainer": "duongaanh",
"usb": {
"vid": "0x4342",
"pid": "0x8788",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [