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

This commit is contained in:
fauxpark
2022-08-15 17:54:07 +10:00
170 changed files with 508 additions and 750 deletions

View File

@@ -17,13 +17,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
#define MANUFACTURER Flehrad
#define PRODUCT Trade Station
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 4