diff options
author | fauxpark <fauxpark@gmail.com> | 2019-10-10 21:48:37 +1100 |
---|---|---|
committer | Joel Challis <git@zvecr.com> | 2019-10-10 11:48:37 +0100 |
commit | ed1bf3afa25d7e7674df7e8618dfaf243de3058b (patch) | |
tree | cfe0e4331b8f00d09706dd0aaa8fef2cac3f61d7 /quantum/template/base | |
parent | 528ddb79871b76d026c4b2ca8b1debf9feb1e751 (diff) |
Prevent clang-format messing up placeholder tokens within keyboard templates (#6790)
* Use .template file extension for keyboard template files
* Filter out .template files completely before passing to clang-format
* Undo file extension stuff; just ignore quantum/template dir
Diffstat (limited to 'quantum/template/base')
-rw-r--r-- | quantum/template/base/keyboard.h (renamed from quantum/template/base/template.h) | 10 | ||||
-rw-r--r-- | quantum/template/base/keymaps/default/keymap.c | 23 | ||||
-rw-r--r-- | quantum/template/base/keymaps/default/readme.md | 2 |
3 files changed, 26 insertions, 9 deletions
diff --git a/quantum/template/base/template.h b/quantum/template/base/keyboard.h index 595da73c60..2e531b1fd4 100644 --- a/quantum/template/base/template.h +++ b/quantum/template/base/keyboard.h @@ -25,5 +25,11 @@ * The second converts the arguments into a two-dimensional array which * represents the switch matrix. */ -#define LAYOUT(k00, k01, k02, k10, k11) \ - { {k00, k01, k02}, {k10, KC_NO, k11}, } +#define LAYOUT( \ + k00, k01, k02, \ + k10, k11 \ +) \ +{ \ + { k00, k01, k02 }, \ + { k10, KC_NO, k11 }, \ +} diff --git a/quantum/template/base/keymaps/default/keymap.c b/quantum/template/base/keymaps/default/keymap.c index 308cb92a77..3508055b78 100644 --- a/quantum/template/base/keymaps/default/keymap.c +++ b/quantum/template/base/keymaps/default/keymap.c @@ -16,11 +16,16 @@ #include QMK_KEYBOARD_H // Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { QMKBEST = SAFE_RANGE, QMKURL }; +enum custom_keycodes { + QMKBEST = SAFE_RANGE, + QMKURL +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(/* Base */ - KC_A, KC_1, KC_H, KC_TAB, KC_SPC), + [0] = LAYOUT( /* Base */ + KC_A, KC_1, KC_H, + KC_TAB, KC_SPC + ), }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -45,8 +50,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void matrix_init_user(void) {} +void matrix_init_user(void) { + +} -void matrix_scan_user(void) {} +void matrix_scan_user(void) { -void led_set_user(uint8_t usb_led) {} +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/quantum/template/base/keymaps/default/readme.md b/quantum/template/base/keymaps/default/readme.md index 21aa663d55..e052ed80f1 100644 --- a/quantum/template/base/keymaps/default/readme.md +++ b/quantum/template/base/keymaps/default/readme.md @@ -1 +1 @@ -# The default keymap for %KEYBOARD%
\ No newline at end of file +# The default keymap for %KEYBOARD% |