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

This commit is contained in:
Drashna Jael're
2022-07-25 10:15:47 -07:00
100 changed files with 325 additions and 354 deletions

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 0xBC42
#define PRODUCT_ID 0x0002
#define DEVICE_VER 0x0001
#define MANUFACTURER Biacco42
#define PRODUCT meishi
/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 4

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "Meishi",
"manufacturer": "Biacco42",
"url": "",
"maintainer": "Biacco42",
"usb": {
"vid": "0xBC42",
"pid": "0x0002",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

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 0xBC42
#define PRODUCT_ID 0x0003
#define DEVICE_VER 0x0001
#define MANUFACTURER Biacco42
#define PRODUCT meishi2
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 2

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "meishi2",
"manufacturer": "Biacco42",
"url": "",
"maintainer": "biacco42",
"usb": {
"vid": "0xBC42",
"pid": "0x0003",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [