diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
| commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
| tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/morizon | |
| parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
| parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
| download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/morizon')
| -rw-r--r-- | keyboards/morizon/config.h | 8 | ||||
| -rw-r--r-- | keyboards/morizon/info.json | 6 | ||||
| -rw-r--r-- | keyboards/morizon/readme.md | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h index 4b419283cb..732864d2ef 100644 --- a/keyboards/morizon/config.h +++ b/keyboards/morizon/config.h @@ -19,20 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Steven Karrmann -#define PRODUCT Morizon - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 7 #define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -#define UNUSED_PINS { F4 } #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json index 5e22001c79..6c0c20837b 100644 --- a/keyboards/morizon/info.json +++ b/keyboards/morizon/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Morizon", + "manufacturer": "Steven Karrmann", "url": "https://github.com/skarrmann/morizon", "maintainer": "Steven Karrmann", + "usb": { + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/morizon/readme.md b/keyboards/morizon/readme.md index 5c95e9788c..9c509d41ba 100644 --- a/keyboards/morizon/readme.md +++ b/keyboards/morizon/readme.md @@ -24,4 +24,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the top left key and plug in the keyboard. * **Physical reset button**: Briefly press the button on the top center 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. |