Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create KBDFans directory #5025

Merged
merged 19 commits into from
Feb 4, 2019
Merged

Create KBDFans directory #5025

merged 19 commits into from
Feb 4, 2019

Conversation

mechmerlin
Copy link
Contributor

@mechmerlin mechmerlin commented Jan 31, 2019

Description

Created a kbdfans directory and moved in *most of their boards. This was done to better categorize and sort thru their boards. Not all of their boards begin with kbd.....

This will also allow us to use the ?filter=kbdfans in QMK Configurator to allow kbdfans to display an easily parse-able list of keyboards.

Boards left out, are the dz60 and tada68 as these are fairly popular boards. Everyone and their mother seems to own one. I'd prefer to make some kind of announcement before doing this as people's QMK Configurator keymap jsons will break. I'm sure there are others but I wanted to make sure that non kbd.... boards are in fact kbdfans boards.

Types of changes

  • Core
  • Bugfix
  • New Feature
  • Enhancement/Optimization
  • Keyboard (addition or update)
  • Keymap/Layout/Userspace (addition or update)
  • Documentation

Issues Fixed or Closed by this PR

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document. (https://docs.qmk.fm/#/contributing)
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DEFAULT_FOLDER uses the keyboards folder as its base.
KEYBOARD_<keyboard> preprocessor macros do the same.

If folders move, these have to be checked and updated to match the new folder structure.

These three changes will fix the compile job and Travis CI should pass.

diff --git a/keyboards/kbdfans/kbd75/kbd75.h b/keyboards/kbdfans/kbd75/kbd75.h
index 0798ad099..8e6f09450 100644
--- a/keyboards/kbdfans/kbd75/kbd75.h
+++ b/keyboards/kbdfans/kbd75/kbd75.h
@@ -3,11 +3,11 @@

 #include "quantum.h"

-#ifdef KEYBOARD_kbd75_rev1
+#ifdef KEYBOARD_kbdfans_kbd75_rev1
     #include "rev1.h"
 #endif

-#ifdef KEYBOARD_kbd75_rev2
+#ifdef KEYBOARD_kbdfans_kbd75_rev2
     #include "../rev1/rev1.h"
     #include "rev2.h"
 #endif
diff --git a/keyboards/kbdfans/kbd75/rules.mk b/keyboards/kbdfans/kbd75/rules.mk
index ae49271ab..5c4617131 100644
--- a/keyboards/kbdfans/kbd75/rules.mk
+++ b/keyboards/kbdfans/kbd75/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = kbd75/rev1
+DEFAULT_FOLDER = kbdfans/kbd75/rev1

Every besides that looks good to me.

@mechmerlin
Copy link
Contributor Author

ahh crap, I thought I labeled this a WIP!!

shoo shoo!

@mechmerlin mechmerlin changed the title Create KBDFans directory WIP - Create KBDFans directory Jan 31, 2019
@mechmerlin mechmerlin changed the title WIP - Create KBDFans directory Create KBDFans directory Feb 2, 2019
@mechmerlin
Copy link
Contributor Author

@noroadsleft alright I think this has all the changes I wanted to do!

keyboards/kbdfans/kbd66/readme.md Outdated Show resolved Hide resolved
noroadsleft and others added 2 commits February 1, 2019 23:00
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
@drashna
Copy link
Member

drashna commented Feb 2, 2019

@mechmerlin This ready to be merged?

@mechmerlin
Copy link
Contributor Author

@mechmerlin This ready to be merged?

@drashna yes it is!

@drashna
Copy link
Member

drashna commented Feb 4, 2019

Thanks!

@drashna drashna merged commit b49dbf9 into qmk:master Feb 4, 2019
@mechmerlin mechmerlin deleted the feature/kbdfans_dir branch February 15, 2019 03:48
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Feb 16, 2019
* move over kbd19x into the kbdfans directory

* move over kbd4x into the kbdfans directory

* move kbd66 into the kbdfans directory

* move the kbd6x into the kbdfans directory

* move kbd8x into the kbdfans directory

* move kbd75 into the kbdfans directory

* move kbd67 into kbdfans directory

* add a fairly sparse readme for kbdfans directory

* update make instructions for keyboards and add the Complete Newbs Guide to readmes that was missing it

* get kbd75 compiling again

* remove repetitive #defines of KC_NO and KC_TRNS when QMK_KEYBOARD_H is already included in KBD75

* add links to kbdfans readme

* fix some readme formatting

* there is no reason to have two different keymaps with such a small difference, condensing to one

* turning on backlights by default

* enable backlight by default for kbd66

* noticed that the kbd75 had caps lock led code in every keymap. Moved it out to the keyboard.c so everyone can partake.

* Update keyboards/kbdfans/kbd66/readme.md

Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>

* update readme link ordering
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
* move over kbd19x into the kbdfans directory

* move over kbd4x into the kbdfans directory

* move kbd66 into the kbdfans directory

* move the kbd6x into the kbdfans directory

* move kbd8x into the kbdfans directory

* move kbd75 into the kbdfans directory

* move kbd67 into kbdfans directory

* add a fairly sparse readme for kbdfans directory

* update make instructions for keyboards and add the Complete Newbs Guide to readmes that was missing it

* get kbd75 compiling again

* remove repetitive #defines of KC_NO and KC_TRNS when QMK_KEYBOARD_H is already included in KBD75

* add links to kbdfans readme

* fix some readme formatting

* there is no reason to have two different keymaps with such a small difference, condensing to one

* turning on backlights by default

* enable backlight by default for kbd66

* noticed that the kbd75 had caps lock led code in every keymap. Moved it out to the keyboard.c so everyone can partake.

* Update keyboards/kbdfans/kbd66/readme.md

Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>

* update readme link ordering
@mrsendyyk
Copy link
Contributor

Boards left out, are the dz60 and tada68 as these are fairly popular boards. Everyone and their mother seems to own one. I'd prefer to make some kind of announcement before doing this as people's QMK Configurator keymap jsons will break. I'm sure there are others but I wanted to make sure that non kbd.... boards are in fact kbdfans boards.

#10135

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants