drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'upstream/master' into develop

Browse source
This commit is contained in:
fauxpark 2022-08-15 17:54:07 +10:00
commit c202602938
170 changed files with 508 additions and 750 deletions
Download patch file Download diff file Expand all files Collapse all files

7
keyboards/ferris/0_1/config.h
View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC2AB
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
#define MANUFACTURER Pierre
#define PRODUCT Ferris the keeb
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10

9
keyboards/ferris/0_1/info.json Normal file
View file

@ -0,0 +1,9 @@
{
"keyboard_name": "Ferris the keeb",
"manufacturer": "Pierre",
"usb": {
"vid": "0xC2AB",
"pid": "0x0000",
"device_version": "0.0.1"
}
}

6
keyboards/ferris/0_2/base/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Ferris 0.2",
"usb": {
"pid": "0x0001"
}
}

0
keyboards/ferris/0_2/base/rules.mk Normal file
View file

7
keyboards/ferris/0_2/bling/config.h
View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x0002
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Bling
/* LED Drivers */
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_ADDR_2 0b1110101

6
keyboards/ferris/0_2/bling/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Ferris 0.2 - Bling",
"usb": {
"pid": "0x0002"
}
}

23
keyboards/ferris/0_2/compact/config.h
View file

@ -1,23 +0,0 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x0003
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Compact

6
keyboards/ferris/0_2/compact/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Ferris 0.2 - Compact",
"usb": {
"pid": "0x0003"
}
}

7
keyboards/ferris/0_2/config.h
View file

@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC2AB
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0002
#define MANUFACTURER Cuddly Keyboards Ltd.
#define PRODUCT Ferris 0.2
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 10

23
keyboards/ferris/0_2/high/config.h
View file

@ -1,23 +0,0 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x0005
#undef PRODUCT
#define PRODUCT Ferris 0.2 - High

6
keyboards/ferris/0_2/high/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Ferris 0.2 - High",
"usb": {
"pid": "0x0005"
}
}

7
keyboards/ferris/0_2/info.json Normal file
View file

@ -0,0 +1,7 @@
{
"manufacturer": "Cuddly Keyboards Ltd.",
"usb": {
"vid": "0xC2AB",
"device_version": "0.0.2"
}
}

23
keyboards/ferris/0_2/mini/config.h
View file

@ -1,23 +0,0 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#undef PRODUCT_ID
#define PRODUCT_ID 0x0004
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Mini

6
keyboards/ferris/0_2/mini/info.json Normal file
View file

@ -0,0 +1,6 @@
{
"keyboard_name": "Ferris 0.2 - Mini",
"usb": {
"pid": "0x0004"
}
}

2
keyboards/ferris/0_2/rules.mk
View file

@ -25,3 +25,5 @@ SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
LAYOUTS = split_3x5_2
DEFAULT_FOLDER = ferris/0_2/base

1
keyboards/ferris/info.json
View file

@ -1,5 +1,4 @@
{
"keyboard_name": "Ferris",
"url": "https://github.com/pierrechevalier83/ferris/",
"maintainer": "@pierrec83",
"layouts": {

7
keyboards/ferris/sweep/config.h
View file

@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xC2AB
#define PRODUCT_ID 0x3939
#define DEVICE_VER 0x0001
#define MANUFACTURER DPB
#define PRODUCT Ferris sweep
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

9
keyboards/ferris/sweep/info.json Normal file
View file

@ -0,0 +1,9 @@
{
"keyboard_name": "Ferris sweep",
"manufacturer": "DPB",
"usb": {
"vid": "0xC2AB",
"pid": "0x3939",
"device_version": "0.0.1"
}
}