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

@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4150 // AP for AcheronProject
#define PRODUCT_ID 0x8775 // For 87H + 3 (revision Delta)
#define DEVICE_VER 0x0004 // Revision Delta
#define MANUFACTURER AcheronProject
#define PRODUCT Apollo87H
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@@ -0,0 +1,7 @@
{
"keyboard_name": "Apollo87H",
"usb": {
"pid": "0x8775",
"device_version": "0.0.4"
}
}

View File

@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4150 // AP for AcheronProject
#define PRODUCT_ID 0x8774 // For 87H + 2 (revision Gamma)
#define DEVICE_VER 0x0003 // Revision Gamma
#define MANUFACTURER AcheronProject
#define PRODUCT Apollo87H rev. Gamma
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16

View File

@@ -0,0 +1,7 @@
{
"keyboard_name": "Apollo87H rev. Gamma",
"usb": {
"pid": "0x8774",
"device_version": "0.0.3"
}
}

View File

@@ -1,7 +1,10 @@
{
"keyboard_name": "AcheronProject Apollo87H",
"manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0x4150"
},
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [

View File

@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4150 // AP for AcheronProject
#define PRODUCT_ID 0x8776 // For 87H + 4
#define DEVICE_VER 0x0001 // Revision Alpha
#define MANUFACTURER AcheronProject
#define PRODUCT Apollo87H-T-SC
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "AcheronProject Apollo87H-T-SC",
"keyboard_name": "Apollo87H-T-SC",
"manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0x4150",
"pid": "0x8776",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_tkl_ansi_tsangan": {
"layout": [

View File

@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0x4150 // AP for AcheronProject
#define PRODUCT_ID 0x8873 // For 87H
#define DEVICE_VER 0x0001 // Revision Alpha
#define MANUFACTURER AcheronProject
#define PRODUCT Apollo88H-T-SC
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "AcheronProject Apollo88H-T-SC",
"keyboard_name": "Apollo88H-T-SC",
"manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0x4150",
"pid": "0x8873",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_tkl_f13_ansi_tsangan": {
"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 0x6584 // AT fot Athena
#define DEVICE_VER 0x0001
#define MANUFACTURER AcheronProject
#define PRODUCT Athena
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@@ -0,0 +1,7 @@
{
"keyboard_name": "Athena",
"usb": {
"pid": "0x6584",
"device_version": "0.0.1"
}
}

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 0x6585 // AT+1 for Athena rev. Beta
#define DEVICE_VER 0x0002 // Rev. Beta
#define MANUFACTURER AcheronProject
#define PRODUCT Athena rev Beta
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@@ -0,0 +1,7 @@
{
"keyboard_name": "Athena rev Beta",
"usb": {
"pid": "0x6585",
"device_version": "0.0.2"
}
}

View File

@@ -1,7 +1,10 @@
{
"keyboard_name": "AcheronProject Athena",
"manufacturer": "AcheronProject",
"url": "",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0xAC11"
},
"layouts": {
"LAYOUT_all": {
"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 0x4150 //AP for AcheronProject
#define PRODUCT_ID 0x454C // EL for Elongate
#define DEVICE_VER 0x0001
#define MANUFACTURER Acheron Project
#define PRODUCT Elongate
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 13

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "Elongate",
"manufacturer": "Acheron Project",
"url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0x4150",
"pid": "0x454C",
"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 0x4150 //AP for AcheronProject
#define PRODUCT_ID 0x454D // EL+1 for Elongate revision Delta
#define DEVICE_VER 0x0002
#define MANUFACTURER Acheron Project
#define PRODUCT Elongate
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "Elongate",
"manufacturer": "Acheron Project",
"url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0x4150",
"pid": "0x454D",
"device_version": "0.0.2"
},
"layouts": {
"LAYOUT_all": {
"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 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"
}
}