Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -1,7 +1,12 @@
|
||||
{
|
||||
"keyboard_name": "aleth42",
|
||||
"keyboard_name": "ALETH42",
|
||||
"manufacturer": "25KEYS",
|
||||
"url": "http://www.sho-k.co.uk/tech/aleth42",
|
||||
"maintainer": "monksoffunk",
|
||||
"usb": {
|
||||
"vid": "0x04D8",
|
||||
"pid": "0xEAC8"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
@@ -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 0x04D8
|
||||
#define PRODUCT_ID 0xEAC8
|
||||
#define DEVICE_VER 0x0000
|
||||
#define MANUFACTURER 25KEYS
|
||||
#define PRODUCT ALETH42
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 4
|
||||
#define MATRIX_COLS 11
|
||||
|
5
keyboards/25keys/aleth42/rev0/info.json
Normal file
5
keyboards/25keys/aleth42/rev0/info.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"usb": {
|
||||
"device_version": "0.0.0"
|
||||
}
|
||||
}
|
@@ -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 0x04D8
|
||||
#define PRODUCT_ID 0xEAC8
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER 25KEYS
|
||||
#define PRODUCT ALETH42
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 4
|
||||
#define MATRIX_COLS 11
|
||||
|
5
keyboards/25keys/aleth42/rev1/info.json
Normal file
5
keyboards/25keys/aleth42/rev1/info.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"usb": {
|
||||
"device_version": "0.0.1"
|
||||
}
|
||||
}
|
@@ -1,8 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "Zinc",
|
||||
"url": "https://github.com/monksoffunk/",
|
||||
"manufacturer": "25KEYS",
|
||||
"url": "https://github.com/monksoffunk/zinc",
|
||||
"maintainer": "monksoffunk",
|
||||
"layouts": {
|
||||
"usb": {
|
||||
"vid": "0x04D8",
|
||||
"pid": "0xEA3B",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
|
||||
}
|
||||
|
@@ -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 0x04D8
|
||||
#define PRODUCT_ID 0xEA3B
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER 25KEYS
|
||||
#define PRODUCT zinc rev.1
|
||||
|
||||
#define TAPPING_FORCE_HOLD
|
||||
#define TAPPING_TERM 100
|
||||
|
||||
|
@@ -1,10 +1,3 @@
|
||||
{
|
||||
"keyboard_name": "Zinc rev.1",
|
||||
"url": "https://github.com/monksoffunk/zinc",
|
||||
"maintainer": "monksoffunk",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
|
||||
}
|
||||
}
|
||||
"keyboard_name": "Zinc rev.1"
|
||||
}
|
||||
|
@@ -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 0x04D8
|
||||
#define PRODUCT_ID 0xEA3B
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER 25KEYS
|
||||
#define PRODUCT zinc rev.A
|
||||
|
||||
#define TAPPING_FORCE_HOLD
|
||||
#define TAPPING_TERM 100
|
||||
|
||||
|
@@ -1,10 +1,3 @@
|
||||
{
|
||||
"keyboard_name": "Zinc rev.A",
|
||||
"url": "https://github.com/monksoffunk/zinc",
|
||||
"maintainer": "monksoffunk",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}]
|
||||
}
|
||||
}
|
||||
"keyboard_name": "Zinc rev.A"
|
||||
}
|
||||
|
Reference in New Issue
Block a user