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

Add VIA support to Tokyo60. #8362

Merged
merged 4 commits into from
Mar 11, 2020
Merged

Add VIA support to Tokyo60. #8362

merged 4 commits into from
Mar 11, 2020

Conversation

Zambumon
Copy link
Contributor

@Zambumon Zambumon commented Mar 9, 2020

This PR adds VIA support for the Tokyo60 Rev.1. In addition, the Tokyo60 Readme.md has been updated.

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

keyboards/tokyo60/tokyo60.h Outdated Show resolved Hide resolved
keyboards/tokyo60/readme.md Outdated Show resolved Hide resolved
keyboards/tokyo60/keymaps/via/keymap.c Show resolved Hide resolved
keyboards/tokyo60/config.h Outdated Show resolved Hide resolved
@noroadsleft noroadsleft requested a review from a team March 10, 2020 07:23
Copy link
Contributor Author

@Zambumon Zambumon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated code based on code review

Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

As an aside, we advise against committing to your master branch, because it can make it more difficult to keep your QMK fork up to date. We advise our users to use development branches for making changes, and only using the master branch for keeping up to date.

Your Fork’s Master: Update Often, Commit Never - QMK Firmware Docs

@noroadsleft noroadsleft requested a review from a team March 10, 2020 10:13
@zvecr
Copy link
Member

zvecr commented Mar 11, 2020

Thanks!

@zvecr zvecr merged commit 979ac0d into qmk:master Mar 11, 2020
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Mar 11, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (107 commits)
  Add VIA support to Tokyo60. (qmk#8362)
  fix kira80 matrix mapping and add more preset layouts (qmk#8361)
  Rename qmk json-keymap to qmk json2c (qmk#8372)
  format code according to conventions [skip ci]
  Feature: RGBLight layers (qmk#7768)
  Refactor Equinox PCB revisions (qmk#8266)
  Replace tab indentation with spaces in is0 default keymap. (qmk#8368)
  Fix layer debug calls (qmk#8370)
  [Keymap] Added HHKB Keymap and user config (qmk#8119)
  Refactor rgblight_reconfig.h (qmk#7773)
  [Keyboard] Palette1202 (qmk#7736)
  [Keyboard] Helix add split common option (qmk#7718)
  Enable bootmagic lite for CU80 (qmk#8363)
  [Keymap] Update personal keymap (qmk#8354)
  Remove NO_UART defines from config.h for V-USB boards (qmk#8351)
  [Keyboard] Add Kira 80 support (qmk#8342)
  [Keyboard] Add PRKL30 keyboard (qmk#8319)
  Update Dvorak, Colemak and Workman keycode aliases (qmk#8217)
  Move splittest I2C (qmk#8346)
  [Keymap] planck layout for kifinnsson (qmk#8324)
  ...
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request Apr 2, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Apr 10, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
jakeisnt pushed a commit to jakeisnt/qmk_firmware that referenced this pull request Aug 20, 2020
* VIA_ENABLE Tokyo60 PCB

* Update config.h

* Apply suggestions from code review

Co-Authored-By: James Young <[email protected]>

Co-authored-by: James Young <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants