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.

Sign up for GitHub

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

Jump to bottom

Remove QMK_KEYBOARD_CONFIG_H from boards #7635

Merged
merged 1 commit into from
Dec 16, 2019
Merged

Remove QMK_KEYBOARD_CONFIG_H from boards #7635

merged 1 commit into from
Dec 16, 2019

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Dec 14, 2019

Description

Types of Changes

Causes issues when building with CTPC:

zvecr@zvecr-XPS-L322X:~/Desktop/qmk_firmware$ ./util/docker_build.sh keebio/levinson/rev2:default:flash
...
Compiling: tmk_core/protocol/chibios/main.c                                                         [OK]
Compiling: tmk_core/protocol/usb_descriptor.c                                                       [OK]
Compiling: tmk_core/protocol/chibios/usb_driver.c                                                   [OK]
Compiling: lib/chibios/os/common/startup/ARMCMx/compilers/GCC/crt1.c                               In file included from <command-line>:
./keyboards/keebio/levinson/rev2/config.h:22:10: error: #include expects "FILENAME" or <FILENAME>
 #include QMK_KEYBOARD_CONFIG_H
          ^~~~~~~~~~~~~~~~~~~~~
 [ERRORS]
 | 
 | 
 | 
tmk_core/rules.mk:377: recipe for target '.build/obj_keebio_levinson_rev2/lib/chibios/os/common/startup/ARMCMx/compilers/GCC/crt1.o' failed
make[1]: *** [.build/obj_keebio_levinson_rev2/lib/chibios/os/common/startup/ARMCMx/compilers/GCC/crt1.o] Error 1
Make finished with errors
Makefile:560: recipe for target 'keebio/levinson/rev2:default:flash' failed
make: *** [keebio/levinson/rev2:default:flash] Error 1

The next round will target breaking changes, and remove from user keymaps.

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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.
  • 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).

@zvecr zvecr requested a review from a team December 14, 2019 19:08
@zvecr zvecr added the keyboard label Dec 14, 2019
noroadsleft
noroadsleft approved these changes Dec 15, 2019
View reviewed changes
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.

Looks good to me.

@noroadsleft noroadsleft requested a review from a team December 15, 2019 20:42
@drashna
Copy link
Member

drashna commented Dec 16, 2019

May want to clean up:

qmk_firmware/build_keyboard.mk

Lines 387 to 388 in 3eb82e0

-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH_1)/config.h\" \
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \

@zvecr
Copy link
Member Author

zvecr commented Dec 16, 2019

@drashna that breaks keymap compilation for those which still include QMK_KEYBOARD_CONFIG_H.

My thoughts were that we would breaking change the removal of the define from keymaps, and at the same time remove it from build_keyboard.mk.

@drashna
Copy link
Member

drashna commented Dec 16, 2019

Sounds good

@drashna drashna merged commit 7cddcce into qmk:master Dec 16, 2019
benjaminmikiten added a commit to benjaminmikiten/qmk_firmware that referenced this pull request Dec 18, 2019
@benjaminmikiten
Merge branch 'master' into develop
db79a5b 
* master: (99 commits)
  [Keymap] Added userspace for d4mation. Included their keymap for the Atreus62 (qmk#7483)
  [Keymap] Custom user keymap for Think6.5 with LED range control (qmk#7603)
  [Keymap] CRKBD Custom Keymap - KidBrazil (qmk#7630)
  [Keymap] Add pico 70 keys keymap (qmk#7654)
  Tidy up dztech default keymaps and info.json (qmk#7608)
  Heisenberg handwired keyboard added (qmk#7643)
  [Keyboard] Added Filco Majestouch TKL Pegasus Hoof ISO Layout (qmk#7647)
  Ported J80 to QMK (qmk#7488)
  [Keyboard] Magnavox Videowriter conversion with Pro Micro (qmk#7634)
  [Docs] add japanese translation (basic part) (qmk#7461)
  Tidy up dztech rules.mk
  Relocate RGB keycode processing (qmk#7508)
  Move kwerdenker's personal keymap from RGB (qmk#7645)
  Remove QMK_KEYBOARD_CONFIG_H from boards (qmk#7635)
  Disable usb on slave half to resolve random 'lockup' (qmk#7649)
  [Core] Optimize matrix processing (qmk#7621)
  [Keymap] boy_314's satisfaction75 layout (qmk#7638)
  [Keyboard] XD68 65% ATMega32U4 based (qmk#7395)
  [keyboard] Plain60 cleanups (qmk#7644)
  update default h88 keymap (qmk#7646)
  ...
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
@zvecr @patrl
Remove QMK_KEYBOARD_CONFIG_H from boards (qmk#7635)
5f2f391
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@zvecr @HokieGeek
Remove QMK_KEYBOARD_CONFIG_H from boards (qmk#7635)
8893429
@zvecr zvecr deleted the feature/remove_QMK_KEYBOARD_CONFIG_H branch April 28, 2020 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft approved these changes

@drashna drashna drashna approved these changes

@nooges nooges nooges approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zvecr @drashna @nooges @noroadsleft