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

[Keyboard] Move/Rename to Hillside48, simplify default keymap #17210

Merged
merged 7 commits into from
Jul 2, 2022

Conversation

mmccoyd
Copy link
Contributor

@mmccoyd mmccoyd commented May 26, 2022

Description

Rename keyboard handwired/hillside/0_1 to handwired/hillside/48.

Simplify default keymap. Keymap changes:

  • Three layers + adjust
  • Numbers in a row
  • Tab and ` on left of base

Cleanup hillside keymap.json formating script.

Add SPLIT_USB_DETECT commented out option and note to keymap/default/config.h.

This rename deliberately does not touch hillside/readme.md. This way a separate PR adding hillside 52 can make the readme point to 48 and 52, without conflict between the two PRs.

Types of Changes

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

Issues Fixed or Closed by This PR

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).

@github-actions github-actions bot added keyboard keymap python via Adds via keymap and/or updates keyboard for via support labels May 26, 2022
@mmccoyd
Copy link
Contributor Author

mmccoyd commented May 26, 2022

An updated PR, now off develop to reflect recent develop changes of QK_BOOT and CAPS_WORD. Had been #16970 off master, which got hashed trying to move it to be off of develop.

@mmccoyd
Copy link
Contributor Author

mmccoyd commented May 26, 2022

Resolved new merge conflict with develop.

@mmccoyd mmccoyd mentioned this pull request Jun 13, 2022
14 tasks
@tzarc tzarc merged commit 2af2c5e into qmk:develop Jul 2, 2022
@mmccoyd mmccoyd deleted the hill48_rename branch July 2, 2022 21:59
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap python via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants