Fix parentheses in macros, and in general clean up quantum.h #5021

vomindoraan · 2019-01-31T14:56:33Z

Description

I noticed the GPIO macros in quantum.h suffer from the same bug with parentheses as in #4775. This PR fixes that, tweaks the macros a bit, and also improves their visual layout. Furthermore, I've made the indentation consistent (4 spaces for now, since that's what the file was already using). I've tweaked the preprocessor directives to be more consistent as well.

I recommend turning "Hide whitespace changes" on and reviewing this in side-by-side view, makes it easier to keep track of the changes.

Types of changes

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. (https://docs.qmk.fm/#/contributing)
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).

quantum/quantum.h

`string` arguments must not be parenthesized

drashna · 2019-02-01T20:48:19Z

@jackhumbert ?

vomindoraan · 2019-02-11T23:08:57Z

Resolved conflict with master.

yiancar · 2019-02-11T23:13:39Z

@vomindoraan thanks for making my ugly defines pretty:)

yiancar · 2019-02-15T16:26:01Z

@jackhumbert where aaare you?:p

drashna · 2019-02-16T00:48:17Z

Merge conflicts

vomindoraan · 2019-02-16T00:49:55Z

Huh, I don't see any conflicts.

drashna · 2019-02-16T00:51:01Z

Oh, ugh, it was for rebasing. 🗡

quantum/quantum.h

skullydazed · 2019-03-19T23:02:28Z

Can you please remove the reformatting? We no longer make changes like that because it hides the person who actually wrote the code. We consider this (very minor) refactoring.

vomindoraan · 2019-03-19T23:07:35Z

Sure thing. Do you mean just the indentation changes, or do you have other things in mind as well?

vomindoraan · 2019-05-09T13:54:16Z

Bumping this, hope to see a merge soon.

vomindoraan · 2019-06-08T21:25:25Z

Bump.

vomindoraan · 2019-07-09T04:43:57Z

Monthly bump + update to latest master. 😄

* Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once

* make silverbullet44 * comment edit * venderID * Fix parentheses in macros, and in general clean up quantum.h (#5021) * Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once * alt+tab * copy from master:silverbullet44 * adjust for pull request * clang-format * create info.json * Delete new_project.sh * Update keyboards/silverbullet44/keymaps/default/config.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.c Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Apply suggestions from Maxr1998 * format default keymap * Apply suggestions from Maxr1998 (#2) * Apply suggestions from fauxpark * fix readme.md * Apply suggestion from Maxr1998. (custom_keycode to MO(_ADJUST)) * I became a tricky! Hahaha!! * Add original keymap made by FKML * deleated at config.h * Changed Copyright * Delete // Defines the keycodes used by our macros in process_record_user //enum custom_keycodes { // QMKBEST = SAFE_RANGE, // QMKURL //}; * Delete bool alt_pressed = false; * Delete ADJUST * Delete / * Delete void matrix_scan_user(void) { } void led_set_user(uint8_t usb_led) { } * Change Copyright's year. * Delete adjust * Delete adjust * Delete adjust * 列挙型に変更 * Enclose keymap with ```. * Delete #define _______ KC_TRNS #define XXXXXXX KC_NO * Fix indentation. * Delete some rows. * Aligned columns of ''readme.md''. * I got god's keymap...hahaha:) * Update keyboards/silverbullet44/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/silverbullet44/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> Co-authored-by: Konstantin Đorđević <vomindoraan@gmail.com> Co-authored-by: Max Rumpf <max.rumpf1998@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>

* make silverbullet44 * comment edit * venderID * Fix parentheses in macros, and in general clean up quantum.h (qmk#5021) * Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once * alt+tab * copy from master:silverbullet44 * adjust for pull request * clang-format * create info.json * Delete new_project.sh * Update keyboards/silverbullet44/keymaps/default/config.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.c Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Apply suggestions from Maxr1998 * format default keymap * Apply suggestions from Maxr1998 (qmk#2) * Apply suggestions from fauxpark * fix readme.md * Apply suggestion from Maxr1998. (custom_keycode to MO(_ADJUST)) * I became a tricky! Hahaha!! * Add original keymap made by FKML * deleated at config.h * Changed Copyright * Delete // Defines the keycodes used by our macros in process_record_user //enum custom_keycodes { // QMKBEST = SAFE_RANGE, // QMKURL //}; * Delete bool alt_pressed = false; * Delete ADJUST * Delete / * Delete void matrix_scan_user(void) { } void led_set_user(uint8_t usb_led) { } * Change Copyright's year. * Delete adjust * Delete adjust * Delete adjust * 列挙型に変更 * Enclose keymap with ```. * Delete #define _______ KC_TRNS #define XXXXXXX KC_NO * Fix indentation. * Delete some rows. * Aligned columns of ''readme.md''. * I got god's keymap...hahaha:) * Update keyboards/silverbullet44/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/silverbullet44/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> Co-authored-by: Konstantin Đorđević <vomindoraan@gmail.com> Co-authored-by: Max Rumpf <max.rumpf1998@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>

* Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once

* make silverbullet44 * comment edit * venderID * Fix parentheses in macros, and in general clean up quantum.h (qmk#5021) * Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once * alt+tab * copy from master:silverbullet44 * adjust for pull request * clang-format * create info.json * Delete new_project.sh * Update keyboards/silverbullet44/keymaps/default/config.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.c Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Update keyboards/silverbullet44/silverbullet44.h Co-Authored-By: Max Rumpf <max.rumpf1998@gmail.com> * Apply suggestions from Maxr1998 * format default keymap * Apply suggestions from Maxr1998 (qmk#2) * Apply suggestions from fauxpark * fix readme.md * Apply suggestion from Maxr1998. (custom_keycode to MO(_ADJUST)) * I became a tricky! Hahaha!! * Add original keymap made by FKML * deleated at config.h * Changed Copyright * Delete // Defines the keycodes used by our macros in process_record_user //enum custom_keycodes { // QMKBEST = SAFE_RANGE, // QMKURL //}; * Delete bool alt_pressed = false; * Delete ADJUST * Delete / * Delete void matrix_scan_user(void) { } void led_set_user(uint8_t usb_led) { } * Change Copyright's year. * Delete adjust * Delete adjust * Delete adjust * 列挙型に変更 * Enclose keymap with ```. * Delete #define _______ KC_TRNS #define XXXXXXX KC_NO * Fix indentation. * Delete some rows. * Aligned columns of ''readme.md''. * I got god's keymap...hahaha:) * Update keyboards/silverbullet44/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/silverbullet44/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> Co-authored-by: Konstantin Đorđević <vomindoraan@gmail.com> Co-authored-by: Max Rumpf <max.rumpf1998@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>

* Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once

Fix up GPIO macros

2762e7b

vomindoraan force-pushed the quantum_macros_fixup branch from 9314e36 to f31270e Compare January 31, 2019 15:05

vomindoraan commented Jan 31, 2019

View reviewed changes

quantum/quantum.h Show resolved Hide resolved

quantum/quantum.h Show resolved Hide resolved

quantum/quantum.h Show resolved Hide resolved

vomindoraan added 4 commits January 31, 2019 17:03

Fix up send string macros

fd56d76

`string` arguments must not be parenthesized

Fix up miscellaneous macros

7936c00

Make indentation uniform (4 spaces)

d027f37

Make #ifdef vs #if defined usage consistent

bd5bbc3

vomindoraan force-pushed the quantum_macros_fixup branch 2 times, most recently from d386ad1 to a309217 Compare January 31, 2019 16:05

Reorder standard includes

8987f72

vomindoraan force-pushed the quantum_macros_fixup branch from a309217 to 8987f72 Compare January 31, 2019 16:09

drashna requested review from jackhumbert, ezuk, fredizzimo and skullydazed February 1, 2019 00:49

drashna added enhancement core labels Feb 1, 2019

drashna approved these changes Feb 1, 2019

View reviewed changes

Merge branch 'master' into quantum_macros_fixup

8f17065

drashna requested changes Feb 16, 2019

View reviewed changes

quantum/quantum.h Outdated Show resolved Hide resolved

quantum/quantum.h Outdated Show resolved Hide resolved

Merge branch 'master' into quantum_macros_fixup

74986fc

vomindoraan added 2 commits July 9, 2019 07:07

Merge branch 'master' into quantum_macros_fixup

da12c81

Replace include guard with #pragma once

ffb7b62

jackhumbert approved these changes Jul 9, 2019

View reviewed changes

drashna merged commit c690604 into qmk:master Jul 9, 2019

vomindoraan mentioned this pull request Jul 9, 2019

Ensure setPinInput actually sets input high-Z #6237

Merged

13 tasks

vomindoraan deleted the quantum_macros_fixup branch July 9, 2019 23:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix parentheses in macros, and in general clean up quantum.h #5021

Fix parentheses in macros, and in general clean up quantum.h #5021

vomindoraan commented Jan 31, 2019 •

edited

Loading

drashna commented Feb 1, 2019

vomindoraan commented Feb 11, 2019

yiancar commented Feb 11, 2019

yiancar commented Feb 15, 2019

drashna commented Feb 16, 2019

vomindoraan commented Feb 16, 2019

drashna commented Feb 16, 2019

skullydazed commented Mar 19, 2019

vomindoraan commented Mar 19, 2019

vomindoraan commented May 9, 2019

vomindoraan commented Jun 8, 2019

vomindoraan commented Jul 9, 2019 •

edited

Loading

Fix parentheses in macros, and in general clean up quantum.h #5021

Fix parentheses in macros, and in general clean up quantum.h #5021

Conversation

vomindoraan commented Jan 31, 2019 • edited Loading

Description

Types of changes

Checklist:

drashna commented Feb 1, 2019

vomindoraan commented Feb 11, 2019

yiancar commented Feb 11, 2019

yiancar commented Feb 15, 2019

drashna commented Feb 16, 2019

vomindoraan commented Feb 16, 2019

drashna commented Feb 16, 2019

skullydazed commented Mar 19, 2019

vomindoraan commented Mar 19, 2019

vomindoraan commented May 9, 2019

vomindoraan commented Jun 8, 2019

vomindoraan commented Jul 9, 2019 • edited Loading

vomindoraan commented Jan 31, 2019 •

edited

Loading

vomindoraan commented Jul 9, 2019 •

edited

Loading