Skip to content

Update docs: QMK Introduction#3404

Merged
jackhumbert merged 4 commits intoqmk:masterfrom
evantravers:update_docs
Jul 15, 2018
Merged

Update docs: QMK Introduction#3404
jackhumbert merged 4 commits intoqmk:masterfrom
evantravers:update_docs

Conversation

@evantravers
Copy link
Contributor

  1. There was an artifact of the old build system on here… a reference to Makefile instead of rules.mk

  2. Reword the config.h section

This section didn't include the possibility of a user config.h, and it
wasn't clear exactly how the settings override works.

I think this was a typo, or perhaps an older way to handle it.
This section didn't include the possibility of a user `config.h`, and it
wasn't clear exactly how the settings override works.
@evantravers
Copy link
Contributor Author

@fredizzimo… would you mind making sure this is true and makes sense?

@drashna drashna requested review from drashna and fredizzimo July 14, 2018 20:47
Copy link
Contributor

@fredizzimo fredizzimo left a comment

Choose a reason for hiding this comment

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

This looks good from my point of view.

But I would possibly reduce to boilerplate to just #pragma once, since it's supported by all our compilers there's much less risks of making mistakes with it.

Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

In the "Basic QMK Structure", it would be a good idea to add the Userspace structure too.
That's namely rules.mk, readme.md, and config.h.

@drashna mentioned it'd be good to have a mention of the userspace in
the QMK structure section. Rather than rewrite the docs on userspace, I
chose to link to the existing documentation.
According to @fredizzimo, this is a safer and easier way to handle the
boilerplate.
@evantravers
Copy link
Contributor Author

@fredizzimo I've adjusted the boilerplate and the docs around it. I am correct in believing you don't need the #endif anymore?

@drashna I added a mention of the userspace to the section describing basic QMK structure. I just made a bare mention of it, and linked to the page of the docs describing the feature.

Copy link
Member

@drashna drashna 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

@jackhumbert
Copy link
Member

Awesome - this should jump-start our switch to #pragma once. Thanks!

@jackhumbert jackhumbert merged commit c5c112a into qmk:master Jul 15, 2018
@evantravers
Copy link
Contributor Author

@jackhumbert @fredizzimo would it be worthwhile to migrate some of the popular "default" keymaps to use #pragma once? I'll guess many people will most likely just cp default <newfolder> and not even read the docs till later.

@drashna
Copy link
Member

drashna commented Jul 15, 2018

Yeah, I think it would be. But more importantly, it would be best to change the template's default:
https://github.com/qmk/qmk_firmware/blob/master/quantum/template/base/keymaps/default/config.h

evantravers added a commit to evantravers/qmk_firmware that referenced this pull request Jul 15, 2018
Making sure this is consistent with qmk#3404
@evantravers
Copy link
Contributor Author

@drashna good idea… I didn't even know that was there. Opened a new PR for that one: #3415

drashna pushed a commit that referenced this pull request Jul 16, 2018
* Update template config.h with `#pragma once`

Making sure this is consistent with #3404

* Move to `#pragma once` for the other templates
alexey-danilov pushed a commit to alexey-danilov/qmk_firmware that referenced this pull request Jul 27, 2018
* Update template config.h with `#pragma once`

Making sure this is consistent with qmk#3404

* Move to `#pragma once` for the other templates
filoxo pushed a commit to filoxo/qmk_firmware that referenced this pull request Aug 27, 2018
* Update template config.h with `#pragma once`

Making sure this is consistent with qmk#3404

* Move to `#pragma once` for the other templates
ChrissiQ pushed a commit to ChrissiQ/qmk_firmware that referenced this pull request Sep 25, 2018
* Update template config.h with `#pragma once`

Making sure this is consistent with qmk#3404

* Move to `#pragma once` for the other templates
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* Update template config.h with `#pragma once`

Making sure this is consistent with qmk#3404

* Move to `#pragma once` for the other templates
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.

4 participants