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

Timber Wolf - updated keymaps, fixed info.json #9787

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Timber Wolf - updated keymaps, fixed info.json #9787

merged 3 commits into from
Jul 28, 2020

Conversation

Croktopus
Copy link
Contributor

@Croktopus Croktopus commented Jul 21, 2020

Description

Primary goal is to fix the info.json file, as an issue caused the layouts to show improperly in QMK Configurator - I believe I identified and fixed the problem (fingers crossed) which i think was caused by Y values that were .25 off or what have you being in the wrong row.

Also made small changes to some keymaps, switched to hardware pwm, and made more preparations for VIA

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

@zvecr zvecr added keyboard via Adds via keymap and/or updates keyboard for via support labels Jul 21, 2020
@zvecr zvecr requested a review from a team July 21, 2020 21:18
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

LAYOUT_all renders with overlaps, @noroadsleft any issues with that?

image

@zvecr zvecr requested review from noroadsleft and a team July 21, 2020 21:24
@Croktopus
Copy link
Contributor Author

Yeah, since the keys overlap on the pcb it seemed right and proper. hopefully it's alright, though if necessary i can nudge them over

keyboards/metamechs/timberwolf/config.h Outdated Show resolved Hide resolved
@noroadsleft
Copy link
Member

Yeah, since the keys overlap on the pcb it seemed right and proper. hopefully it's alright, though if necessary i can nudge them over

For LAYOUT_all, I'd prefer to have the highlighted section nudged over so it doesn't overlap.

image

Also, the key that's KC_PENT in the highlight also has a key beneath it at the same coordinates (two keys with the same x and y values). I'd like that fixed.

LAYOUT_all is explicitly not required to be a layout that is possible to build (admittedly, this is a very obscure section of the docs):

When defining multiple layouts you should have a base layout, named LAYOUT_all, that supports all possible switch positions on your matrix, even if that layout is impossible to build physically.

@Croktopus
Copy link
Contributor Author

thanks for the feedback - I've made some changes, but it's more than a little sloppy looking. Is it legal to use keys that are like .5 or .75 width?

@Croktopus
Copy link
Contributor Author

People are gonna start getting their keyboards in a few days, anyone available to give it a final review and merge?

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.

@noroadsleft noroadsleft requested a review from a team July 27, 2020 07:21
Co-authored-by: Ryan <fauxpark@gmail.com>
@noroadsleft noroadsleft merged commit 296f267 into qmk:master Jul 28, 2020
@noroadsleft
Copy link
Member

Thanks!

Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jul 31, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (156 commits)
  Add info.json for Jiran keyboard (qmk#9857)
  [Docs] Update Japanese translation of feature_ps2_mouse.md. (qmk#9815)
  [Docs] Update Japanese translation of feature_mouse_keys.md. (qmk#9809)
  [Keyboard] Add new keyboard ks63 handwired (qmk#9712)
  [keyboard] Add [n]2 support (qmk#9862)
  Timber Wolf - updated via keymap, reduced eeprom writing from backlight code (qmk#9876)
  [Docs] Update Japanese translation of feature_macros.md. (qmk#9767)
  [Keyboard] Add KPRepublic BM40HSRGB keyboard (qmk#9860)
  [Docs] Japanese translation of docs/internals_gpio_control.md (qmk#9751)
  [Docs] Japanese translation of docs/other_eclipse.md (qmk#9755)
  Added Via keymap to Spaceman 2% Milk (qmk#9484)
  Add via configuration for adelheid. (qmk#9830)
  Added Via-enabled keymap for Physix (qmk#9825)
  [Docs] Japanese translation of docs/one_shot_keys.md (qmk#9754)
  [Docs] Japanese translation of docs/mod_tap.md (qmk#9753)
  [Docs] Japanese translation of docs/how_keyboards_work.md (qmk#9683)
  [Docs] Japanese translation of docs/how_a_matrix_works.md (qmk#9682)
  [Keyboard] add bear_face/v2 (qmk#9642)
  [Keyboard] PH Arisu (qmk#9612)
  Timber Wolf - updated keymaps, fixed info.json (qmk#9787)
  ...
nicocesar pushed a commit to nicocesar/qmk_firmware that referenced this pull request Aug 12, 2020
* updated keymaps, fixed info.json

* fixed info.json overlaps

* Update keyboards/metamechs/timberwolf/config.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants