You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

226 lines
18 KiB

  1. # PR checklists
  2. This is a non-exhaustive checklist of what the QMK Collaborators will be checking when reviewing submitted PRs.
  3. If there are any inconsistencies with these recommendations, you're best off [creating an issue](https://github.com/qmk/qmk_firmware/issues/new) against this document, or getting in touch with a QMK Collaborator on [Discord](https://discord.gg/Uq7gcHh).
  4. ## Requirements for all PRs
  5. - PR should be submitted using a non-`master` branch on the source repository
  6. - this does not mean you target a different branch for your PR, rather that you're not working out of your own master branch
  7. - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message)
  8. - PRs should contain the smallest amount of modifications required for a single change to the codebase
  9. - multiple keyboards at the same time is not acceptable
  10. - exception: keymaps for a single user targeting multiple keyboards and/or userspace is acceptable
  11. - **the smaller the PR, the higher likelihood of a quicker review, higher likelihood of quicker merge, and less chance of conflicts**
  12. - newly-added directories and filenames must be lowercase
  13. - the lowercase requirement may be relaxed if upstream sources originally had uppercase characters (e.g. LUFA, ChibiOS, or imported files from other repositories etc.)
  14. - if there is valid justification (i.e. consistency with existing core files etc.) this can be relaxed
  15. - a board designer naming their keyboard with uppercase letters is not enough justification
  16. - valid license headers on all `*.c` and `*.h` source files
  17. - GPL2/GPL3 recommended for consistency
  18. - an example GPL2+ license header may be copied (and author modified) from the bottom of this document
  19. - other licenses are permitted, however they must be GPL-compatible and must allow for redistribution. Using a different license will almost certainly delay a PR getting merged
  20. - missing license headers will prevent PR merge due to ambiguity with license compatibility
  21. - simple assignment-only `rules.mk` files should not need a license header - where additional logic is used in an `*.mk` file a license header may be appropriate
  22. - QMK Codebase "best practices" followed
  23. - this is not an exhaustive list, and will likely get amended as time goes by
  24. - `#pragma once` instead of `#ifndef` include guards in header files
  25. - no "old-school" or other low-level GPIO/I2C/SPI functions may be used -- must use QMK abstractions unless justifiable (and laziness is not valid justification)
  26. - timing abstractions should be followed too:
  27. - `wait_ms()` instead of `_delay_ms()` (remove `#include <util/delay.h>` too)
  28. - `timer_read()` and `timer_read32()` etc. -- see [timer.h](https://github.com/qmk/qmk_firmware/blob/master/platforms/timer.h) for the timing APIs
  29. - if you think a new abstraction is useful, you're encouraged to:
  30. - prototype it in your own keyboard until it's feature-complete
  31. - discuss it with QMK Collaborators on Discord
  32. - refactor it as a separate core change
  33. - remove your specific copy in your board
  34. - fix all merge conflicts before opening the PR (in case you need help or advice, reach out to QMK Collaborators on Discord)
  35. - PR submitters will need to keep up-to-date with their base branch, resolving conflicts along the way
  36. ## Keymap PRs
  37. - `#include QMK_KEYBOARD_H` preferred to including specific board files
  38. - prefer layer `enum`s to `#define`s
  39. - require custom keycode `enum`s to `#define`s, first entry must have ` = SAFE_RANGE`
  40. - terminating backslash (`\`) in lines of LAYOUT macro parameters is superfluous and should be removed
  41. - some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap
  42. ## Keyboard PRs
  43. Closed PRs (for inspiration, previous sets of review comments will help you eliminate ping-pong of your own reviews):
  44. https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
  45. - keyboard moves within the repository *must* go through the `develop` branch instead of `master`, so as to ensure compatibility for users
  46. - `data/mappings/keyboard_aliases.hjson` must be updated to reflect the move, so users with pre-created configurator keymap.json files continue to detect the correct keyboard
  47. - keyboard updates and refactors (eg. to data driven) *must* go through `develop` to reduce `master` -> `develop` merge conflicts
  48. - PR submissions from a `kbfirmware` export (or equivalent) will not be accepted unless converted to new QMK standards -- try `qmk import-kbfirmware` first
  49. - `info.json`
  50. - With the move to [data driven](https://docs.qmk.fm/#/data_driven_config) keyboard configuration, we encourage contributors to utilise as many features as possible of the info.json [schema](https://github.com/qmk/qmk_firmware/blob/master/data/schemas/keyboard.jsonschema).
  51. - the mandatory elements for a minimally complete `info.json` at present are:
  52. - valid URL
  53. - valid maintainer
  54. - valid USB VID/PID and device version
  55. - displays correctly in Configurator (press Ctrl+Shift+I to preview local file, turn on fast input to verify ordering)
  56. - `layout` definitions must include matrix positions, so that `LAYOUT` macros can be generated at build time
  57. - should use standard definitions if applicable
  58. - use the Community Layout macro names where they apply (preferred above `LAYOUT`/`LAYOUT_all`)
  59. - If the keyboard only has a single electrical/switch layout:
  60. - use `LAYOUT` as your macro name, unless a community layout already exists
  61. - If the keyboard has multiple electrical/switch layouts:
  62. - include a `LAYOUT_all` which specifies all possible layout positions in the electrical matrix
  63. - use alternate layout names for all other possible layouts, preferring community layout names if an equivalent is available (e.g. `LAYOUT_tkl_ansi`, `LAYOUT_ortho_4x4` etc.)
  64. - Microcontroller and bootloader
  65. - Diode Direction (if not using direct pins)
  66. - the following are required to be configured in `info.json` if necessary
  67. - Direct pin configuration
  68. - Backlight Configuration (where applicable)
  69. - Split keyboard configuration (where applicable)
  70. - Encoder Configuration
  71. - Bootmagic Configuration
  72. - LED Indicator Configuration
  73. - `readme.md`
  74. - must follow the [template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
  75. - flash command is present, and has `:flash` at end
  76. - valid hardware availability link (unless handwired) -- private groupbuys are okay, but one-off prototypes will be questioned. If open-source, a link to files should be provided.
  77. - clear instructions on how to reset the board into bootloader mode
  78. - a picture about the keyboard and preferably about the PCB, too
  79. - images are not to be placed in the `qmk_firmware` repository
  80. - images should be uploaded to an external image hosting service, such as [imgur](https://imgur.com/).
  81. - if imgur is used, images should be resized appropriately: append "h" to the image url i.e. [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) becomes [https://i.imgur.com/vqgE7Ok**h**.jpg](https://i.imgur.com/vqgE7Okh.jpg)
  82. - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Okh.jpg](https://i.imgur.com/vqgE7Okh.jpg) when using imgur
  83. - `rules.mk`
  84. - removed `MIDI_ENABLE`, `FAUXCLICKY_ENABLE` and `HD44780_ENABLE`
  85. - modified `# Enable Bluetooth with the Adafruit EZ-Key HID` -> `# Enable Bluetooth`
  86. - no `(-/+size)` comments related to enabling features
  87. - remove the list of alternate bootloaders if one has been specified
  88. - no re-definitions of the default MCU parameters if same value, when compared to the equivalent MCU in [mcu_selection.mk](https://github.com/qmk/qmk_firmware/blob/master/builddefs/mcu_selection.mk)
  89. - no "keymap only" features enabled
  90. - `COMBO_ENABLE`
  91. - `ENCODER_MAP_ENABLE`
  92. - keyboard `config.h`
  93. - no `#define DESCRIPTION`
  94. - no Magic Key Options, MIDI Options or HD44780 configuration
  95. - user preference configurable `#define`s need to be moved to keymap `config.h`
  96. - default values should not be redefined, such as `DEBOUNCE`, RGB related settings, etc.
  97. - feature specific documentation contains most default values
  98. - `grep` or alternative tool can be used to search for default values in core directories (e.g. `grep -r "define DEBOUNCE" quantum`)
  99. - no copy/pasted comment blocks explaining a feature and/or its caveats -- this is what the docs are for
  100. - `Force NKRO to be enabled ... toggled again during a power-up`
  101. - commented-out unused defines, such as RGB effects
  102. - no `#include "config_common.h`
  103. - no `#define MATRIX_ROWS/COLS`, unless necessary (e.g. a keyboard with a custom matrix)
  104. - bare minimum required code for a board to boot into QMK should be present
  105. - initialisation code for the matrix and critical devices
  106. - mirroring existing functionality of a commercial board (like custom keycodes and special animations etc.) should be handled through non-`default` keymaps
  107. - Vial-related files or changes will not be accepted, as they are not used by QMK firmware (no Vial-specific core code has been submitted or merged)
  108. - `<keyboard>.c`
  109. - empty `xxxx_xxxx_kb()` or other weak-defined default implemented functions removed
  110. - empty `xxxx_xxxx_user()` or other user-level functions are disallowed at the keyboard level and must be moved to keymaps
  111. - commented-out functions removed too
  112. - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](custom_quantum_functions.md?id=keyboard_pre_init_-function-documentation)
  113. - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](custom_matrix.md?id=lite)
  114. - prefer LED indicator [Configuration Options](feature_led_indicators.md?id=configuration-options) to custom `led_update_*()` implementations where possible
  115. - hardware that's enabled at the keyboard level and requires configuration such as OLED displays or encoders should have basic functionality implemented here
  116. - `<keyboard>.h`
  117. - `#include "quantum.h"` appears at the top
  118. - `LAYOUT` macros are no longer accepted and should instead be moved to `info.json`
  119. - keymap `config.h`
  120. - no duplication of `rules.mk` or `config.h` from keyboard
  121. - `keymaps/default/keymap.c`
  122. - `QMKBEST`/`QMKURL` example macros removed
  123. - if using `MO(1)` and `MO(2)` keycodes together to access a third layer, the [Tri Layer](https://docs.qmk.fm/#/feature_tri_layer) feature should be used, rather than manually implementing this using `layer_on/off()` and `update_tri_layer()` functions in the keymap's `process_record_user()`.
  124. - default (and via) keymaps should be "pristine"
  125. - bare minimum to be used as a "clean slate" for another user to develop their own user-specific keymap
  126. - standard layouts preferred in these keymaps, if possible
  127. - should use [encoder map feature](https://docs.qmk.fm/#/feature_encoders?id=encoder-map), rather than `encoder_update_user()`
  128. - default keymap should not enable VIA -- the VIA integration documentation requires a keymap called `via`
  129. - submitters can have a personal (or bells-and-whistles) keymap showcasing capabilities in the same PR but it shouldn't be embedded in the 'default' keymap
  130. - submitters can also have a "manufacturer-matching" keymap that mirrors existing functionality of the commercial product, if porting an existing board
  131. - Do not include VIA json files in the PR. These do not belong in the QMK repository as they are not used by QMK firmware -- they belong in the [VIA Keyboard Repo](https://github.com/the-via/keyboards)
  132. - Do not include KLE json files in the PR. These have no use within QMK.
  133. - Do not include source files from another keyboard or vendors keyboard folder. Including core files is fine.
  134. - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards that require it.
  135. - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
  136. Also, specific to ChibiOS:
  137. - **strong** preference to using existing ChibiOS board definitions.
  138. - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family
  139. - example: For an STM32L082KZ, given the similarity to an STM32L073RZ, you can use `BOARD = ST_NUCLEO64_L073RZ` in rules.mk
  140. - QMK is migrating to not having custom board definitions if at all possible, due to the ongoing maintenance burden when upgrading ChibiOS
  141. - New board definitions must not be embedded in a keyboard PR
  142. - See [Core PRs](#core-pr) below for the procedure for adding a new board to QMK
  143. - if a board definition is unavoidable, `board.c` must have a standard `__early_init()` (as per normal ChibiOS board defs) and an empty `boardInit()`:
  144. - see Arm/ChibiOS [early initialization](platformdev_chibios_earlyinit.md?id=board-init)
  145. - `__early_init()` should be replaced by either `early_hardware_init_pre()` or `early_hardware_init_post()` as appropriate
  146. - `boardInit()` should be migrated to `board_init()`
  147. ## Core PRs :id=core-pr
  148. - all core PRs must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline
  149. - as indicated above, the smallest set of changes to core components should be included in each PR
  150. - PRs containing multiple areas of change will be asked to be split up and raised separately
  151. - keyboard and keymap changes should only be included if they affect base keyboard builds, or the default-like `default`, `via`, `default_????` keymaps etc.
  152. - keymap modifications for anything other than the default-like keymaps **should not be included in the initial PR** in order to simplify the review process
  153. - the core PR submitter should submit a followup PR affecting other keymaps after initial PR merge
  154. - large-scale refactoring or consolidation PRs that affect other keymaps (such as renaming keycodes) should always be raised separately
  155. - any new boards adding support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey`
  156. - for new MCUs, a new "child" keyboard should be added that targets your newly-added MCU, so that builds can be verified
  157. - for new hardware support such as display panels, core-side matrix implementations, or other peripherals, an associated keymap should be provided
  158. - if an existing keymap exists that can leverage this functionality this may not be required (e.g. a new RGB driver chip, supported by the `rgb` keymap) -- consult with the QMK Collaborators on Discord to determine if there is sufficient overlap already
  159. - any features adding `_kb`/`_user` callbacks must return a `bool`, to allow for user override of keyboard-level callbacks.
  160. - where relevant, unit tests are strongly recommended -- they boost the confidence level that changes behave correctly
  161. - critical areas of the code -- such as the keycode handling pipeline -- will almost certainly require unit tests accompanying them to ensure current and future correctness
  162. - you should not be surprised if a QMK collaborator requests unit tests to be included in your PR if it's critical functionality
  163. - other requirements are at the discretion of QMK collaborators
  164. - core is a lot more subjective given the breadth of posted changes
  165. ---
  166. ## Notes
  167. For when people use their own `master` branch, post this after merge:
  168. ```
  169. For future reference, we recommend against committing to your `master` branch as you've done here, because pull requests from modified `master` branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but **NEVER** commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.
  170. There are instructions on how to keep your fork updated here:
  171. [**Best Practices: Your Fork's Master: Update Often, Commit Never**](https://docs.qmk.fm/#/newbs_git_using_your_master_branch)
  172. [Fixing Your Branch](https://docs.qmk.fm/#/newbs_git_resynchronize_a_branch) will walk you through fixing up your `master` branch moving forward. If you need any help with this just ask.
  173. Thanks for contributing!
  174. ```
  175. ## Review Process
  176. In general, we want to see two (or more) approvals that are meaningful (e.g. that have inspected code) before a PR will be considered for merge. These reviews are not limited to collaborators -- any community member willing to put in the time is welcomed (and encouraged). The only difference is that your checkmark won't be green, and that's fine!
  177. Additionally, PR reviews are something that is done in our free time. We are not paid nor compensated for the time we spend reviewing, as it is a labor of love. As such, this means that it can take time for us to get to your Pull Request. Things like family, or life can get in the way of us getting to PRs, and burnout is a serious concern. The QMK firmware repository averages 200 PRs opened and 200 PRs merged every month, so please have patience.
  178. ## Example GPLv2 Header
  179. ```
  180. /* Copyright 2021 Your Name (@yourgithub)
  181. *
  182. * This program is free software: you can redistribute it and/or modify
  183. * it under the terms of the GNU General Public License as published by
  184. * the Free Software Foundation, either version 2 of the License, or
  185. * (at your option) any later version.
  186. *
  187. * This program is distributed in the hope that it will be useful,
  188. * but WITHOUT ANY WARRANTY; without even the implied warranty of
  189. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  190. * GNU General Public License for more details.
  191. *
  192. * You should have received a copy of the GNU General Public License
  193. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  194. */
  195. ```
  196. Or, optionally, using [SPDX identifier](https://spdx.org/licenses/) instead:
  197. ```
  198. // Copyright 2021 Your Name (@yourgithub)
  199. // SPDX-License-Identifier: GPL-2.0-or-later
  200. ```