~ruther/qmk_firmware: master

8984f24f — yulei 5 years ago

[Keyboard] add Matrix 8XV1.2 og ISO/ANSI keyboard (#7567)

* add m12og keyboards

* update readme.md

* update to latest code suggestions

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/matrix/m12og/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

294caf1f — Zach White 5 years ago

Also fix flash

033c7af2 — Zach White 5 years ago

Fix compiling json files

15e5f579 — ashtneoi 5 years ago

Add JSON keymap to prereq list of C keymap

This ensures the C keymap is rebuilt when the JSON keymap changes.

4b11c2b5 — Yan-Fa Li 5 years ago

[Keyboard] instant60: Enable bootmagic lite to make eeprom reset easier (#7566)

201c5bfa — XScorpion2 5 years ago

Updated slave encoder sync to reduce dropped pulses - v2 (#7505)

* Updated slave encoder sync to reduce dropped pulses

* Fixing encoder direction

* Encoder behavior fixes, tested

* Update keyboards/rgbkb/sol/keymaps/xulkal/rules.mk

To make fauxpark happy

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update custom_encoder.c

* Update rules.mk

* Iris r4 fix

* More fixes for Iris & Kira

* Fix for right master encoders

34f302e1 — James Young 5 years ago

[Keyboard] rebuild info.json for ep tf_longeboye (#7560)

722c196b — Takeshi ISHII 5 years ago

[Keyboard] Added workaround for serial.c/LTO issue for helix/rev2 and helix/pico. (#7558)

c6ebb59a — James Young 5 years ago

[Keyboard] EP96: fix info.json key sequence (#7557)

* ep/96 info.json: debug linting

* ep/96 info.json: fix key sequence

ISO Enter, Numpad Plus and Numpad Enter were out of order.

4808b930 — Alper Cugun 5 years ago

[Keymap] Added my customized 40% layout (#7555)

* Formatting of Contra readme.

* Initial version of my custom keymap

* Move TODOs to readme

* Add comment

* Nuke Plover layer

* Port changes to other layers

* Finished work on my own layout for now

* Add layout image

* Processed comments from review

c74295de — fauxpark 5 years ago

Set proper AVR part for USBasp avrdude flashing (#7552)

* Set proper AVR part for USBasp avrdude flashing

* Remove `PROGRAM_CMD` stuff from rules.mk as they should not be needed anymore

* Missed the Plaid readme

* Remove PROGRAM_CMD from Mysterium

a7209533 — marhalloweenvt 5 years ago

[Keyboard] Add new keyboard ColorLice (#7536)

* [Keyboard] Add new keyboard Symmetry60

* Add new keyboard Symmetry60

* Fix Typo

* Update keyboards/handwired/symmetry60/config.h

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

* Update keyboards/handwired/symmetry60/readme.md

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

* Update keyboards/handwired/symmetry60/readme.md

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

* Update keyboards/handwired/symmetry60/readme.md

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

* Update keyboards/handwired/symmetry60/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/symmetry60/symmetry60.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/symmetry60/symmetry60.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/symmetry60/symmetry60.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update rules.mk

* Update symmetry60.c

* Update keyboards/handwired/symmetry60/rules.mk

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

* Add ColorLice

* Update ColorLice

- Adjust info.json to support Configurator
- Adjust layout name to fit with info.json
- Seperate 2 feature: RGB Switch and RGB Underglow

* Update new way of control lock leds

* Remove #ifndef COLORLICE_H

* Update make example

* Revert Helix

* Revert Helix

* Revert Helix

* Revert Helix

* Update keyboards/handwired/colorlice/colorlice.h

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/colorlice/colorlice.h

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update default keymap

* Revert Helix

* Update keyboards/handwired/colorlice/readme.md

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/colorlice/rules.mk

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/colorlice/colorlice.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/colorlice/colorlice.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Remove unnecessary function

* Update keyboards/handwired/colorlice/colorlice.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Adjust rules option for working with Configurator

- Move RGB_MATRIX_ENABLE and RGBLIGHT_ENABLE to keyboard rule.
- Add RGB_DI_PIN in keyboard config

* Update keyboards/helix/rev2/keymaps/default/keymap.c

Co-Authored-By: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/colorlice/readme.md

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

* Update keymap for Colorlice

* Adjust rules.mk to use space indent

3d78e607 — Manna Harbour 5 years ago

[Keymap] Display logo for caps lock indication on crkbd using old OLED driver (#7535)

* Display logo for caps lock indication on crkbd using old OLED driver

* Add emacs read-only mode file variable to generated files

* use LTO_ENABLE instead of EXTRAFLAGS

This enables the same option, and disables action_macros, and action_functions, both of which seem to break when LTO is enabled. And this is a lot simpler to use.

Co-Authored-By: Drashna Jaelre <drashna@live.com>

e6762784 — hmkemppainen 5 years ago

fix instructions for oneshot layer handling on key release (#7554)

* fix instructions for oneshot layer handling on key release

* use ONESHOT_OTHER_KEY_PRESSED instead of ONESHOT_PRESSED

Co-Authored-By: Drashna Jaelre <drashna@live.com>

730a736e — fauxpark 5 years ago

Set proper ASCII character for KC_NUHS in iWRAP code (#7434)

a8320f20 — fauxpark 5 years ago

Improve support and docs for ADC driver (#7191)

* Improve support and docs for ADC driver

* Comment ADC channels

* Move to Makers and Modders section, and fix usage instructions

* Flesh out intro

* Superscript 328P note

* Fix pin_to_mux LUT

* Support USB64/1287 as well

* analogReadPin() defaults to 0V mux on invalid pin

* Update pinToMux() function documentation

* Dot

* Accept (some of) the `qmk cformat` changes

* Do clang-format properly

* More wording tweaks

* Link to encoder docs

f275ffbd — osjuga 5 years ago

Minor grammar and filename fixes in docs (#7559)

Grammar in coding_conventions_c.md and coding_conventions_python.md

`rule.mk` to `rules.mk` in feature_haptic_feedback.md and feature_rgb_matrix.md

36a6e269 — Eric Bunton 5 years ago

Port SPLIT_USB_DETECT to helix/rev2 (#7385)

* Port SPLIT_USB_DETECT to helix/rev2

* Remove debug toggles.

* Rename is_keyboard_master to has_usb in split_util

e8efc46e — Gregory Gubarev 5 years ago

[Docs] Creating RU version of getting_started_introduction (#7224)

* Creating RU version of getting_started_introduction

* Update docs/ru-ru/getting_started_introduction.md

Update "предполагается"

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>

1b08a19e — Gregory Gubarev 5 years ago

[Docs] Create RU ver of becoming_a_qmk_collaborator (#7226)

* Create RU ver of becoming_a_qmk_collaborator

* Updated

* Updated - collaborator to соавтор

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>