diff options
| author | QMK Bot <hello@qmk.fm> | 2022-02-06 17:38:30 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-02-06 17:38:30 +0000 |
| commit | 41bbb34287faabd330d86595915ca78173503177 (patch) | |
| tree | fbc9a52b7c62a200c95536997ce698622ac215e5 | |
| parent | 65a4ad11771d7cb6e2a7abf6f253bb25e6dac38a (diff) | |
| parent | 87199eb2f50522b7b91352e4b1c76d6db3f14af3 (diff) | |
| download | qmk_firmware-41bbb34287faabd330d86595915ca78173503177.tar.gz qmk_firmware-41bbb34287faabd330d86595915ca78173503177.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | docs/data_driven_config.md | 2 | ||||
| -rw-r--r-- | docs/hardware_keyboard_guidelines.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md index c2ad4fed8f..38fb5dbf14 100644 --- a/docs/data_driven_config.md +++ b/docs/data_driven_config.md @@ -74,7 +74,7 @@ Whenever QMK generates a complete `info.json` it extracts information from `conf If you are not sure how to edit this file or are not comfortable with Python [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and someone can help you with this part. -### Add code to generate it +### Add code to generate it :id=add-code-to-generate-it The final piece of the puzzle is providing your new option to the build system. This is done by generating two files: diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md index be55356b17..6df86fb0fb 100644 --- a/docs/hardware_keyboard_guidelines.md +++ b/docs/hardware_keyboard_guidelines.md @@ -87,6 +87,7 @@ The `config.h` files can also be placed in sub-folders, and the order in which t * `keyboards/top_folder/sub_1/sub_2/config.h` * `keyboards/top_folder/sub_1/sub_2/sub_3/config.h` * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/config.h` + * [`.build/objs_<keyboard>/src/info_config.h`](data_driven_config.md#add-code-to-generate-it) see [Data Driven Configuration](data_driven_config.md) * `users/a_user_folder/config.h` * `keyboards/top_folder/keymaps/a_keymap/config.h` * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h` |