sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fauxpark
2022-08-20 10:55:40 +10:00
parent eceed6c50b 201f1a8f47
commit 61689ae609
550 changed files with 1689 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/mlego/m48/config.h
View File

@@ -17,11 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBABA
#define MANUFACTURER alin elena
#define PRODUCT m48
#define MATRIX_ROWS 4 // Rows are doubled-up
#define MATRIX_COLS 12

6
keyboards/mlego/m48/info.json
View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "mlego/m48",
"keyboard_name": "48",
"manufacturer": "alin elena",
"url": "https://gitlab.com/m-lego/m48",
"maintainer": "alin elena",
"usb": {
"vid": "0xBABA"
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [{"x":0, "y":0}, {"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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]

4
keyboards/mlego/m48/rev1/config.h
View File

@@ -17,10 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define PRODUCT_ID 0x6261
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS \
{ A6, A7, B0, B10 }
#define MATRIX_COL_PINS \

6
keyboards/mlego/m48/rev1/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6261",
"device_version": "0.0.1"
}
}

5
keyboards/mlego/m60/config.h
View File

@@ -17,11 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBABA
#define MANUFACTURER alin elena
#define PRODUCT m60
#define MATRIX_ROWS 5
#define MATRIX_COLS 12

6
keyboards/mlego/m60/info.json
View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "mlego/m60",
"keyboard_name": "m60",
"manufacturer": "alin elena",
"url": "https://gitlab.com/m-lego/m60",
"maintainer": "alin elena",
"usb": {
"vid": "0xBABA"
},
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [{"x":0, "y":0}, {"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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]

4
keyboards/mlego/m60/rev1/config.h
View File

@@ -17,10 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define PRODUCT_ID 0x6161
#define DEVICE_VER 0x0001
#define LED_NUM_LOCK_PIN B12
#define LED_SCROLL_LOCK_PIN B13
#define LED_CAPS_LOCK_PIN C13

6
keyboards/mlego/m60/rev1/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6161",
"device_version": "0.0.1"
}
}

5
keyboards/mlego/m60_split/config.h
View File

@@ -17,11 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xBABA
#define MANUFACTURER alin elena
#define PRODUCT m60_split
#define MATRIX_ROWS 10 // Rows are doubled-up
#define MATRIX_COLS 6

6
keyboards/mlego/m60_split/info.json
View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "mlego/m60_split",
"keyboard_name": "m60_split",
"manufacturer": "alin elena",
"url": "https://gitlab.com/m-lego/m65",
"maintainer": "alin elena",
"usb": {
"vid": "0xBABA"
},
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [{"x":0, "y":0}, {"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":0, "y":1}, {"x":1, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]

4
keyboards/mlego/m60_split/rev1/config.h
View File

@@ -17,10 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define PRODUCT_ID 0x6361
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS \
{ B0, A6, A7, B1, A5 }
#define MATRIX_COL_PINS \

6
keyboards/mlego/m60_split/rev1/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6361",
"device_version": "0.0.1"
}
}

4
keyboards/mlego/m60_split/rev2/config.h
View File

@@ -17,10 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define PRODUCT_ID 0x6362
#define DEVICE_VER 0x0001
#define MATRIX_ROW_PINS \
{ B0, A6, A7, B1, A5 }
#define MATRIX_COL_PINS \

6
keyboards/mlego/m60_split/rev2/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6362",
"device_version": "0.0.1"
}
}

4
keyboards/mlego/m65/config.h
View File

@@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define VENDOR_ID 0xBABA
#define MANUFACTURER Alin Elena
#define PRODUCT m65
#define MATRIX_ROWS 5
#define MATRIX_COLS 13

6
keyboards/mlego/m65/info.json
View File

@@ -1,7 +1,11 @@
{
"keyboard_name": "M65",
"keyboard_name": "m65",
"manufacturer": "Alin Elena",
"url": "https://gitlab.com/m-lego/m65",
"maintainer": "alin elena",
"usb": {
"vid": "0xBABA"
},
"layouts": {
"LAYOUT_ortho_5x13": {
"layout": [

3
keyboards/mlego/m65/rev1/config.h
View File

@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
#define PRODUCT_ID 0x6061
#define LED_NUM_LOCK_PIN B12
#define LED_SCROLL_LOCK_PIN B13
#define LED_CAPS_LOCK_PIN C13

6
keyboards/mlego/m65/rev1/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6061",
"device_version": "0.0.1"
}
}

3
keyboards/mlego/m65/rev2/config.h
View File

@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0002
#define PRODUCT_ID 0x6061
#define LED_NUM_LOCK_PIN B12
#define LED_SCROLL_LOCK_PIN B13
#define LED_CAPS_LOCK_PIN B2

6
keyboards/mlego/m65/rev2/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6061",
"device_version": "0.0.2"
}
}

3
keyboards/mlego/m65/rev3/config.h
View File

@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0001
#define PRODUCT_ID 0x6062
#define LED_NUM_LOCK_PIN B12
#define LED_SCROLL_LOCK_PIN B13
#define LED_CAPS_LOCK_PIN C13

6
keyboards/mlego/m65/rev3/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6062",
"device_version": "0.0.1"
}
}

3
keyboards/mlego/m65/rev4/config.h
View File

@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEVICE_VER 0x0002
#define PRODUCT_ID 0x6062
#define LED_NUM_LOCK_PIN B12
#define LED_SCROLL_LOCK_PIN B13
#define LED_CAPS_LOCK_PIN C13

6
keyboards/mlego/m65/rev4/info.json Normal file
View File

@@ -0,0 +1,6 @@
{
"usb": {
"pid": "0x6062",
"device_version": "0.0.2"
}
}