From 27ec6674304412fb6f5499dbf0874dcf7b5524c6 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Fri, 11 Feb 2022 05:46:03 +0800 Subject: [PATCH] move id80 and id75 to v1 to accommodate for id75 v2 and id80 v3 (#15992) * move id80 to a v1 to acommondate for v2 and a future v3 * move id75 to v1 * fix manufacturer and product fields, enable backlight * move user keymap * Fix DEFAULT_FOLDER * Update build command Co-authored-by: zvecr --- keyboards/idobao/id75/{ => v1}/config.h | 4 ++-- keyboards/idobao/id75/{ => v1}/info.json | 0 keyboards/idobao/id75/{ => v1}/readme.md | 2 +- keyboards/idobao/id75/{ => v1}/rules.mk | 6 +++--- keyboards/idobao/id75/{id75.c => v1/v1.c} | 2 +- keyboards/idobao/id75/{id75.h => v1/v1.h} | 0 keyboards/idobao/id80/{ => v1}/ansi/config.h | 0 .../idobao/id80/{ => v1}/ansi/keymaps/default/keymap.c | 0 .../idobao/id80/{ => v1}/ansi/keymaps/default/readme.md | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/config.h | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/keymap.c | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/readme.md | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/rules.mk | 0 keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/keymap.c | 0 .../idobao/id80/{ => v1/ansi}/keymaps/rverst/readme.md | 0 .../idobao/id80/{ => v1/ansi}/keymaps/rverst/rverst.json | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/keymap.c | 0 keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/rules.mk | 0 keyboards/idobao/id80/{ => v1}/ansi/readme.md | 0 keyboards/idobao/id80/{ => v1}/ansi/rules.mk | 0 keyboards/idobao/id80/{ => v1}/config.h | 0 keyboards/idobao/id80/{ => v1}/info.json | 0 keyboards/idobao/id80/{ => v1}/iso/config.h | 0 keyboards/idobao/id80/{ => v1}/iso/keymaps/default/keymap.c | 0 .../idobao/id80/{ => v1}/iso/keymaps/default/readme.md | 0 keyboards/idobao/id80/{ => v1}/iso/keymaps/via/keymap.c | 0 keyboards/idobao/id80/{ => v1}/iso/keymaps/via/rules.mk | 0 keyboards/idobao/id80/{ => v1}/iso/readme.md | 0 keyboards/idobao/id80/{ => v1}/iso/rules.mk | 0 keyboards/idobao/id80/{ => v1}/readme.md | 4 ++-- keyboards/idobao/id80/{ => v1}/rules.mk | 2 +- keyboards/idobao/id80/{id80.c => v1/v1.c} | 2 +- keyboards/idobao/id80/{id80.h => v1/v1.h} | 0 33 files changed, 11 insertions(+), 11 deletions(-) rename keyboards/idobao/id75/{ => v1}/config.h (98%) rename keyboards/idobao/id75/{ => v1}/info.json (100%) rename keyboards/idobao/id75/{ => v1}/readme.md (96%) rename keyboards/idobao/id75/{ => v1}/rules.mk (72%) rename keyboards/idobao/id75/{id75.c => v1/v1.c} (97%) rename keyboards/idobao/id75/{id75.h => v1/v1.h} (100%) rename keyboards/idobao/id80/{ => v1}/ansi/config.h (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/default/keymap.c (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/default/readme.md (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/config.h (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/keymap.c (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/readme.md (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/rules.mk (100%) rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/keymap.c (100%) rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/readme.md (100%) rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/rverst.json (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/keymap.c (100%) rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/rules.mk (100%) rename keyboards/idobao/id80/{ => v1}/ansi/readme.md (100%) rename keyboards/idobao/id80/{ => v1}/ansi/rules.mk (100%) rename keyboards/idobao/id80/{ => v1}/config.h (100%) rename keyboards/idobao/id80/{ => v1}/info.json (100%) rename keyboards/idobao/id80/{ => v1}/iso/config.h (100%) rename keyboards/idobao/id80/{ => v1}/iso/keymaps/default/keymap.c (100%) rename keyboards/idobao/id80/{ => v1}/iso/keymaps/default/readme.md (100%) rename keyboards/idobao/id80/{ => v1}/iso/keymaps/via/keymap.c (100%) rename keyboards/idobao/id80/{ => v1}/iso/keymaps/via/rules.mk (100%) rename keyboards/idobao/id80/{ => v1}/iso/readme.md (100%) rename keyboards/idobao/id80/{ => v1}/iso/rules.mk (100%) rename keyboards/idobao/id80/{ => v1}/readme.md (93%) rename keyboards/idobao/id80/{ => v1}/rules.mk (95%) rename keyboards/idobao/id80/{id80.c => v1/v1.c} (97%) rename keyboards/idobao/id80/{id80.h => v1/v1.h} (100%) diff --git a/keyboards/idobao/id75/config.h b/keyboards/idobao/id75/v1/config.h similarity index 98% rename from keyboards/idobao/id75/config.h rename to keyboards/idobao/id75/v1/config.h index ffe0bb7011..caaf7f75dc 100644 --- a/keyboards/idobao/id75/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -23,8 +23,8 @@ along with this program. If not, see . #define VENDOR_ID 0x6964 // ID #define PRODUCT_ID 0x0075 #define DEVICE_VER 0x0001 -#define MANUFACTURER Generic -#define PRODUCT Idobo +#define MANUFACTURER IDOBAO +#define PRODUCT ID75 /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/idobao/id75/info.json b/keyboards/idobao/id75/v1/info.json similarity index 100% rename from keyboards/idobao/id75/info.json rename to keyboards/idobao/id75/v1/info.json diff --git a/keyboards/idobao/id75/readme.md b/keyboards/idobao/id75/v1/readme.md similarity index 96% rename from keyboards/idobao/id75/readme.md rename to keyboards/idobao/id75/v1/readme.md index 9f0f87360c..545f3121f7 100644 --- a/keyboards/idobao/id75/readme.md +++ b/keyboards/idobao/id75/v1/readme.md @@ -14,6 +14,6 @@ Hardware Availability: Make example for this keyboard (after setting up your build environment): - make idobao/id75:default + make idobao/id75/v1:default 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/idobao/id75/rules.mk b/keyboards/idobao/id75/v1/rules.mk similarity index 72% rename from keyboards/idobao/id75/rules.mk rename to keyboards/idobao/id75/v1/rules.mk index 721b7f5606..0ce4fe96d9 100644 --- a/keyboards/idobao/id75/rules.mk +++ b/keyboards/idobao/id75/v1/rules.mk @@ -11,10 +11,10 @@ BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use link time optimization diff --git a/keyboards/idobao/id75/id75.c b/keyboards/idobao/id75/v1/v1.c similarity index 97% rename from keyboards/idobao/id75/id75.c rename to keyboards/idobao/id75/v1/v1.c index 0a0e08cc32..992a292616 100644 --- a/keyboards/idobao/id75/id75.c +++ b/keyboards/idobao/id75/v1/v1.c @@ -13,4 +13,4 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "id75.h" +#include "v1.h" diff --git a/keyboards/idobao/id75/id75.h b/keyboards/idobao/id75/v1/v1.h similarity index 100% rename from keyboards/idobao/id75/id75.h rename to keyboards/idobao/id75/v1/v1.h diff --git a/keyboards/idobao/id80/ansi/config.h b/keyboards/idobao/id80/v1/ansi/config.h similarity index 100% rename from keyboards/idobao/id80/ansi/config.h rename to keyboards/idobao/id80/v1/ansi/config.h diff --git a/keyboards/idobao/id80/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/default/keymap.c rename to keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c diff --git a/keyboards/idobao/id80/ansi/keymaps/default/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/default/readme.md rename to keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/msf/config.h rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/msf/keymap.c rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/msf/readme.md rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/msf/rules.mk rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk diff --git a/keyboards/idobao/id80/keymaps/rverst/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c similarity index 100% rename from keyboards/idobao/id80/keymaps/rverst/keymap.c rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c diff --git a/keyboards/idobao/id80/keymaps/rverst/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md similarity index 100% rename from keyboards/idobao/id80/keymaps/rverst/readme.md rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md diff --git a/keyboards/idobao/id80/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json similarity index 100% rename from keyboards/idobao/id80/keymaps/rverst/rverst.json rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json diff --git a/keyboards/idobao/id80/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/via/keymap.c rename to keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c diff --git a/keyboards/idobao/id80/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk similarity index 100% rename from keyboards/idobao/id80/ansi/keymaps/via/rules.mk rename to keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk diff --git a/keyboards/idobao/id80/ansi/readme.md b/keyboards/idobao/id80/v1/ansi/readme.md similarity index 100% rename from keyboards/idobao/id80/ansi/readme.md rename to keyboards/idobao/id80/v1/ansi/readme.md diff --git a/keyboards/idobao/id80/ansi/rules.mk b/keyboards/idobao/id80/v1/ansi/rules.mk similarity index 100% rename from keyboards/idobao/id80/ansi/rules.mk rename to keyboards/idobao/id80/v1/ansi/rules.mk diff --git a/keyboards/idobao/id80/config.h b/keyboards/idobao/id80/v1/config.h similarity index 100% rename from keyboards/idobao/id80/config.h rename to keyboards/idobao/id80/v1/config.h diff --git a/keyboards/idobao/id80/info.json b/keyboards/idobao/id80/v1/info.json similarity index 100% rename from keyboards/idobao/id80/info.json rename to keyboards/idobao/id80/v1/info.json diff --git a/keyboards/idobao/id80/iso/config.h b/keyboards/idobao/id80/v1/iso/config.h similarity index 100% rename from keyboards/idobao/id80/iso/config.h rename to keyboards/idobao/id80/v1/iso/config.h diff --git a/keyboards/idobao/id80/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c similarity index 100% rename from keyboards/idobao/id80/iso/keymaps/default/keymap.c rename to keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c diff --git a/keyboards/idobao/id80/iso/keymaps/default/readme.md b/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md similarity index 100% rename from keyboards/idobao/id80/iso/keymaps/default/readme.md rename to keyboards/idobao/id80/v1/iso/keymaps/default/readme.md diff --git a/keyboards/idobao/id80/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c similarity index 100% rename from keyboards/idobao/id80/iso/keymaps/via/keymap.c rename to keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c diff --git a/keyboards/idobao/id80/iso/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk similarity index 100% rename from keyboards/idobao/id80/iso/keymaps/via/rules.mk rename to keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk diff --git a/keyboards/idobao/id80/iso/readme.md b/keyboards/idobao/id80/v1/iso/readme.md similarity index 100% rename from keyboards/idobao/id80/iso/readme.md rename to keyboards/idobao/id80/v1/iso/readme.md diff --git a/keyboards/idobao/id80/iso/rules.mk b/keyboards/idobao/id80/v1/iso/rules.mk similarity index 100% rename from keyboards/idobao/id80/iso/rules.mk rename to keyboards/idobao/id80/v1/iso/rules.mk diff --git a/keyboards/idobao/id80/readme.md b/keyboards/idobao/id80/v1/readme.md similarity index 93% rename from keyboards/idobao/id80/readme.md rename to keyboards/idobao/id80/v1/readme.md index bcc4a25d7d..8a26378b3b 100644 --- a/keyboards/idobao/id80/readme.md +++ b/keyboards/idobao/id80/v1/readme.md @@ -12,7 +12,7 @@ A 75% hotswap keyboard from IDOBAO. Make example for this keyboard (after setting up your build environment): - make idobao/id80/ansi:default + make idobao/id80/v1/ansi:default ## ISO support: @@ -22,6 +22,6 @@ Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment): - make idobao/id80/iso:default + make idobao/id80/v1/iso:default 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/idobao/id80/rules.mk b/keyboards/idobao/id80/v1/rules.mk similarity index 95% rename from keyboards/idobao/id80/rules.mk rename to keyboards/idobao/id80/v1/rules.mk index f988be4e29..0baebd07fc 100644 --- a/keyboards/idobao/id80/rules.mk +++ b/keyboards/idobao/id80/v1/rules.mk @@ -1,5 +1,5 @@ # Defalt to the ansi version -DEFAULT_FOLDER = idobao/id80/ansi +DEFAULT_FOLDER = idobao/id80/v1/ansi # MCU name MCU = atmega32u4 diff --git a/keyboards/idobao/id80/id80.c b/keyboards/idobao/id80/v1/v1.c similarity index 97% rename from keyboards/idobao/id80/id80.c rename to keyboards/idobao/id80/v1/v1.c index 4a06660de9..7147b6163e 100644 --- a/keyboards/idobao/id80/id80.c +++ b/keyboards/idobao/id80/v1/v1.c @@ -13,4 +13,4 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "id80.h" +#include "v1.h" diff --git a/keyboards/idobao/id80/id80.h b/keyboards/idobao/id80/v1/v1.h similarity index 100% rename from keyboards/idobao/id80/id80.h rename to keyboards/idobao/id80/v1/v1.h