diff options
| author | Ryan <fauxpark@gmail.com> | 2022-08-03 04:39:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 19:39:00 +0100 |
| commit | be5b1a24bf650d9bc0bff4cf3b27a9c641d262fd (patch) | |
| tree | 1843d23ba57633d3dec2fac7512d78fcb1447853 /keyboards/owlab/jelly_epoch | |
| parent | 24488e043eb61e6e53dfcc2e391a1ed317aeb5c7 (diff) | |
Move keyboard USB IDs and strings to data driven: O (#17874)
Diffstat (limited to 'keyboards/owlab/jelly_epoch')
| -rw-r--r-- | keyboards/owlab/jelly_epoch/hotswap/config.h | 7 | ||||
| -rw-r--r-- | keyboards/owlab/jelly_epoch/hotswap/info.json | 8 | ||||
| -rw-r--r-- | keyboards/owlab/jelly_epoch/soldered/config.h | 7 | ||||
| -rw-r--r-- | keyboards/owlab/jelly_epoch/soldered/info.json | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h index eb2998de7a..54aa5978e2 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/config.h +++ b/keyboards/owlab/jelly_epoch/hotswap/config.h @@ -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 0x4F53 //0x4F53 OS for owl studio -#define PRODUCT_ID 0x4A4C //0x4A4C JL for jelly, 0x4A53 JS for jelly solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Jelly Epoch - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index 01af496bb2..c5ee4ff522 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "jelly epoch", + "keyboard_name": "Jelly Epoch Hotswap", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x4A4C", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h index cd27b71dd4..54aa5978e2 100644 --- a/keyboards/owlab/jelly_epoch/soldered/config.h +++ b/keyboards/owlab/jelly_epoch/soldered/config.h @@ -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 0x4F53 //0x4F53 OS for owl studio -#define PRODUCT_ID 0x4A53 //0x4A4C JL for jelly, 0x4A53 JS for jelly solder -#define DEVICE_VER 0x0001 -#define MANUFACTURER OwLab -#define PRODUCT Jelly Epoch - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json index 357634b481..59358ae99f 100644 --- a/keyboards/owlab/jelly_epoch/soldered/info.json +++ b/keyboards/owlab/jelly_epoch/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "jelly", + "keyboard_name": "Jelly Epoch Soldered", + "manufacturer": "OwLab", "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer", "maintainer": "Owlab", + "usb": { + "vid": "0x4F53", + "pid": "0x4A53", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |