mkbd65/qmk-firmware
Watch
1
0
Fork
You've already forked qmk-firmware
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into xap

Browse source
This commit is contained in:
QMK Bot 2022-08-02 18:40:21 +00:00
commit 10d8f16a3b
88 changed files with 274 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

8
keyboards/obosob/arch_36/config.h
View file

@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x9CE3
#define DEVICE_VER 0x0001
#define MANUFACTURER obosob
#define PRODUCT Arch-36
/* key matrix size */
/* Rows are doubled up */
#define MATRIX_ROWS 8

6
keyboards/obosob/arch_36/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Arch-36",
"manufacturer": "obosob",
"url": "",
"maintainer": "obosob",
"usb": {
"vid": "0xFEED",
"pid": "0x9CE3",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [

7
keyboards/obosob/steal_this_keyboard/config.h
View file

@ -18,13 +18,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 0x50AD
#define DEVICE_VER 0x0001
#define MANUFACTURER Obosob
#define PRODUCT Steal This Keyboard!
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 5

8
keyboards/obosob/steal_this_keyboard/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "steal this keyboard",
"keyboard_name": "Steal This Keyboard!",
"manufacturer": "Obosob",
"url": "https://github.com/obosob/steal_this_keyboard",
"maintainer": "@obosob",
"usb": {
"vid": "0xC2AB",
"pid": "0x50AD",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [

6
keyboards/ocean/addon/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0012
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT AddOn
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 7

6
keyboards/ocean/addon/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "AddOn",
"manufacturer": "Ocean",
"url": "tokopedia.com/kbdksp",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0012",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

6
keyboards/ocean/gin_v2/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0005
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Gin V2
/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 8

6
keyboards/ocean/gin_v2/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Gin V2",
"manufacturer": "Ocean",
"url": "",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0005",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

6
keyboards/ocean/slamz/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0011
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Slamz
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 10

6
keyboards/ocean/slamz/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Slamz",
"manufacturer": "Ocean",
"url": "",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0011",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]

6
keyboards/ocean/stealth/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0010
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Stealth
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 3

6
keyboards/ocean/stealth/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Stealth",
"manufacturer": "Ocean",
"url": "",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0010",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}]

6
keyboards/ocean/sus/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0009
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Sus
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3

8
keyboards/ocean/sus/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "SUS",
"keyboard_name": "Sus",
"manufacturer": "Ocean",
"url": " ",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0009",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [

6
keyboards/ocean/wang_ergo/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0008
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Wang Ergo
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

6
keyboards/ocean/wang_ergo/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Wang Ergo",
"manufacturer": "Ocean",
"url": "",
"maintainer": "oceeean",
"usb": {
"vid": "0x9624",
"pid": "0x0008",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},

6
keyboards/ocean/wang_v2/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0004
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Wang V2
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 13

6
keyboards/ocean/wang_v2/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Wang V2",
"manufacturer": "Ocean",
"url": "",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0004",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]

6
keyboards/ocean/yuri/config.h
View file

@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0x9624
#define PRODUCT_ID 0x0003
#define DEVICE_VER 0x0001
#define MANUFACTURER Ocean
#define PRODUCT Yuri
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 14

6
keyboards/ocean/yuri/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Yuri",
"manufacturer": "Ocean",
"url": "tokopedia.com/strat0s",
"maintainer": "Ocean",
"usb": {
"vid": "0x9624",
"pid": "0x0003",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0},

Some files were not shown because too many files have changed in this diff Show more