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/mode | |
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/mode')
33 files changed, 76 insertions, 186 deletions
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index cdeffe6fa3..b8edfeee82 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -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 0x00DE -#define PRODUCT_ID 0x6566 // 65A + 1 since the pre-alpha version was 6565 -#define DEVICE_VER 0x0065 // A for release Alpha -#define MANUFACTURER Mode -#define PRODUCT SixtyFive HA - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 @@ -49,8 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - #define OPENDRAIN_INDICATORS #define LED_CAPS_LOCK_PIN A6 diff --git a/keyboards/mode/m65ha_alpha/info.json b/keyboards/mode/m65ha_alpha/info.json index a25d22714e..c2ae3d385d 100644 --- a/keyboards/mode/m65ha_alpha/info.json +++ b/keyboards/mode/m65ha_alpha/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mode SixtyFive HA", + "keyboard_name": "SixtyFive HA", + "manufacturer": "Mode", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x6566", + "device_version": "0.6.5" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m65ha_alpha/mcuconf.h b/keyboards/mode/m65ha_alpha/mcuconf.h index e4cefd0b75..0ca8c64850 100644 --- a/keyboards/mode/m65ha_alpha/mcuconf.h +++ b/keyboards/mode/m65ha_alpha/mcuconf.h @@ -17,19 +17,6 @@ #pragma once #include_next <mcuconf.h> -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 168 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 7 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mode/m65ha_alpha/rules.mk b/keyboards/mode/m65ha_alpha/rules.mk index 191428572e..091e076bd0 100644 --- a/keyboards/mode/m65ha_alpha/rules.mk +++ b/keyboards/mode/m65ha_alpha/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu @@ -17,5 +18,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output EEPROM_DRIVER = i2c + # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index daacee56ce..3886755cb3 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -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 0x00DE -#define PRODUCT_ID 0x6574 // For 65I + 1 (for alpha, since pre-alpha 6573) -#define DEVICE_VER 0x0065 // A for A (alpha) -#define MANUFACTURER Mode -#define PRODUCT SixtyFive HI - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 @@ -49,8 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - #define OPENDRAIN_INDICATORS #define LED_CAPS_LOCK_PIN A6 diff --git a/keyboards/mode/m65hi_alpha/info.json b/keyboards/mode/m65hi_alpha/info.json index aa5f98efc6..231299e6d1 100644 --- a/keyboards/mode/m65hi_alpha/info.json +++ b/keyboards/mode/m65hi_alpha/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mode SixtyFive HI", + "keyboard_name": "SixtyFive HI", + "manufacturer": "Mode", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x6574", + "device_version": "0.6.5" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m65hi_alpha/mcuconf.h b/keyboards/mode/m65hi_alpha/mcuconf.h index 97f2ee51ee..dd68a8c1e7 100644 --- a/keyboards/mode/m65hi_alpha/mcuconf.h +++ b/keyboards/mode/m65hi_alpha/mcuconf.h @@ -22,19 +22,6 @@ #pragma once #include_next <mcuconf.h> -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 168 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 7 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mode/m65hi_alpha/rules.mk b/keyboards/mode/m65hi_alpha/rules.mk index 191428572e..091e076bd0 100644 --- a/keyboards/mode/m65hi_alpha/rules.mk +++ b/keyboards/mode/m65hi_alpha/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu @@ -17,5 +18,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output EEPROM_DRIVER = i2c + # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 9cd3bfcb35..4459e37145 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -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 0x00DE -#define PRODUCT_ID 0x6583 // For 65S -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mode -#define PRODUCT SixtyFive S - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 @@ -49,8 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - #define OPENDRAIN_INDICATORS #define LED_CAPS_LOCK_PIN C8 diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json index cb0cf8c12c..511a05bf8f 100644 --- a/keyboards/mode/m65s/info.json +++ b/keyboards/mode/m65s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mode SixtyFive S", + "keyboard_name": "SixtyFive S", + "manufacturer": "Mode", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x6583", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m65s/mcuconf.h b/keyboards/mode/m65s/mcuconf.h index 97f2ee51ee..dd68a8c1e7 100644 --- a/keyboards/mode/m65s/mcuconf.h +++ b/keyboards/mode/m65s/mcuconf.h @@ -22,19 +22,6 @@ #pragma once #include_next <mcuconf.h> -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 168 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 7 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk index bb3ebaee28..91f94bfa10 100644 --- a/keyboards/mode/m65s/rules.mk +++ b/keyboards/mode/m65s/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h index 6618d2bdbd..0dff69fac9 100644 --- a/keyboards/mode/m75h/config.h +++ b/keyboards/mode/m75h/config.h @@ -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 0x00DE -#define PRODUCT_ID 0x7572 // For 75H -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mode -#define PRODUCT Mode 75H - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 16 @@ -50,8 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json index 91584e8863..e3b5c6d64b 100644 --- a/keyboards/mode/m75h/info.json +++ b/keyboards/mode/m75h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mode 75H", + "keyboard_name": "75H", + "manufacturer": "Mode", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x7572", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75h/mcuconf.h b/keyboards/mode/m75h/mcuconf.h index 97f2ee51ee..dd68a8c1e7 100644 --- a/keyboards/mode/m75h/mcuconf.h +++ b/keyboards/mode/m75h/mcuconf.h @@ -22,19 +22,6 @@ #pragma once #include_next <mcuconf.h> -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 168 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 7 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mode/m75h/readme.md b/keyboards/mode/m75h/readme.md index a663847278..7b9a6a8710 100644 --- a/keyboards/mode/m75h/readme.md +++ b/keyboards/mode/m75h/readme.md @@ -1,8 +1,6 @@ -# Mode SixtyFive M65S +# Mode SixtyFive M75H -![MODE75](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg) - -The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/). +The M75H is the hot-swappable PCB for the Mode SeventyFive keyboard, a seventy-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/). - Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim) - Hardware Supported: proprietary PCB using STM32F401 controller @@ -10,10 +8,10 @@ The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-per Make example for this keyboard (after setting up your build environment): - make mode/m65s:default + make mode/m75h:default Flashing example for this keyboard: - make mode/m65s:default:flash + make mode/m75h:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk index f7659378cc..76752ec1b3 100644 --- a/keyboards/mode/m75h/rules.mk +++ b/keyboards/mode/m75h/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 9e902a1585..5da8543e95 100644 --- a/keyboards/mode/m75s/config.h +++ b/keyboards/mode/m75s/config.h @@ -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 0x00DE -#define PRODUCT_ID 0x7583 // For 75S -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mode -#define PRODUCT Mode 75S - /* key matrix size */ #define MATRIX_ROWS 7 #define MATRIX_COLS 16 @@ -50,8 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json index d45cee20dc..2b58f194fb 100644 --- a/keyboards/mode/m75s/info.json +++ b/keyboards/mode/m75s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mode 75S", + "keyboard_name": "75S", + "manufacturer": "Mode", "url": "", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x7583", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mode/m75s/mcuconf.h b/keyboards/mode/m75s/mcuconf.h index 97f2ee51ee..dd68a8c1e7 100644 --- a/keyboards/mode/m75s/mcuconf.h +++ b/keyboards/mode/m75s/mcuconf.h @@ -22,19 +22,6 @@ #pragma once #include_next <mcuconf.h> -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 168 -#define STM32_PLLP_VALUE 4 -#define STM32_PLLQ_VALUE 7 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk index f7659378cc..76752ec1b3 100644 --- a/keyboards/mode/m75s/rules.mk +++ b/keyboards/mode/m75s/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h index a0d39774e6..675cc3385d 100644 --- a/keyboards/mode/m80v1/config.h +++ b/keyboards/mode/m80v1/config.h @@ -16,11 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define MANUFACTURER Mode -#define PRODUCT Eighty - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 @@ -38,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { A10, A15, B3, B9, A3, A4 } #define MATRIX_COL_PINS { B8, B7, B6, B5, B4, A2, A1, A0, F1, F0, C15, C14, C13, A7, A6, A5 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/mode/m80v1/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h deleted file mode 100644 index b119ad4fff..0000000000 --- a/keyboards/mode/m80v1/m80h/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0081 -#define DEVICE_VER 0x0072 //H for hotswap version diff --git a/keyboards/mode/m80v1/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json index 97d5881997..bb65727e62 100644 --- a/keyboards/mode/m80v1/m80h/info.json +++ b/keyboards/mode/m80v1/m80h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80H", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0081", + "device_version": "0.7.2" + }, "layouts": { "LAYOUT_eighty_m80h": { "layout": [ diff --git a/keyboards/mode/m80v1/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h deleted file mode 100644 index 3e7f2ec3a8..0000000000 --- a/keyboards/mode/m80v1/m80s/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0080 -#define DEVICE_VER 0x0083 //S for solderable version diff --git a/keyboards/mode/m80v1/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json index c586614a78..7b72eb256f 100644 --- a/keyboards/mode/m80v1/m80s/info.json +++ b/keyboards/mode/m80v1/m80s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80S", + "keyboard_name": "Eighty", + "manufacturer": "Mode", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x00DE", + "pid": "0x0080", + "device_version": "0.8.3" + }, "layouts": { "LAYOUT_eighty_m80s": { "layout": [ diff --git a/keyboards/mode/m80v1/readme.md b/keyboards/mode/m80v1/readme.md index 5435a02e61..558204b5b7 100644 --- a/keyboards/mode/m80v1/readme.md +++ b/keyboards/mode/m80v1/readme.md @@ -17,7 +17,7 @@ The DFU state in the bootloader can be accessed in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds -* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (ESC key at layer 1 in the default layout) ## Compile firmware diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h index fbe5fb86df..9382def58a 100644 --- a/keyboards/mode/m80v2/config.h +++ b/keyboards/mode/m80v2/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00DE -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mode - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h deleted file mode 100644 index f474e28453..0000000000 --- a/keyboards/mode/m80v2/m80v2h/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0083 // 81 was used for M80H V1 -#define PRODUCT M80H V2 diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json index 251937c562..13bd6c67bc 100644 --- a/keyboards/mode/m80v2/m80v2h/info.json +++ b/keyboards/mode/m80v2/m80v2h/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2H", + "keyboard_name": "M80H V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0083", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2h": { "layout": [ diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h deleted file mode 100644 index ad1871f8ab..0000000000 --- a/keyboards/mode/m80v2/m80v2s/config.h +++ /dev/null @@ -1,2 +0,0 @@ -#define PRODUCT_ID 0x0082 // 81 was used for M80H V1 -#define PRODUCT M80S V2 diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json index 6e0bd62d51..4e2a4fc6f5 100644 --- a/keyboards/mode/m80v2/m80v2s/info.json +++ b/keyboards/mode/m80v2/m80v2s/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "MODE80V2S", + "keyboard_name": "M80S V2", + "manufacturer": "Mode", "url": "https://shop.modedesigns.com/collections/eighty", "maintainer": "Gondolindrim", + "usb": { + "vid": "0x00DE", + "pid": "0x0082", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_m80v2s": { "layout": [ diff --git a/keyboards/mode/m80v2/readme.md b/keyboards/mode/m80v2/readme.md index e94984f06b..b5ea62ec27 100644 --- a/keyboards/mode/m80v2/readme.md +++ b/keyboards/mode/m80v2/readme.md @@ -17,7 +17,7 @@ The DFU state in the bootloader can be accessed in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds -* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (ESC key at layer 1 in the default layout) ## Compile firmware |