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.

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

nullbitsco/nibble Configurator rework #10814

Merged
merged 5 commits into from
Nov 1, 2020

Conversation

noroadsleft
Copy link
Member

Description

Apologies to @jaygreco for not getting around to reviewing #10769. I had actually found issues with the Configurator support a week or so ago, and I put together a fix that I never submitted. (I don't like having a whole bunch of PRs open at the same time.)

I took care to make sure this compiles the same as current master, because all the issues are limited to the Configurator support:

 noroadsleft  ~/qmk_firmware (master)
$ shasum nullbitsco_nibble_*.hex
5cdf805a538f4cd474e8b4d72e126f6c2562d212 *nullbitsco_nibble_default.hex
38eff0623cf95c004337e6b1dd9fccbc17bda79b *nullbitsco_nibble_iso.hex
aea87df4c0ac52d1626ca633e1ae825d405472bf *nullbitsco_nibble_via.hex

...

 noroadsleft  ~/qmk_firmware (cf/nullbitsco_nibble)
$ shasum nullbitsco_nibble_*.hex
5cdf805a538f4cd474e8b4d72e126f6c2562d212 *nullbitsco_nibble_default.hex
38eff0623cf95c004337e6b1dd9fccbc17bda79b *nullbitsco_nibble_iso.hex
aea87df4c0ac52d1626ca633e1ae825d405472bf *nullbitsco_nibble_via.hex

Types of Changes

  • Enhancement/optimization
  • Keyboard (addition or update)

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

... and update via keymap accordingly.
Only changes the white space.
Note: this commit makes the visual layout the ANSI layout with a split left Shift, instead of being the same as the ISO layout.
Make logically-unchanged code blocks similar in appearance to logically-changed blocks.
Move ISO Enter's object to its proper place.
@noroadsleft noroadsleft requested a review from a team October 31, 2020 19:53
@github-actions github-actions bot added keymap via Adds via keymap and/or updates keyboard for via support labels Oct 31, 2020
@jaygreco
Copy link
Contributor

I apologize for the blown-out JSON files. The VS code autoformatter went to town on them and expanded all of the lines in addition to adding tons of whitespace, and I didn't think much of it until seeing the changes in this PR.

@noroadsleft
Copy link
Member Author

I apologize for the blown-out JSON files. The VS code autoformatter went to town on them and expanded all of the lines in addition to adding tons of whitespace, and I didn't think much of it until seeing the changes in this PR.

I actually only format the files this way because they're easier to read/debug like this. I do know they tend to be auto-formatted in a lot of editors. It's not a problem for the API to consume them this way (it doesn't actually care), but if another human needs to read them, I find this way the best, but you have to format it manually. I actually don't use VSCode for largely this reason. (This sort of work is most of what I do in QMK.)

@drashna drashna merged commit 83eecdc into qmk:master Nov 1, 2020
@noroadsleft noroadsleft deleted the cf/nullbitsco_nibble branch November 2, 2020 09:28
oscarcarlsson pushed a commit to oscarcarlsson/qmk_firmware that referenced this pull request Nov 2, 2020
* nullbitsco/nibble: rework LAYOUT_all

... and update via keymap accordingly.

* compress info.json LAYOUT_all tree

Only changes the white space.

* rebuild info.json LAYOUT_all tree

Note: this commit makes the visual layout the ANSI layout with a split left Shift, instead of being the same as the ISO layout.

* unify code styles

Make logically-unchanged code blocks similar in appearance to logically-changed blocks.

* correct LAYOUT_iso key sequence

Move ISO Enter's object to its proper place.
ringmaster pushed a commit to ringmaster/qmk_firmware that referenced this pull request Nov 5, 2020
* nullbitsco/nibble: rework LAYOUT_all

... and update via keymap accordingly.

* compress info.json LAYOUT_all tree

Only changes the white space.

* rebuild info.json LAYOUT_all tree

Note: this commit makes the visual layout the ANSI layout with a split left Shift, instead of being the same as the ISO layout.

* unify code styles

Make logically-unchanged code blocks similar in appearance to logically-changed blocks.

* correct LAYOUT_iso key sequence

Move ISO Enter's object to its proper place.
barrettclark pushed a commit to barrettclark/qmk_firmware that referenced this pull request Nov 5, 2020
* upstream/master: (153 commits)
  [Keymap] add brandonschlack userspace and keymaps (qmk#10411)
  [Keymap] add ai03/polaris:mekberg (qmk#10508)
  CLI: Add `qmk clean` (qmk#10785)
  Adds support for XD84 Pro (qmk#9750)
  Freyr refactor (qmk#10833)
  KC60 refactor (qmk#10834)
  [Keyboard] Fixes for PloopyCo mouse and readmes (qmk#10841)
  Enable extrakeys, mousekeys for all VIA keymaps. (qmk#10740)
  Add OLED support for Riblee F411 (qmk#10778)
  NK65 eeprom compatibility with 128KB and 256KB (qmk#10804)
  Add support for Noxary Vulcan (qmk#10822)
  Enable media keys support for Canoe VIA keymap (qmk#10829)
  Phantom refactor (qmk#10805)
  `qmk info`: Add `--ascii` flag (qmk#10793)
  [Keymap] Corrected the dvorak layout for kinesis advantage (qmk#10808)
  [Keyboard] Fix keyboard matrix scan rate with F072 (qmk#10226)
  [Keyboard] nullbitsco/nibble Configurator rework (qmk#10814)
  [Keyboard] VIA Support: Exent 65% (qmk#10797)
  [Keyboard] Add keebsforall/freebird60 (qmk#10774)
  add 65_ansi_split_bs to default community layouts (qmk#10770)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants