diff options
author | HorrorTroll <sonicvipduc@gmail.com> | 2022-05-12 12:51:37 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-11 22:51:37 -0700 |
commit | 8a4ef2b3c4a388a563c95e75eb744514a210dfe2 (patch) | |
tree | 76577b598a8365661fd1adf2baf82a1753e2b86d | |
parent | 77aba32bc61a47d551b030f61cae582599652712 (diff) |
[Keyboard] Move M63 RGB into maker folder (#17061)
-rw-r--r-- | keyboards/horrortroll/chinese_pcb/readme.md | 1 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/config.h (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/config.h) | 12 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/info.json (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/info.json) | 0 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c) | 7 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/default/readme.md (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md) | 0 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/via/config.h (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h) | 3 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c) | 7 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/via/readme.md (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md) | 0 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/keymaps/via/rules.mk (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk) | 0 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/m63_rgb.c (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c) | 3 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/m63_rgb.h (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h) | 3 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/readme.md (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md) | 6 | ||||
-rw-r--r-- | keyboards/mss_studio/m63_rgb/rules.mk (renamed from keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk) | 0 |
13 files changed, 22 insertions, 20 deletions
diff --git a/keyboards/horrortroll/chinese_pcb/readme.md b/keyboards/horrortroll/chinese_pcb/readme.md index 3ed2a7c71b..cb73d8a43b 100644 --- a/keyboards/horrortroll/chinese_pcb/readme.md +++ b/keyboards/horrortroll/chinese_pcb/readme.md @@ -10,6 +10,5 @@ This is a folder for collection code of Chinese PCB, where they only sold one-ti | ------------- | ------------- | ------------- | ------- | ------------------------ | ---- | ----- | | Black E6.5 | Atmega32U4 | 68 Keys (65%) | No | Backlight & RGB Lighting | No | No | | Devil68 Pro | Atmega32U4 | 68 Keys (65%) | Yes | RGB Matrix | No | No | - | M63 RGB | STM32F072CBU6 | 63 Keys (60%) | Yes | RGB Matrix | No | No | | | | | | | | | </details> diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h b/keyboards/mss_studio/m63_rgb/config.h index 4c126bb3f3..ad5fbfa1c3 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h +++ b/keyboards/mss_studio/m63_rgb/config.h @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 @@ -19,10 +20,10 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x7516 -#define PRODUCT_ID 0x6002 +#define VENDOR_ID 0x4D4B +#define PRODUCT_ID 0x6063 #define DEVICE_VER 0x0001 -#define MANUFACTURER HorrorTroll +#define MANUFACTURER Mss Studio #define PRODUCT M63 RGB /* key matrix size */ @@ -33,9 +34,6 @@ #define MATRIX_ROW_PINS { B3, B4, A0, A2, A3 } #define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 } -#define BOOTMAGIC_LITE_ROW 3 -#define BOOTMAGIC_LITE_COLUMN 5 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/info.json b/keyboards/mss_studio/m63_rgb/info.json index 651e58a100..651e58a100 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/info.json +++ b/keyboards/mss_studio/m63_rgb/info.json diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c index 8f421c22f5..713b1288eb 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c +++ b/keyboards/mss_studio/m63_rgb/keymaps/default/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 @@ -27,8 +28,8 @@ // entirely and just use numbers. enum layer_names { - _BASE = 0, - _FN = 1 + _BASE, + _FN, }; enum user_rgb_mode { diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md b/keyboards/mss_studio/m63_rgb/keymaps/default/readme.md index 01ff3523b9..01ff3523b9 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md +++ b/keyboards/mss_studio/m63_rgb/keymaps/default/readme.md diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h index fe6aa8c1f7..db20f3b87b 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h +++ b/keyboards/mss_studio/m63_rgb/keymaps/via/config.h @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c index 8f421c22f5..713b1288eb 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c +++ b/keyboards/mss_studio/m63_rgb/keymaps/via/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 @@ -27,8 +28,8 @@ // entirely and just use numbers. enum layer_names { - _BASE = 0, - _FN = 1 + _BASE, + _FN, }; enum user_rgb_mode { diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md b/keyboards/mss_studio/m63_rgb/keymaps/via/readme.md index c60a188047..c60a188047 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md +++ b/keyboards/mss_studio/m63_rgb/keymaps/via/readme.md diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk b/keyboards/mss_studio/m63_rgb/keymaps/via/rules.mk index 1e5b99807c..1e5b99807c 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk +++ b/keyboards/mss_studio/m63_rgb/keymaps/via/rules.mk diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c b/keyboards/mss_studio/m63_rgb/m63_rgb.c index ef1eabddf8..dd071849b5 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c +++ b/keyboards/mss_studio/m63_rgb/m63_rgb.c @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h b/keyboards/mss_studio/m63_rgb/m63_rgb.h index b2461758e2..19f7c7b167 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h +++ b/keyboards/mss_studio/m63_rgb/m63_rgb.h @@ -1,4 +1,5 @@ -/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll> +/* Copyright 2021 Mss Studio + * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll> * * 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 diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md b/keyboards/mss_studio/m63_rgb/readme.md index 7ec01047b1..942b7a60a6 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md +++ b/keyboards/mss_studio/m63_rgb/readme.md @@ -7,11 +7,11 @@ Support STM32F072CBU6 keyboard. Make example for this keyboard (after setting up your build environment): - make horrortroll/chinese_pcb/m63_rgb:default + make mss_studio/m63_rgb:default Flashing example for this keyboard: - make horrortroll/chinese_pcb/m63_rgb:default:flash + make mss_studio/m63_rgb: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). @@ -19,6 +19,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (3,5) in the matrix (B key) and plug in the keyboard +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard * **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard * **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk b/keyboards/mss_studio/m63_rgb/rules.mk index 9291499b77..9291499b77 100644 --- a/keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk +++ b/keyboards/mss_studio/m63_rgb/rules.mk |