diff options
| author | Drashna Jael're <drashna@live.com> | 2022-08-14 01:54:23 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-08-14 01:54:23 -0700 |
| commit | ac31e429741a640b0d03d2ebd76554b7fe9247e0 (patch) | |
| tree | 8d21aa6f2b7e0c3ee75b37e4f2edb1ae010db525 /keyboards/biacco42 | |
| parent | e948fa6f6e184a3c9a317a7aa680e33e7629b0d4 (diff) | |
| parent | 4195eb8fe1de39855b622ee282950c10fdbf0988 (diff) | |
| download | qmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.tar.gz qmk_firmware-ac31e429741a640b0d03d2ebd76554b7fe9247e0.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/biacco42')
| -rw-r--r-- | keyboards/biacco42/ergo42/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/biacco42/ergo42/rev1/info.json (renamed from keyboards/biacco42/ergo42/info.json) | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h index c8bfe1170f..9d1b7387b3 100644 --- a/keyboards/biacco42/ergo42/rev1/config.h +++ b/keyboards/biacco42/ergo42/rev1/config.h @@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBC42 -#define PRODUCT_ID 0x0042 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Biacco42 -#define PRODUCT Ergo42 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/biacco42/ergo42/info.json b/keyboards/biacco42/ergo42/rev1/info.json index a4c4f7fd18..3c21ef1b46 100644 --- a/keyboards/biacco42/ergo42/info.json +++ b/keyboards/biacco42/ergo42/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Ergo42", + "manufacturer": "Biacco42", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xBC42", + "pid": "0x0042", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT_ortho_4x14": { "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"L06", "x":6, "y":0}, {"label":"R00", "x":8, "y":0}, {"label":"R01", "x":9, "y":0}, {"label":"R02", "x":10, "y":0}, {"label":"R03", "x":11, "y":0}, {"label":"R04", "x":12, "y":0}, {"label":"R05", "x":13, "y":0}, {"label":"R06", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"L16", "x":6, "y":1}, {"label":"R10", "x":8, "y":1}, {"label":"R11", "x":9, "y":1}, {"label":"R12", "x":10, "y":1}, {"label":"R13", "x":11, "y":1}, {"label":"R14", "x":12, "y":1}, {"label":"R15", "x":13, "y":1}, {"label":"R16", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"L26", "x":6, "y":2}, {"label":"R20", "x":8, "y":2}, {"label":"R21", "x":9, "y":2}, {"label":"R22", "x":10, "y":2}, {"label":"R23", "x":11, "y":2}, {"label":"R24", "x":12, "y":2}, {"label":"R25", "x":13, "y":2}, {"label":"R26", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"L36", "x":6, "y":3}, {"label":"R30", "x":8, "y":3}, {"label":"R31", "x":9, "y":3}, {"label":"R32", "x":10, "y":3}, {"label":"R33", "x":11, "y":3}, {"label":"R34", "x":12, "y":3}, {"label":"R35", "x":13, "y":3}, {"label":"R36", "x":14, "y":3}] |