diff options
| author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
| commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
| tree | 818436626d49c7f22f325632b2053edba10d4358 /keyboards/kikoslab | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'keyboards/kikoslab')
| -rw-r--r-- | keyboards/kikoslab/ellora65/config.h | 6 | ||||
| -rw-r--r-- | keyboards/kikoslab/ellora65/info.json | 6 | ||||
| -rw-r--r-- | keyboards/kikoslab/ellora65/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/kikoslab/kl90/config.h | 6 | ||||
| -rw-r--r-- | keyboards/kikoslab/kl90/info.json | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h index e3f7452f41..d458250ad1 100644 --- a/keyboards/kikoslab/ellora65/config.h +++ b/keyboards/kikoslab/ellora65/config.h @@ -19,12 +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 0xE88F -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kikos Lab -#define PRODUCT Ellora65 /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json index 2d6b676098..f4bdb9ee00 100644 --- a/keyboards/kikoslab/ellora65/info.json +++ b/keyboards/kikoslab/ellora65/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ellora65", + "manufacturer": "Kikos Lab", "url": "https://github.com/swiftrax", "maintainer": "swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xE88F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kikoslab/ellora65/readme.md b/keyboards/kikoslab/ellora65/readme.md index 419c5418ec..b021188cf9 100644 --- a/keyboards/kikoslab/ellora65/readme.md +++ b/keyboards/kikoslab/ellora65/readme.md @@ -12,7 +12,7 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (1,0) in the matrix (escape key) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/kikoslab/kl90/config.h b/keyboards/kikoslab/kl90/config.h index b0d983f181..dee2bf8516 100644 --- a/keyboards/kikoslab/kl90/config.h +++ b/keyboards/kikoslab/kl90/config.h @@ -19,12 +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 0xEA53 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kikos Lab -#define PRODUCT KL90 /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 diff --git a/keyboards/kikoslab/kl90/info.json b/keyboards/kikoslab/kl90/info.json index 1354469367..15f573d7db 100644 --- a/keyboards/kikoslab/kl90/info.json +++ b/keyboards/kikoslab/kl90/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "KL-90", + "manufacturer": "Kikos Lab", "url": "www.kikoslab.com", "maintainer": "swiftrax", + "usb": { + "vid": "0x04D8", + "pid": "0xEA53", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |