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

This commit is contained in:
fauxpark
2022-08-20 10:55:40 +10:00
550 changed files with 1689 additions and 1819 deletions

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

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": [

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

View File

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

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

View File

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

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

View File

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

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

View File

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