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

tokyo60 PR #2861

Merged
merged 4 commits into from
Aug 25, 2018
Merged

tokyo60 PR #2861

merged 4 commits into from
Aug 25, 2018

Conversation

alvn
Copy link
Contributor

@alvn alvn commented Apr 30, 2018

Adding tokyo60 to QMK -- Closed previous PR to updated readme.md

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.

We're trying to depreciate KEYMAPs in favor of LAYOUT, so if you could make these changes?

# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096
Copy link
Member

Choose a reason for hiding this comment

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

Do you know what bootloader it is using?

If so, then it would be best to specify that, rather than the size (there is some additional handling).

https://docs.qmk.fm/reference/config-options#avr-mcu-options

#include "quantum.h"

/* tokyo60 Keymap*/
#define TOKYO_KEYMAP( \
Copy link
Member

Choose a reason for hiding this comment

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

Could you use LAYOUT here, instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can do

@@ -0,0 +1,52 @@
#include "tokyo60.h"
Copy link
Member

Choose a reason for hiding this comment

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

Please use #include QMK_KEYBOARD_H instead of #include "tokyo60.h"

│█████│ Gui │ Alt │█████│█████│Space│█████│█████│█████│█████│█████│ Alt │ Gui │█████│█████│
└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
*/
TOKYO_KEYMAP(
Copy link
Member

Choose a reason for hiding this comment

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

Could you use LAYOUT here, instead?

│█████│ │ │█████│█████│█████│ │█████│█████│█████│█████│ │ │█████│█████│
└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
*/
TOKYO_KEYMAP(
Copy link
Member

Choose a reason for hiding this comment

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

Could you use LAYOUT here, instead?

KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_FN0, \
Copy link
Member

Choose a reason for hiding this comment

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

(Optional) You could use MO(1) here instead of the FN action, as it works out to be the same

@mechmerlin
Copy link
Contributor

If you're feeling up for it, could you also try making an info.json file so that the tokyo60 can work with https://config.qmk.fm

@ericywl
Copy link
Contributor

ericywl commented Apr 30, 2018

The info.json layout is the same as HHKB aside from 7u spacebar so could probably copy from keyboards/hhkb.

@drashna
Copy link
Member

drashna commented Aug 25, 2018

@alvn Any update on this?

@drashna
Copy link
Member

drashna commented Aug 25, 2018

Committing, so @mechmerlin can clean up the issues, and @alvn still gets the commit credit. (as this board is shipping soon, apparently)

@drashna drashna merged commit b806cc9 into qmk:master Aug 25, 2018
alexey-danilov pushed a commit to alexey-danilov/qmk_firmware that referenced this pull request Sep 6, 2018
* adding tokyo60 to qmk

* updating readme

* updating keymap and power consumption for mobile
dstrelau pushed a commit to dstrelau/qmk_firmware that referenced this pull request Sep 7, 2018
* master: (691 commits)
  mitosis: minor readme improvements (qmk#3762)
  add linebreaks to "Keyboard Maintainer:..." blocks where missing (qmk#3763)
  Keymap: Made changes to buswerks ortho_4x12 keymap (qmk#3757)
  Keyboard: Putting all my ducks in a row: Lightsaver (qmk#3758)
  Keyboard: Make a 1upkeyboards directory for visibility (qmk#3759)
  Helpful functions
  Keymap: initial migration of raffle planck (qmk#3748)
  Keyboard: Duck Jetfire QMK Support (qmk#3752)
  Keymap: initial migration of raffle 1up60rgb (qmk#3747)
  Keymap: PyroL Let's Split keymap + Alpha keymap modifications (qmk#3753)
  Keyboard: Change the default LAYOUT to LAYOUT_60_hhkb for tokyo60 (qmk#3751)
  Keyboard: Tokyo60 Cleanup: QMK Configurator support (qmk#3749)
  Keyboard: add tokyo60 (qmk#2861)
  Keyboard: Added gamepad layout to cospad (qmk#3714)
  Keymap: Added my keymap for Rorschach keyboard; minor updates to my Kinesis files. (qmk#3734)
  Keyboard: readme.md update (qmk#3581)
  Keymap: update to budi's tv44 (qmk#3587)
  Keyboard: introduce new default layout 68_ansi (qmk#3745)
  Keymap: Hold for MO and Tap for TG   (qmk#3742)
  Keyboard: add Wavelet (qmk#3739)
  ...
ChrissiQ pushed a commit to ChrissiQ/qmk_firmware that referenced this pull request Sep 25, 2018
* adding tokyo60 to qmk

* updating readme

* updating keymap and power consumption for mobile
yamad pushed a commit to yamad/qmk_firmware that referenced this pull request Apr 10, 2019
* adding tokyo60 to qmk

* updating readme

* updating keymap and power consumption for mobile
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.

4 participants