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 upstream master branch #3

Merged
merged 937 commits into from
Oct 3, 2020
Merged

merge upstream master branch #3

merged 937 commits into from
Oct 3, 2020

Conversation

shinmiy
Copy link
Owner

@shinmiy shinmiy commented Oct 3, 2020

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

zvecr and others added 30 commits August 29, 2020 14:30
* Remove f072 backlight warning

* Remove f072 backlight warning from docs
* Update vusb to match 3rd endpoint.

- With the addition of qmk/v-usb#1 a 3rd endpoint (endpoint4) becomes available.
- We can assign mouse/extrakeys to that endpoint as its a desirable feature and leave rawhid and console to compete for the 2nd endpoint.

NOTE: The version of vusb.c in future branch is older than master. Just remember that it will need a #error if both raw_hid and console are enabled at the same time.

* Final Fixes

* Update tmk_core/protocol/vusb/vusb.c

* Update tmk_core/protocol/vusb/vusb.c

* Update tmk_core/protocol/vusb/usbconfig.h

* Update tmk_core/protocol/vusb/usbconfig.h

* Update tmk_core/protocol/vusb/usbconfig.h

* Update tmk_core/protocol/vusb/usbconfig.h

* Updated vusb submodule to latest commit
* Better handle LTO_ENABLE

Especially when calling from command line

* Replace LINK_TIME_OPTIMIZATION_ENABLE with LTO_ENABLE

* Remove long for LTO from show_options.mk
* Adding extern and declaration

* Change to mediated buffer read

* Adding raw byte read

* Restore write raw... D'Oh

* Working struct return

* Pack that struct

* Remove conditional packing and add example to docs

* Cleanup tab/spaces

* Update docs/feature_oled_driver.md

Prettify formatting

* Update drivers/oled/oled_driver.h

Prettify formatting
Some STM32 chips have STM32_DMA1_STREAM1 as the first DMA stream, others
(F4xx, F7xx, H7xx) have STM32_DMA1_STREAM0.  Instead of those names, use
STM32_DMA_STREAM(0), which should always give the first stm32_dma_stream_t
structure in the DMA streams array, so that the stream ID would be
calculated correctly.
* Remove support for Adafruit EZ-Key

* Update docs/ja/feature_bluetooth.md

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
* K-Type refactor

* Declare QMK in product name again

* Hopefully fix matrix scanning

* Maybe this time

* Partial (literally) RGB Matrix support

* Put RGB_MATRIX_ENABLE into rgb keymap for now

* Add ifdefs for RGB config

* Set layer 1 to actually be layer 1...

* Update keyboards/k_type/readme.md

* Put all RGB config in keymap for now

* Set SDB high?

* Before `rgb_matrix_init()` would be best

* User level, not keyboard

* Combating dropped keys

* Nope

* Readme for RGB keymap

* Remove custom matrix
* Allow joysticks to be used without analog pins

* change how analog/digital joysticks are specified
* Fixed Spanish keymap extra ES_DIAE symbol

`ES_DIAE` should be `S(ES_ACUT)` not `S(ES_GRV)`

* Update quantum/keymap_extras/keymap_spanish.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
* add

* ADD

* update

* update

* update

* update

* Update rgb_led.c

* Update rgb_led.c
* Add keymap for DQM Design Spin macropad

* changes from code review

* state -> layer_state

* Formatting fixes

* Formatting fixes

* Formatting fixes

* Formatting fixes

* Formatting fixes
* Add ddeklerk ortho_4x12 layout

* Add license header
* Change TMO to use layer_state_set_kb as is customary at the keyboard level.

This also factors out `process_indicator_led` to a separate method.
Update DZ60 Personal readme.md and keymap.c

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update keymap.c

* Update readme.md

* Update

* Update readme.md

* Update keymap.c

* Update readme.md
The recent change to unnest macros put the enter on the wrong matrix key. On the 1uprgb, the ANSI and ISO enters share the same cell as does the ANSI and ISO backslash.
* add ref_functions.md translation

* modify internal link for ja

* update based on comment

* reflect qmk#9892 change

* update based on comment

* update based on comment
* replaced #define PRODUCT_ID 0x1157 with #define PRODUCT_ID 0x2157 

replaced product id to distinguish rev2 from rev1.
bakingpy gave me permission through discord chat.
* update h88.c

* Update keyboards/hineybush/h88/h88.c
* Fixed the LED layout for the bm60rgb

* Added underglow support
* Added bm60rgb keymap

* Fix copyright
Update ai03 Soyuz readme.md and keymap.c

* Update readme.md

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md
gwillad and others added 27 commits October 1, 2020 18:38
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com>
…/OTG control (qmk#10460)

Co-authored-by: s-ol <s-ol@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* first pass at fixing the key labeling

* second pass of fixing key labeling

* third pass of this key naming

* another pass of changing key naming

* another pass

* another pass

* another pass

* renamed it all

* give a good vid and pid

* add via keymap

* add on to the comments

* update readme and comments

* one more small change
* Adding 2x2u default layout for Boardwalk

* Defining the _RAISE layer
* Add via configurator support

* Remove layers to fix via

* Re-add extra via layers since it seems to work now

* Replace tabs with spaces

* Update readme.md
* Add 64_ansi Community Layout

* Add 64_iso Community Layout

* Add readme.md with layout drawings

* Edit readme.md - fix layout drawings

Fix 65_ansi_blocker_split_bs and 65_ansi_blocker_tsangan drawings.

* Edit readme.md - suggestions per fauxpark

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* Update feature_advanced_keycodes.md

* Update mod_tap.md
* BM60RGB ISO: fix and extend default keymap

- correctly assigns the Non-US Backslash and Hash keys
- adds Function and Navigation keys
- use KC_GESC instead of KC_ESC to make Grave accent available

* Update layout macro

The layout is the ISO equivalent of QMK's `LAYOUT_60_ansi_arrow`.
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* Add new keyboard: wsk/g4m3ralpha

* Added license attribution to .{c,h} files

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wsk/g4m3ralpha/g4m3ralpha.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wsk/g4m3ralpha/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wsk/g4m3ralpha/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/wsk/g4m3ralpha/info.json

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/wsk/g4m3ralpha/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* added replacement pcb for the matrix cain keyboard

* update usb descriptor

* fixed led polarity

* Update keyboards/matrix/cain/cain.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/matrix/cain/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* rename from cain to cain_re

* Update keyboards/matrix/cain_re/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Fixed some small things and replaced deprecated definitions

* Improvements

* Reverted kemyap change
* WIP working on new keymap

* tweaking keymap

* updated keymap

* cleaned up a little bit

* New preonic keymap

* my preonic keymap

* added mac layout

* preonic map update

* cleaning up old repo

* cleaning up to match upstream

* more cleanup

* removing old keymaps

* Added BM60 Poker

* Apply suggestions from code review

* Added license

* updated license

* updated license

* Fixed remaining licenses and added layout to rules
* Initializing Boardwalk layout

* rules.mk newline

* config.h newline

* qwerty num toggle -> tap-toggle

* errant K, and _LOWER momentary toggles

* Lack of autosave sucks

* Converting to HHKB layout

* TT(_NUM) added to num layer

* Final updates for Boardwalk initialization

* Final refinements

* newline

* Removal of extra includes

* Update keyboards/boardwalk/keymaps/niclake/config.h

#pragma once

* Removing comment block from rules

* Updates to my layout
* Added via support

* Now uses LTO_ENABLE

* Deactivated console to save space

* Update keyboards/sofle/keymaps/via/readme.md

* Added GPL license

* Update keyboards/sofle/keymaps/via/keymap.c

* Update keyboards/sofle/keymaps/via/keymap.c

* Update keyboards/sofle/keymaps/via/keymap.c

* Update keyboards/sofle/keymaps/via/keymap.c
* 1 Oct 20

* Update keyboards/clawsome/fightpad/config.h

* Update keyboards/clawsome/fightpad/rules.mk

* Update keyboards/clawsome/fightpad/info.json

* Update keyboards/clawsome/fightpad/readme.md

* Update keyboards/clawsome/fightpad/readme.md

* Update keyboards/clawsome/fightpad/info.json

* Update keyboards/clawsome/fightpad/config.h
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
- add data for LAYOUT_all macro
- correct some rounding errors
- make the indentation consistent
- remove trailing whitespace
* Update reference_info_json.md

key_count is now an optional field because it is better to get the keycount by counting the elements in the layout array.

* Updated Japanese documentation as well
Currently the XD75 is missing a info.json
attributing to non standardised use of QMK
@shinmiy shinmiy self-assigned this Oct 3, 2020
@shinmiy shinmiy merged commit aedda17 into develop Oct 3, 2020
@shinmiy shinmiy deleted the merge/upstream-master branch October 3, 2020 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment