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

Merge from master branch #2

Merged
merged 47 commits into from
Jun 24, 2020
Merged

Merge from master branch #2

merged 47 commits into from
Jun 24, 2020

Conversation

wongyuhao
Copy link
Owner

Description

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

mtei and others added 30 commits June 20, 2020 21:02
* The TAG of the original document has been updated to facilitate future verification.

* The TAG of the original document has been updated to facilitate future verification.

* The TAG of the original document has been updated to facilitate future verification.
* now uses gcc 8.4
* fixes building boards with adafruit feather (in my case pancake)
* Change `led` to `led_matrix` in rgb_matrix_drivers

Is a minor change that only affects the driver file. 

However, this will allow somebody to run rgblight along side rgb matrix
using the ws2812 driver, as well.  Specifically, so you can use the
custom driver for rgblight to set a different pin (barring a change to
the `ws2812_setleds` function).  

Courtesy of discord conversion:
https://discordapp.com/channels/440868230475677696/568161140534935572/721555623191248906

* Change name to be super specific

* Update rgb_matrix_drivers.c
* added keyboard 5x12 to boardsource folder

* Apply suggestions from code review

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
* add japanese translation 'docs/ja/breaking_changes.md'

Note: this is cherry-pick from umi-umi's translation in PR #7248

* update ja/breaking_changes.md

* update ja/breaking_changes.md, add ja/breaking_changes_instructions.md

* translating ja/breaking_changes_instructions.md

* translating ja/breaking_changes_instructions.md

* translated ja/breaking_changes_instructions.md

* update ja/breaking_changes.md, ja/breaking_changes_instructions.md

Breaking change の訳語を「破壊的な変更」から「互換性を破る変更」に変更。
ただし、文中の用語としては、Breaking change をそのまま使用するむねドキュメントの導入部で
訳注でしめし、文中では、原語のまま使用する。

* update docs/ja/_summary.md

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

* Update docs/ja/breaking_changes_instructions.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes_instructions.md

Co-Authored-By: shela <[email protected]>

* update docs/ja/breaking_changes.md

* Update docs/ja/breaking_changes_instructions.md

Co-Authored-By: shela <[email protected]>

* Update docs/ja/breaking_changes_instructions.md

* Update docs/ja/breaking_changes_instructions.md

Co-Authored-By: shela <[email protected]>

* update docs/ja/breaking_changes_instructions.md

* update docs/ja/breaking_changes_instructions.md

* The base of the translation of docs/ja/breaking_changes_instructions.md was changed to 0.9.0.

* The base of the translation of docs/ja/breaking_changes.md was changed to 0.9.0.

* Update docs/ja/breaking_changes.md

Co-authored-by: s-show <[email protected]>

* update docs/ja/breaking_changes.md

* Update docs/ja/breaking_changes_instructions.md

Co-authored-by: shela <[email protected]>

* update docs/ja/breaking_changes.md

* update docs/ja/breaking_changes.md

Co-authored-by: umi-umi <[email protected]>
Co-authored-by: shela <[email protected]>
Co-authored-by: s-show <[email protected]>
* The TAGs of the original document has been updated to facilitate future verification.

 * docs/ja/driver_installation_zadig.md
 * docs/ja/feature_audio.md
 * docs/ja/feature_auto_shift.md
 * docs/ja/feature_bluetooth.md
 * docs/ja/hardware_avr.md
 * docs/ja/hardware_drivers.md
 * docs/ja/getting_started_make_guide.md

* The TAG of the original document has been updated to facilitate future verification.

* The TAG of the original document has been updated to facilitate future verification.

* update docs/ja/feature_tap_dance.md
* enable NKRO and keep consistent with bootmagic set to lite

* Update keyboards/1upkeyboards/1up60hse/rules.mk

Co-authored-by: Ryan <[email protected]>

Co-authored-by: Ryan <[email protected]>
* New custom 'super alt' keymap for the Drop ALT

* Improvements to 'super alt' keymap based on PR feedback

* Fix flickering LED caps lock bug

* Code cleanup from PR feedback

* Minor keymap layout cleanup
Co-authored-by: drashna <[email protected]>
Co-authored-by: noroadsleft <[email protected]>
* add feature_macros.md translation

* update based on comment

* update based on comment
* add feature_userspace.md translation

* update based on comment
* update docs/ja/newbs.md

* Update docs/ja/newbs.md

Co-authored-by: shela <[email protected]>

* Update docs/ja/newbs.md

Co-authored-by: shela <[email protected]>

* Update docs/ja/newbs.md

Co-authored-by: shela <[email protected]>

Co-authored-by: shela <[email protected]>
* update docs/ja/faq_build.md

* update docs/ja/faq_build.md to 0.9.10

* Update docs/ja/faq_build.md

Co-authored-by: shela <[email protected]>

Co-authored-by: shela <[email protected]>
hineybush and others added 17 commits June 22, 2020 12:25
* add h60 initial files

* add h60 image

* updated per PR request

* Update keyboards/hineybush/h60/keymaps/default/keymap.c

* Update keyboards/hineybush/h60/keymaps/kei/keymap.c

* Update keyboards/hineybush/h60/keymaps/via/keymap.c

* Update keyboards/hineybush/h60/h60.h

* Update keyboards/hineybush/h60/h60.h

* Update keyboards/hineybush/h60/rules.mk
- Add mouse buttons overlay layer
- Change button order
- Remove crkbd hardware specifics
- Add alternative base layer alphas
- Change title
- Add logo
- Reword intro text
- Add dev branch and new commits links
- Replace manual toc and remove anchors
- Unindent lists
- Reduce headings
- Update docs
- Build keymap as object instead of including .c file
- Add kle subset mapping images
- Add alternative mapping support
- Change default mapping for ortho_4x12
- Add split mapping for ortho_4x12
- Add contact section
- Add #pragma once to layout and keyboard config.h
* Update USB descriptors

* Update default keymap for readability

* Update readme description

* Update rules.mk build options, enable bootmagic and mousekey

* Add commented modern led code

* Add VIA keymap

* Update default keymap readme.md layout image

* Update keyboards/noxary/x268/rules.mk

remove incorrect comment

* Update keyboards/noxary/x268/x268.c

remove commented setPinOutput(B1)

* Update keyboards/noxary/x268/keymaps/default/readme.md

Flip order of layout image and title

* Update keyboards/noxary/x268/keymaps/via/readme.md

Flip order of layout image and title

* Update LED function to led_update_kb()
* Update readme.md description

* Enable bootmagic lite

* Update USB descriptor

* Add modern led code

* Update default keymap for readability

* Update default keymap readme with layout image

* Add VIA keymap

* Update keyboards/noxary/268_2/keymaps/default/readme.md

Flip order of layout image and title

* Update keyboards/noxary/268_2/keymaps/via/readme.md

Flip order of layout image and title

* Update keyboards/noxary/268_2/readme.md

bullet point keyboard maintainer

* Update keyboards/noxary/268_2/readme.md

Change list style
* add feature_layers.md translation

* update based on comment

* update based on comment

* update based on comment
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: steve <steve@stery>
* Initial fork of Sinc

* Setup keymaps, layouts, and encoders

* Add ANSI configurator layout

* Add ISO layout for configurator

* Add all layout option for configurator

* Fix spacing

* Remove extra line

* Remove unneeded ifdef
- online configurator keys were in the wrong location and needed to be fixed
- fixed a key being to high on the y position
* Create readme.md

* Add personal keymap

* Edit readme

* Reorganize layouts

* Update config.h

* Edit beep settings

* Apply suggestions from code review

* More suggestions from code review
* added 4pplet keyboards

added 4pplet keyboards

* Update keyboards/4pplet/aekiso60_rev_a/aekiso60_rev_a.h

* Update keyboards/4pplet/aekiso60_rev_a/config.h

* Update keyboards/4pplet/aekiso60_rev_a/config.h

* Update keyboards/4pplet/waffling60_rev_a/config.h

* Update keyboards/4pplet/aekiso60_rev_a/rules.mk

* Update keyboards/4pplet/aekiso60_rev_a/rules.mk

* Update keyboards/4pplet/waffling60_rev_a/rules.mk

* Update keyboards/4pplet/waffling60_rev_a/rules.mk

* Update keyboards/4pplet/steezy60_rev_a/config.h

* Delete info.json

* Delete info.json

* Delete info.json

* removed VIA_ENABLE

* Update config.h

* Update rules.mk

* Update steezy60_rev_a.h

* Update config.h

* Removed VIA_ENABLE

* Update keyboards/4pplet/steezy60_rev_a/rules.mk

* Removed VIA_ENABLE

* Update config.h

* Update config.h

* Update config.h

* adding fauxpark suggestion

* Update keyboards/4pplet/aekiso60_rev_a/config.h

* Update keyboards/4pplet/aekiso60_rev_a/rules.mk

* some updates recommended by noroadsleft, still work in progress 

some updates recommended by noroadsleft, still work in progress

* made directorys for revisions per noroadsleft  suggestion

made directorys for revisions per noroadsleft  suggestion

* renamed keyboard_pre_init_user to keyboard_pre_init_kb

* Update keyboards/4pplet/aekiso60/rev_a/config.h

* Update keyboards/4pplet/waffling60/rev_a/rev_a.c

* Update keyboards/4pplet/waffling60/rev_a/rev_a.c

* started working on refactoring led function for waffling60

* removed LED functionality

* Update keyboards/wilba_tech/zeal60/rules.mk

* Update keyboards/wilba_tech/zeal60/rules.mk

* Update keyboards/4pplet/waffling60/rev_a/rules.mk

* Update keyboards/4pplet/steezy60/rev_a/rules.mk

* Update keyboards/4pplet/aekiso60/keymaps/via/keymap.c

* Update keyboards/4pplet/aekiso60/rev_a/rules.mk
@wongyuhao wongyuhao merged commit 66a3485 into wongyuhao:master Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.