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

This commit is contained in:
QMK Bot
2022-08-14 00:47:42 +00:00
137 changed files with 422 additions and 510 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 0xAC11
#define PRODUCT_ID 0x5368
#define DEVICE_VER 0x0001
#define MANUFACTURER AcheronProject
#define PRODUCT SharkPCB
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View File

@@ -2,6 +2,10 @@
"keyboard_name": "SharkPCB",
"url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html",
"maintainer": "Gondolindrim",
"usb": {
"pid": "0x5368",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_4x12": {
"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 0xAC11
#define PRODUCT_ID 0x5369 // For Shark+1
#define DEVICE_VER 0x0002
#define MANUFACTURER AcheronProject
#define PRODUCT SharkPCB rev. Beta
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View File

@@ -0,0 +1,7 @@
{
"keyboard_name": "SharkPCB rev. Beta",
"usb": {
"pid": "0x5369",
"device_version": "0.0.2"
}
}

View File

@@ -0,0 +1,6 @@
{
"manufacturer": "AcheronProject",
"usb": {
"vid": "0xAC11"
}
}