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

ADPenrose Obi Layout Macro Conversion and Addition #20445

Merged
merged 4 commits into from
Apr 15, 2023
Merged

ADPenrose Obi Layout Macro Conversion and Addition #20445

merged 4 commits into from
Apr 15, 2023

Conversation

noroadsleft
Copy link
Member

Description

  • converts LAYOUT_all to data-driven
  • adds a layout macro for 6.25u Spacebar with reference keymap

cc @ADPenrose (keyboard maintainer)

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • 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).

@noroadsleft noroadsleft requested a review from a team April 13, 2023 20:01
@ADPenrose
Copy link
Contributor

ADPenrose commented Apr 15, 2023 •
edited
Loading

Loved the matrix diagram! Is it there only for reference or does it have a function in QMK?

Also, did you move the matrix data to the info.json file manually?

@drashna
Copy link
Member

drashna commented Apr 15, 2023 •
edited
Loading

Loved the matrix diagram! Is it there only for reference or does it have a function in QMK?

Also, did you move the matrix data to the info.json file manually?

Pretty sure it's from qmk info (with -m), and -f json for the matrix., but manually edited.

@noroadsleft
Copy link
Member Author

Loved the matrix diagram! Is it there only for reference or does it have a function in QMK?

It's only for reference. I'm doing a whole series of similar PRs, and it's basically impossible to tell at the beginning what layout options are supported. Some may only support two layouts like this one (split or 6.25u Spacebar); others may support dozens or even hundreds. That being the case, I thought it wise to leave some trace of what's supported on a board, even if I don't implement every option.

Also, did you move the matrix data to the info.json file manually?

qmk generate-info-json takes care of this. I instruct that command to output the generated data to a new file (-o dd.json, specifically), which I then edit - partially with a Python script and partially by hand - before copying the relevant data back to info.json, deleting the data from the relevant <keyboard>.c and <keyboard>.h files - or the files themselves if I can - at the same time.

@noroadsleft noroadsleft merged commit d732b0b into qmk:master Apr 15, 2023
@noroadsleft noroadsleft deleted the kb_layouts/adpenrose_obi branch April 15, 2023 17:36
@ADPenrose
Copy link
Contributor

Thank y'all for the info! <3

sudish added a commit to sudish/qmk_firmware that referenced this pull request Apr 16, 2023
@sudish
Merge remote-tracking branch 'upstream/master'
4130864 
* upstream/master: (73 commits)
  [Keyboard] Add Kalakos Bahrnob65 (qmk#20424)
  Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460)
  [Keyboard] Add zoom75 wired (qmk#20396)
  [Keyboard] Add dymium65 (qmk#20257)
  Lotus58 glow (qmk#20386)
  ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
  Add hardware information momokai keyboards (qmk#20434)
  4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (qmk#20414)
  [Keymap] Add paulomp90 lily58 keymap (qmk#20327)
  [Keymap] Add personal keymap for Lily58 (qmk#18735)
  [Keyboard] Fix h87 g2 VID conflict (qmk#20388)
  [Keymap] PHSC138 Keymap for Atom47 (qmk#18768)
  [Keyboard] add kb2040 flavor of gherkin (qmk#18360)
  [Keyboard] ymdk/id75 (qmk#19967)
  fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (qmk#20420)
  4pplet/bootleg/rev_a Layout Macro Conversion and Addition (qmk#20400)
  4pplet/aekiso60 Layout Macro Conversion and Additions (qmk#20399)
  Reject info.json at keymap level (qmk#20408)
  Bump anothrNick/github-tag-action from 1.61.0 to 1.62.0 (qmk#20407)
  [Keyboard] Update angle65 VID/PID (qmk#20401)
  ...
rodrigob pushed a commit to rodrigob/qmk_firmware that referenced this pull request Apr 18, 2023
@noroadsleft @rodrigob
ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
6336350 
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
quangd42 pushed a commit to quangd42/qmk_firmware that referenced this pull request Apr 20, 2023
@noroadsleft @quangd42
ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
5e9b000 
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
queyenth pushed a commit to queyenth/qmk_firmware that referenced this pull request Apr 21, 2023
@noroadsleft @queyenth
ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
00e2f75 
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
stratosgear pushed a commit to stratosgear/qmk_firmware that referenced this pull request Apr 26, 2023
@noroadsleft @stratosgear
ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
8c439c7 
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
struckmb pushed a commit to struckmb/qmk_firmware that referenced this pull request May 1, 2023
@noroadsleft @struckmb
ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
f0db33f 
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
SjB added a commit to SjB/qmk_firmware that referenced this pull request May 12, 2023
@SjB
Merge branch 'master' into sjb/all-keyboard
6422db5 
* master:
  NK Plus (qmk#20392)
  [Docs] Fix suggested code pattern when a specific mod-mask is required. (qmk#20512)
  [Docs] Remove combo count from array (qmk#20511)
  Add QuadrumLabs Delta (qmk#20409)
  Adds Docs option for ArduinoIDE's example `ArduinoISP` (qmk#20486)
  GMMK 2 volume up/down Fn keys are backwards in default mapping (qmk#20476)
  Fix typo in `feature_wpm.md` title (qmk#20464)
  [Keyboard] Add Kalakos Bahrnob65 (qmk#20424)
  Tidy up stray RGB_DISABLE_TIMEOUT references (qmk#20460)
  [Keyboard] Add zoom75 wired (qmk#20396)
  [Keyboard] Add dymium65 (qmk#20257)
  Lotus58 glow (qmk#20386)
  ADPenrose Obi Layout Macro Conversion and Addition (qmk#20445)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

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

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