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
-7
View File
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x8101
#define PRODUCT_ID 0x4660
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI F60
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
+7 -1
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "f60",
"keyboard_name": "BIOI F60",
"manufacturer": "Basic IO Instruments",
"url": "",
"maintainer": "kb-elmo",
"usb": {
"vid": "0x8101",
"pid": "0x4660",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
+2 -2
View File
@@ -21,5 +21,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
## Bootloader
* **Bootmagic reset**: Hold down the top left key (ESC) and plug in the keyboard
* **Physical reset button**: Short the two small pads labeled "RESET" the back of the PCB
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
* **Physical reset button**: Short the two small pads labeled "QK_BOOT" the back of the PCB
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
-8
View File
@@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x8101 // 8101 = "BIOI"
#define PRODUCT_ID 0x6080
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI G60
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
+6
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "BIOI G60",
"manufacturer": "Basic IO Instruments",
"url": "https://scottywei.github.io/bioi-g60ble/",
"maintainer": "scottywei",
"usb": {
"vid": "0x8101",
"pid": "0x6080",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
-8
View File
@@ -2,13 +2,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x6583
#define PRODUCT_ID 0x6080
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI G60 BLE
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
@@ -18,7 +11,6 @@
{ E6, B0, F1, F5, F4 }
#define MATRIX_COL_PINS \
{ F6, F7, B3, C7, C6, B6, B5, D5, B4, D7, D6, D4, D1, D0 }
#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
+6
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "BIOI G60 BLE",
"manufacturer": "Basic IO Instruments",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x6583",
"pid": "0x6080",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
-10
View File
@@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x8101 // 8101 = "BIOI"
#define PRODUCT_ID 0x6581
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI MORGAN65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
@@ -45,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { E6, C6, F4, B2, D4 }
#define MATRIX_COL_PINS { F5, F6, F7, C7, B0, B7, B5, D5, B4, D7, D6, D1, D0, B3 }
//#define QMK_KEYS_PER_SCAN 4
/* Backlight Setup */
#define BACKLIGHT_PIN B6
#define BACKLIGHT_LEVELS 12
+6
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "Morgan65",
"manufacturer": "Basic IO Instruments",
"url": "",
"maintainer": "scottywei",
"usb": {
"vid": "0x8101",
"pid": "0x6581",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [
-8
View File
@@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x8101 // 8101 = "BIOI"
#define PRODUCT_ID 0x5365 // "S"65
#define DEVICE_VER 0x0001
#define MANUFACTURER Basic IO Instruments
#define PRODUCT BIOI S65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
+6
View File
@@ -1,7 +1,13 @@
{
"keyboard_name": "BIOI S65",
"manufacturer": "Basic IO Instruments",
"url": "",
"maintainer": "scottywei",
"usb": {
"vid": "0x8101",
"pid": "0x5365",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_all": {
"layout": [