Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PCB Ruler updates #6584

Merged
merged 7 commits into from
Aug 21, 2019
Merged

PCB Ruler updates #6584

merged 7 commits into from
Aug 21, 2019

Conversation

noroadsleft
Copy link
Member

Description

Discovered QMK Configurator can't compile this. Investigated and discovered that it compiled fine from CLI because the default keymap was disabling CONSOLE_ENABLE at keyboard level, but Configurator was compiling with it enabled, as its API doesn't read keymap-level rules.mk files, which caused an error due to the USB Device Descriptor.

From https://yanfali.github.io/qmk_error_page/:

Compiling: tmk_core/common/mousekey.c                                                               [OK]      
Compiling: tmk_core/common/command.c                                                               tmk_core/common/command.c: In function ‘print_version’:
tmk_core/common/command.c:180:41: error: macro "XSTR" passed 2 arguments, but takes just 1
     print("DESC: " STR(DESCRIPTION) "\n");
                                         ^
<command-line>:0:12: error: expected ‘)’
 [ERRORS]  
 | 
 | 
 | 
tmk_core/rules.mk:377: recipe for target '.build/obj_the_ruler_qmk_api_tasks_test_compile/common/command.o' failed
make[1]: *** [.build/obj_the_ruler_qmk_api_tasks_test_compile/common/command.o] Error 1
Makefile:542: recipe for target 'the_ruler:qmk_api_tasks_test_compile' failed
make: *** [the_ruler:qmk_api_tasks_test_compile] Error 1
Make finished with errors

@noroadsleft
Move default keymap's rules to keyboard level
66b283d
@noroadsleft
Concatenate the two sets of rules
28d4fd1 
This sets CONSOLE_ENABLE to no, which was being set at the keymap level.
@noroadsleft
Wrap the USB Device Description in quotes
b97c891 
Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.
@noroadsleft
Linting
805bdfb 
- remove firmware size impacts
- remove trailing white space
- visual alignment of rules
@noroadsleft
Use QMK's pre-loaded default rules for atmega32u4
ead227e
@noroadsleft
Update readme
31a59d6 
- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links
@noroadsleft
Update header files to use #pragma once
26941e9
@noroadsleft noroadsleft requested a review from a team August 21, 2019 02:10
drashna
drashna approved these changes Aug 21, 2019
View reviewed changes
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.

Nice catch!

@drashna drashna merged commit 367eac2 into qmk:master Aug 21, 2019
@noroadsleft noroadsleft deleted the cf/the_ruler branch August 21, 2019 05:10
Acaki pushed a commit to Acaki/qmk_firmware that referenced this pull request Aug 25, 2019
@noroadsleft
[Keyboard] PCB Ruler updates (qmk#6584)
6da6a14 
* Move default keymap's rules to keyboard level

* Concatenate the two sets of rules

This sets CONSOLE_ENABLE to no, which was being set at the keymap level.

* Wrap the USB Device Description in quotes

Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.

* Linting

- remove firmware size impacts
- remove trailing white space
- visual alignment of rules

* Use QMK's pre-loaded default rules for atmega32u4

* Update readme

- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links

* Update header files to use #pragma once
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
@noroadsleft @doughsay
[Keyboard] PCB Ruler updates (qmk#6584)
9cc7406 
* Move default keymap's rules to keyboard level

* Concatenate the two sets of rules

This sets CONSOLE_ENABLE to no, which was being set at the keymap level.

* Wrap the USB Device Description in quotes

Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.

* Linting

- remove firmware size impacts
- remove trailing white space
- visual alignment of rules

* Use QMK's pre-loaded default rules for atmega32u4

* Update readme

- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links

* Update header files to use #pragma once
swanmatch pushed a commit to swanmatch/qmk_firmware that referenced this pull request Sep 3, 2019
@noroadsleft @drashna
[Keyboard] PCB Ruler updates (qmk#6584)
9b5caca 
* Move default keymap's rules to keyboard level

* Concatenate the two sets of rules

This sets CONSOLE_ENABLE to no, which was being set at the keymap level.

* Wrap the USB Device Description in quotes

Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.

* Linting

- remove firmware size impacts
- remove trailing white space
- visual alignment of rules

* Use QMK's pre-loaded default rules for atmega32u4

* Update readme

- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links

* Update header files to use #pragma once
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
@noroadsleft
[Keyboard] PCB Ruler updates (qmk#6584)
30ce1d0 
* Move default keymap's rules to keyboard level

* Concatenate the two sets of rules

This sets CONSOLE_ENABLE to no, which was being set at the keymap level.

* Wrap the USB Device Description in quotes

Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.

* Linting

- remove firmware size impacts
- remove trailing white space
- visual alignment of rules

* Use QMK's pre-loaded default rules for atmega32u4

* Update readme

- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links

* Update header files to use #pragma once
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
@noroadsleft @drashna
[Keyboard] PCB Ruler updates (qmk#6584)
27caa1d 
* Move default keymap's rules to keyboard level

* Concatenate the two sets of rules

This sets CONSOLE_ENABLE to no, which was being set at the keymap level.

* Wrap the USB Device Description in quotes

Some preventative maintenance. The firmware for the_ruler can't be compiled without this change if `CONSOLE_ENABLE = yes` because this string has a comma, which gets picked up as two arguments by the Command code, instead of one as it should be.

* Linting

- remove firmware size impacts
- remove trailing white space
- visual alignment of rules

* Use QMK's pre-loaded default rules for atmega32u4

* Update readme

- markdown formatting
- update Hardware Availability link (Maple Computing's site has disappeared)
- update Docs links

* Update header files to use #pragma once
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
bug enhancement keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@noroadsleft @drashna @fauxpark