diff --git a/keyboards/idobao/id80/rules.mk b/keyboards/idobao/id80/rules.mk index eea8b699005..f988be4e29f 100644 --- a/keyboards/idobao/id80/rules.mk +++ b/keyboards/idobao/id80/rules.mk @@ -1,5 +1,5 @@ # Defalt to the ansi version -DEFAULT_FOLDER = id80/ansi +DEFAULT_FOLDER = idobao/id80/ansi # MCU name MCU = atmega32u4 diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk index 096c25856e5..a0b43873cc4 100644 --- a/keyboards/marksard/treadstone32/rules.mk +++ b/keyboards/marksard/treadstone32/rules.mk @@ -15,4 +15,4 @@ AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. LEADER_ENABLE = no -DEFAULT_FOLDER = treadstone32/rev1 +DEFAULT_FOLDER = marksard/treadstone32/rev1 diff --git a/keyboards/marksard/treadstone48/treadstone48/.noci b/keyboards/marksard/treadstone48/.noci similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/.noci rename to keyboards/marksard/treadstone48/.noci diff --git a/keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c b/keyboards/marksard/treadstone48/common/glcdfont.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c rename to keyboards/marksard/treadstone48/common/glcdfont.c diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c rename to keyboards/marksard/treadstone48/common/oled_helper.c diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h rename to keyboards/marksard/treadstone48/common/oled_helper.h diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h b/keyboards/marksard/treadstone48/keymaps/default/config.h similarity index 94% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h rename to keyboards/marksard/treadstone48/keymaps/default/config.h index baa4ec84615..a5f68e7a2b2 100644 --- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h +++ b/keyboards/marksard/treadstone48/keymaps/default/config.h @@ -46,4 +46,4 @@ // If you plug in the USB on the right side, please enable MASTER_RIGHT // #define RHYMESTONE_RIGHTHAND -#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c" +#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c" diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c rename to keyboards/marksard/treadstone48/keymaps/default/keymap.c diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md b/keyboards/marksard/treadstone48/keymaps/default/readme.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md rename to keyboards/marksard/treadstone48/keymaps/default/readme.md diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/default/readme_jp.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md rename to keyboards/marksard/treadstone48/keymaps/default/readme_jp.md diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/keymaps/default/rules.mk similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk rename to keyboards/marksard/treadstone48/keymaps/default/rules.mk diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h similarity index 94% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h rename to keyboards/marksard/treadstone48/keymaps/like_jis/config.h index baa4ec84615..a5f68e7a2b2 100644 --- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h +++ b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h @@ -46,4 +46,4 @@ // If you plug in the USB on the right side, please enable MASTER_RIGHT // #define RHYMESTONE_RIGHTHAND -#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c" +#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c" diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c rename to keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md rename to keyboards/marksard/treadstone48/keymaps/like_jis/readme.md diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md rename to keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk rename to keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk diff --git a/keyboards/marksard/treadstone48/treadstone48/readme.md b/keyboards/marksard/treadstone48/readme.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/readme.md rename to keyboards/marksard/treadstone48/readme.md diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/.noci b/keyboards/marksard/treadstone48/rev1/.noci similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/.noci rename to keyboards/marksard/treadstone48/rev1/.noci diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/config.h rename to keyboards/marksard/treadstone48/rev1/config.h diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/info.json rename to keyboards/marksard/treadstone48/rev1/info.json diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h similarity index 95% rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h index 95b58c23db4..54ac1f2fce9 100644 --- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h +++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h @@ -48,4 +48,4 @@ // If you plug in the USB on the right side, please enable MASTER_RIGHT // #define RHYMESTONE_RIGHTHAND -#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c" +#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c" diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c rename to keyboards/marksard/treadstone48/rev1/rev1.c diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h b/keyboards/marksard/treadstone48/rev1/rev1.h similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h rename to keyboards/marksard/treadstone48/rev1/rev1.h diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk rename to keyboards/marksard/treadstone48/rev1/rules.mk diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev2/config.h rename to keyboards/marksard/treadstone48/rev2/config.h diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev2/info.json rename to keyboards/marksard/treadstone48/rev2/info.json diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c rename to keyboards/marksard/treadstone48/rev2/rev2.c diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h rename to keyboards/marksard/treadstone48/rev2/rev2.h diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk similarity index 100% rename from keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk rename to keyboards/marksard/treadstone48/rev2/rules.mk diff --git a/keyboards/marksard/treadstone48/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk similarity index 93% rename from keyboards/marksard/treadstone48/treadstone48/rules.mk rename to keyboards/marksard/treadstone48/rules.mk index 3bf42c85c64..67c171a7b74 100644 --- a/keyboards/marksard/treadstone48/treadstone48/rules.mk +++ b/keyboards/marksard/treadstone48/rules.mk @@ -22,4 +22,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow OLED_ENABLE = yes OLED_DRIVER = SSD1306 -DEFAULT_FOLDER = treadstone48/rev1 +DEFAULT_FOLDER = marksard/treadstone48/rev1 diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index ea7399dc756..3ae2e899ca2 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/rules.mk @@ -15,8 +15,8 @@ COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = 7skb/rev1 +DEFAULT_FOLDER = salicylic_acid3/7skb/rev1 diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk index 54265d22852..977ef5bb1d3 100644 --- a/keyboards/salicylic_acid3/getta25/rules.mk +++ b/keyboards/salicylic_acid3/getta25/rules.mk @@ -18,4 +18,4 @@ AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. OLED_ENABLE = no -DEFAULT_FOLDER = getta25/rev1 +DEFAULT_FOLDER = salicylic_acid3/getta25/rev1 diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk index 5427cabfa21..a6a85106751 100644 --- a/keyboards/salicylic_acid3/jisplit89/rules.mk +++ b/keyboards/salicylic_acid3/jisplit89/rules.mk @@ -19,4 +19,4 @@ AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = jisplit89/rev1 +DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1 diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index 6e848a28150..0e297ebf600 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -21,4 +21,4 @@ RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = naked48/rev1 +DEFAULT_FOLDER = salicylic_acid3/naked48/rev1 diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk index 46aef17c7aa..1aefc7b5953 100644 --- a/keyboards/salicylic_acid3/naked60/rules.mk +++ b/keyboards/salicylic_acid3/naked60/rules.mk @@ -19,4 +19,4 @@ AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = naked60/rev1 +DEFAULT_FOLDER = salicylic_acid3/naked60/rev1 diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk index 7de80383e1b..db027e3bda5 100644 --- a/keyboards/salicylic_acid3/naked64/rules.mk +++ b/keyboards/salicylic_acid3/naked64/rules.mk @@ -21,4 +21,4 @@ USE_I2C = no SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = naked64/rev1 +DEFAULT_FOLDER = salicylic_acid3/naked64/rev1 diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk index e31a7b5c7aa..c7920fdfe8a 100644 --- a/keyboards/salicylic_acid3/setta21/rules.mk +++ b/keyboards/salicylic_acid3/setta21/rules.mk @@ -21,6 +21,6 @@ USE_I2C = no RGB_MATRIX_ENABLE = no RGB_MATRIX_DRIVER = WS2812 -DEFAULT_FOLDER = setta21/rev1 +DEFAULT_FOLDER = salicylic_acid3/setta21/rev1 LAYOUTS = numpad_6x4 diff --git a/keyboards/ymd75/.noci b/keyboards/ymdk/ymd75/.noci similarity index 100% rename from keyboards/ymd75/.noci rename to keyboards/ymdk/ymd75/.noci diff --git a/keyboards/ymdk/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk index 756d20c54c1..ec66e0734a6 100644 --- a/keyboards/ymdk/ymd75/rules.mk +++ b/keyboards/ymdk/ymd75/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = ymd75/rev1 +DEFAULT_FOLDER = ymdk/ymd75/rev1