diff --git a/keyboards/amj40/amj40.c b/keyboards/amjkeyboard/amj40/amj40.c similarity index 100% rename from keyboards/amj40/amj40.c rename to keyboards/amjkeyboard/amj40/amj40.c diff --git a/keyboards/amj40/amj40.h b/keyboards/amjkeyboard/amj40/amj40.h similarity index 100% rename from keyboards/amj40/amj40.h rename to keyboards/amjkeyboard/amj40/amj40.h diff --git a/keyboards/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h similarity index 98% rename from keyboards/amj40/config.h rename to keyboards/amjkeyboard/amj40/config.h index 71a8d34413..2f472eac01 100755 --- a/keyboards/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x00D8 //A+M+J #define PRODUCT_ID 0x6072 #define DEVICE_VER 0x0002 #define MANUFACTURER Han Chen diff --git a/keyboards/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json similarity index 100% rename from keyboards/amj40/info.json rename to keyboards/amjkeyboard/amj40/info.json diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/default/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/default/keymap.c diff --git a/keyboards/amj40/keymaps/default/readme.md b/keyboards/amjkeyboard/amj40/keymaps/default/readme.md similarity index 100% rename from keyboards/amj40/keymaps/default/readme.md rename to keyboards/amjkeyboard/amj40/keymaps/default/readme.md diff --git a/keyboards/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/default_625u_space/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c diff --git a/keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c diff --git a/keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c diff --git a/keyboards/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/fabian/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c diff --git a/keyboards/amj40/keymaps/fabian/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk similarity index 100% rename from keyboards/amj40/keymaps/fabian/rules.mk rename to keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/config.h b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h similarity index 100% rename from keyboards/amj40/keymaps/jetpacktuxedo/config.h rename to keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/jetpacktuxedo/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/readme.md b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md similarity index 100% rename from keyboards/amj40/keymaps/jetpacktuxedo/readme.md rename to keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk similarity index 100% rename from keyboards/amj40/keymaps/jetpacktuxedo/rules.mk rename to keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk diff --git a/keyboards/amj40/keymaps/myee/build.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/build.sh similarity index 100% rename from keyboards/amj40/keymaps/myee/build.sh rename to keyboards/amjkeyboard/amj40/keymaps/myee/build.sh diff --git a/keyboards/amj40/keymaps/myee/config.h b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h similarity index 100% rename from keyboards/amj40/keymaps/myee/config.h rename to keyboards/amjkeyboard/amj40/keymaps/myee/config.h diff --git a/keyboards/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c similarity index 100% rename from keyboards/amj40/keymaps/myee/keymap.c rename to keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c diff --git a/keyboards/amj40/keymaps/myee/readme.md b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md similarity index 100% rename from keyboards/amj40/keymaps/myee/readme.md rename to keyboards/amjkeyboard/amj40/keymaps/myee/readme.md diff --git a/keyboards/amj40/keymaps/myee/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk similarity index 100% rename from keyboards/amj40/keymaps/myee/rules.mk rename to keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh similarity index 100% rename from keyboards/amj40/keymaps/myee/updatemerge.sh rename to keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh diff --git a/keyboards/amj40/readme.md b/keyboards/amjkeyboard/amj40/readme.md similarity index 93% rename from keyboards/amj40/readme.md rename to keyboards/amjkeyboard/amj40/readme.md index 1d7316fcf5..f557b9df49 100755 --- a/keyboards/amj40/readme.md +++ b/keyboards/amjkeyboard/amj40/readme.md @@ -12,11 +12,11 @@ DIY/Assembled compact 40% keyboard. Make example for this keyboard (after setting up your build environment): - make amj40:default + make amjkeyboard/amj40:default Flashing example for this keyboard: - make amj40:default:flash + make amjkeyboard/amj40:default:flash To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings). diff --git a/keyboards/amj40/rules.mk b/keyboards/amjkeyboard/amj40/rules.mk similarity index 100% rename from keyboards/amj40/rules.mk rename to keyboards/amjkeyboard/amj40/rules.mk diff --git a/keyboards/amj60/amj60.c b/keyboards/amjkeyboard/amj60/amj60.c similarity index 100% rename from keyboards/amj60/amj60.c rename to keyboards/amjkeyboard/amj60/amj60.c diff --git a/keyboards/amj60/amj60.h b/keyboards/amjkeyboard/amj60/amj60.h similarity index 100% rename from keyboards/amj60/amj60.h rename to keyboards/amjkeyboard/amj60/amj60.h diff --git a/keyboards/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h similarity index 98% rename from keyboards/amj60/config.h rename to keyboards/amjkeyboard/amj60/config.h index 1c25e4fea0..4e894a45fc 100644 --- a/keyboards/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x00D8 //A+M+J #define PRODUCT_ID 0x6066 #define DEVICE_VER 0x0001 #define MANUFACTURER Han Chen diff --git a/keyboards/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json similarity index 100% rename from keyboards/amj60/info.json rename to keyboards/amjkeyboard/amj60/info.json diff --git a/keyboards/amj60/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj60/keymaps/default/keymap.c similarity index 100% rename from keyboards/amj60/keymaps/default/keymap.c rename to keyboards/amjkeyboard/amj60/keymaps/default/keymap.c diff --git a/keyboards/amj60/readme.md b/keyboards/amjkeyboard/amj60/readme.md similarity index 92% rename from keyboards/amj60/readme.md rename to keyboards/amjkeyboard/amj60/readme.md index 50cf3cfcb2..8f276bd89f 100644 --- a/keyboards/amj60/readme.md +++ b/keyboards/amjkeyboard/amj60/readme.md @@ -11,11 +11,11 @@ A 60% keyboard. Make example for this keyboard (after setting up your build environment): - make amj60:default + make amjkeyboard/amj60:default Flashing example for this keyboard: - make amj60:default:flash + make amjkeyboard/amj60:default:flash To reset the board into bootloader mode, tap the Reset switch mounted on the bottom side of the PCB. diff --git a/keyboards/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk similarity index 100% rename from keyboards/amj60/rules.mk rename to keyboards/amjkeyboard/amj60/rules.mk diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h index 1f8a930a6a..cc84524b0b 100644 --- a/keyboards/amjkeyboard/amj66/config.h +++ b/keyboards/amjkeyboard/amj66/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x00D8 //A+M+J #define PRODUCT_ID 0xBD66 #define DEVICE_VER 0x0001 #define MANUFACTURER AMJKeyboard diff --git a/keyboards/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c similarity index 100% rename from keyboards/amj96/amj96.c rename to keyboards/amjkeyboard/amj96/amj96.c diff --git a/keyboards/amj96/amj96.h b/keyboards/amjkeyboard/amj96/amj96.h similarity index 100% rename from keyboards/amj96/amj96.h rename to keyboards/amjkeyboard/amj96/amj96.h diff --git a/keyboards/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h similarity index 99% rename from keyboards/amj96/config.h rename to keyboards/amjkeyboard/amj96/config.h index f5b26220b7..67b3699047 100644 --- a/keyboards/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x00D8 //A+M+J #define PRODUCT_ID 0x6074 #define DEVICE_VER 0x0002 #define MANUFACTURER Han Chen diff --git a/keyboards/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json similarity index 100% rename from keyboards/amj96/info.json rename to keyboards/amjkeyboard/amj96/info.json diff --git a/keyboards/amj96/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c similarity index 100% rename from keyboards/amj96/keymaps/default/keymap.c rename to keyboards/amjkeyboard/amj96/keymaps/default/keymap.c diff --git a/keyboards/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c similarity index 100% rename from keyboards/amj96/matrix.c rename to keyboards/amjkeyboard/amj96/matrix.c diff --git a/keyboards/amj96/readme.md b/keyboards/amjkeyboard/amj96/readme.md similarity index 91% rename from keyboards/amj96/readme.md rename to keyboards/amjkeyboard/amj96/readme.md index 8cd4ea94a1..0941b6f3e1 100644 --- a/keyboards/amj96/readme.md +++ b/keyboards/amjkeyboard/amj96/readme.md @@ -8,11 +8,11 @@ The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb port Make example for this keyboard (after setting up your build environment): - make amj96:default + make amjkeyboard/amj96:default Flashing example for this keyboard: - make amj96:default:flash + make amjkeyboard/amj96: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/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk similarity index 100% rename from keyboards/amj96/rules.mk rename to keyboards/amjkeyboard/amj96/rules.mk diff --git a/keyboards/amjpad/amjpad.c b/keyboards/amjkeyboard/amjpad/amjpad.c similarity index 100% rename from keyboards/amjpad/amjpad.c rename to keyboards/amjkeyboard/amjpad/amjpad.c diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjkeyboard/amjpad/amjpad.h similarity index 100% rename from keyboards/amjpad/amjpad.h rename to keyboards/amjkeyboard/amjpad/amjpad.h diff --git a/keyboards/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h similarity index 98% rename from keyboards/amjpad/config.h rename to keyboards/amjkeyboard/amjpad/config.h index dd8ed34e47..fe621b7bf3 100644 --- a/keyboards/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x00D8 //A+M+J #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0003 #define MANUFACTURER AMJ diff --git a/keyboards/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json similarity index 100% rename from keyboards/amjpad/info.json rename to keyboards/amjkeyboard/amjpad/info.json diff --git a/keyboards/amjpad/keymaps/default/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c similarity index 100% rename from keyboards/amjpad/keymaps/default/keymap.c rename to keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c diff --git a/keyboards/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c similarity index 100% rename from keyboards/amjpad/keymaps/max/keymap.c rename to keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c diff --git a/keyboards/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c similarity index 100% rename from keyboards/amjpad/keymaps/ortho_left/keymap.c rename to keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c diff --git a/keyboards/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c similarity index 100% rename from keyboards/amjpad/keymaps/ortho_right/keymap.c rename to keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c diff --git a/keyboards/amjpad/readme.md b/keyboards/amjkeyboard/amjpad/readme.md similarity index 92% rename from keyboards/amjpad/readme.md rename to keyboards/amjkeyboard/amjpad/readme.md index c069af25ad..98af32edef 100644 --- a/keyboards/amjpad/readme.md +++ b/keyboards/amjkeyboard/amjpad/readme.md @@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83546.0 Make example for this keyboard (after setting up your build environment): - make amjpad:default + make amjkeyboard/amjpad:default See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk similarity index 100% rename from keyboards/amjpad/rules.mk rename to keyboards/amjkeyboard/amjpad/rules.mk diff --git a/keyboards/melody96/config.h b/keyboards/ymdk/melody96/config.h similarity index 100% rename from keyboards/melody96/config.h rename to keyboards/ymdk/melody96/config.h diff --git a/keyboards/melody96/info.json b/keyboards/ymdk/melody96/info.json similarity index 100% rename from keyboards/melody96/info.json rename to keyboards/ymdk/melody96/info.json diff --git a/keyboards/melody96/keymaps/crilith/keymap.c b/keyboards/ymdk/melody96/keymaps/crilith/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/crilith/keymap.c rename to keyboards/ymdk/melody96/keymaps/crilith/keymap.c diff --git a/keyboards/melody96/keymaps/default/keymap.c b/keyboards/ymdk/melody96/keymaps/default/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/default/keymap.c rename to keyboards/ymdk/melody96/keymaps/default/keymap.c diff --git a/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c b/keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c rename to keyboards/ymdk/melody96/keymaps/default_96_with60_split_num0/keymap.c diff --git a/keyboards/melody96/keymaps/dvz/config.h b/keyboards/ymdk/melody96/keymaps/dvz/config.h similarity index 100% rename from keyboards/melody96/keymaps/dvz/config.h rename to keyboards/ymdk/melody96/keymaps/dvz/config.h diff --git a/keyboards/melody96/keymaps/dvz/keymap.c b/keyboards/ymdk/melody96/keymaps/dvz/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/dvz/keymap.c rename to keyboards/ymdk/melody96/keymaps/dvz/keymap.c diff --git a/keyboards/melody96/keymaps/dvz/readme.md b/keyboards/ymdk/melody96/keymaps/dvz/readme.md similarity index 100% rename from keyboards/melody96/keymaps/dvz/readme.md rename to keyboards/ymdk/melody96/keymaps/dvz/readme.md diff --git a/keyboards/melody96/keymaps/dvz/rules.mk b/keyboards/ymdk/melody96/keymaps/dvz/rules.mk similarity index 100% rename from keyboards/melody96/keymaps/dvz/rules.mk rename to keyboards/ymdk/melody96/keymaps/dvz/rules.mk diff --git a/keyboards/melody96/keymaps/konstantin/config.h b/keyboards/ymdk/melody96/keymaps/konstantin/config.h similarity index 100% rename from keyboards/melody96/keymaps/konstantin/config.h rename to keyboards/ymdk/melody96/keymaps/konstantin/config.h diff --git a/keyboards/melody96/keymaps/konstantin/keymap.c b/keyboards/ymdk/melody96/keymaps/konstantin/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/konstantin/keymap.c rename to keyboards/ymdk/melody96/keymaps/konstantin/keymap.c diff --git a/keyboards/melody96/keymaps/konstantin/rules.mk b/keyboards/ymdk/melody96/keymaps/konstantin/rules.mk similarity index 100% rename from keyboards/melody96/keymaps/konstantin/rules.mk rename to keyboards/ymdk/melody96/keymaps/konstantin/rules.mk diff --git a/keyboards/melody96/keymaps/via/keymap.c b/keyboards/ymdk/melody96/keymaps/via/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/via/keymap.c rename to keyboards/ymdk/melody96/keymaps/via/keymap.c diff --git a/keyboards/melody96/keymaps/via/rules.mk b/keyboards/ymdk/melody96/keymaps/via/rules.mk similarity index 100% rename from keyboards/melody96/keymaps/via/rules.mk rename to keyboards/ymdk/melody96/keymaps/via/rules.mk diff --git a/keyboards/melody96/keymaps/zunger/config.h b/keyboards/ymdk/melody96/keymaps/zunger/config.h similarity index 100% rename from keyboards/melody96/keymaps/zunger/config.h rename to keyboards/ymdk/melody96/keymaps/zunger/config.h diff --git a/keyboards/melody96/keymaps/zunger/keymap.c b/keyboards/ymdk/melody96/keymaps/zunger/keymap.c similarity index 100% rename from keyboards/melody96/keymaps/zunger/keymap.c rename to keyboards/ymdk/melody96/keymaps/zunger/keymap.c diff --git a/keyboards/melody96/keymaps/zunger/readme.md b/keyboards/ymdk/melody96/keymaps/zunger/readme.md similarity index 100% rename from keyboards/melody96/keymaps/zunger/readme.md rename to keyboards/ymdk/melody96/keymaps/zunger/readme.md diff --git a/keyboards/melody96/keymaps/zunger/rules.mk b/keyboards/ymdk/melody96/keymaps/zunger/rules.mk similarity index 100% rename from keyboards/melody96/keymaps/zunger/rules.mk rename to keyboards/ymdk/melody96/keymaps/zunger/rules.mk diff --git a/keyboards/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c similarity index 100% rename from keyboards/melody96/melody96.c rename to keyboards/ymdk/melody96/melody96.c diff --git a/keyboards/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h similarity index 100% rename from keyboards/melody96/melody96.h rename to keyboards/ymdk/melody96/melody96.h diff --git a/keyboards/melody96/readme.md b/keyboards/ymdk/melody96/readme.md similarity index 96% rename from keyboards/melody96/readme.md rename to keyboards/ymdk/melody96/readme.md index 16338e9ed3..a6bf470b32 100644 --- a/keyboards/melody96/readme.md +++ b/keyboards/ymdk/melody96/readme.md @@ -10,7 +10,7 @@ Make example for this keyboard (after setting up your build environment): - make melody96:default + make ymdk/melody96:default Flashing example for this keyboard: diff --git a/keyboards/melody96/rules.mk b/keyboards/ymdk/melody96/rules.mk similarity index 100% rename from keyboards/melody96/rules.mk rename to keyboards/ymdk/melody96/rules.mk