~ruther/qmk_firmware

345f6dc4 — James Young 4 years ago
Merge remote-tracking branch 'upstream/master' into develop

Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947
02ac0f89 — Vicktor Hutama 4 years ago
[Keyboard] Add Rune Vaengr Keyboard (#13945)

* initial commit

* fixed layout

* enabled NKRO

* removed qmkbest

* changed the pins and bootloader to the mcu version

* updated readme

* Apply suggestions from code review

thank you @drashna

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
710d37b3 — jmaynard 4 years ago
[Keyboard] Improvements to m122_3270 (#13947)

Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
71ce2b0d — James Young 4 years ago
Poker87C and Poker87D Refactor (#13961)

f4c447f2 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
3161f10b — James Young 4 years ago
Update USB Device strings for VIA identification (#13962)

af3627db — Kyle Xiao 4 years ago
[Userspace] Add custom tap dancing function (#13963)

5ed7210d — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
83a1c476 — Fernando Rodrigues 4 years ago
[Keyboard] Added split plus layout to Cospad (#13938)

d58dc522 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
04b92866 — jpuerto96 4 years ago
[Keyboard] Gorthage Truck - Rotary Encoder Switch Position (#13942)

Co-authored-by: Ryan <fauxpark@gmail.com>
1537e397 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
8d4fcd67 — Ananya Kirti 4 years ago
Hp69 - Update led logic (#13940)

Co-authored-by: zvecr <git@zvecr.com>
80cb96bb — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
817fcfdc — Eric S. Raymond 4 years ago
Fix shell port bug in computation of QMK_FIRMWARE_DIR (#13950)

Previous code would fail if cd echoes the tathet directory to stdout,
which is pretty common.  Redirecting its output to /dev/null
solves the problem.
8d1255cc — Luigi311 4 years ago
Handwired/Stream_Cheap/2x4: Add via support (#13297)

* Handwired/Stream_Cheap/2x4: Add via support

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap: Update readme for via

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap/2x4: Add 2x4 to via json

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>

* Handwired/Stream_Cheap/2x4: Add GPL2+ License to keymap

Signed-off-by: Luigi311 <luigi311.lg@gmail.com>
184c2e35 — Alin Marin Elena 4 years ago
add support for m65 and simple 5x13 ortholinear (#12315)

* add support for m65 and simple 5x13 ortholinear

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/m65/keymaps/default/keymap.c

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* updates as per @sigprof review plus reformat

* pins all now are defined at microcontroller level

* profuct id defined at microcontroller level

* put leds on when _ADJ is on

* add danish keymap

* make default uk centric iso as per readme

* default is now iso generic, uk is its own business

* add license

* update imgur links to reflect the layout

* leds for _ADJ layer now do not prevent the other layers leds to get on

* Update keyboards/m65/keymaps/uk/keymap.c

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

* Update keyboards/m65/keymaps/dk/keymap.c

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

* Update keyboards/m65/keymaps/uk/readme.md

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

* Update keyboards/m65/readme.md

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

* add support for gd32f303cct6 by we act in rev2

* Revert "add support for gd32f303cct6 by we act in rev2"

This reverts commit 4ad3834925508b79f2ff9fd5526dfc39f07fa3bc.

* Update keyboards/m65/rev1/rules.mk

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

* Update keyboards/m65/keymaps/dk/readme.md

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

* Update keyboards/m65/keymaps/uk/readme.md

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

* Update keyboards/m65/keymaps/default/readme.md

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

* remove empty hal

* add capslock

* Update keyboards/m65/readme.md

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

* Update keyboards/m65/config.h

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

Co-authored-by: Alin M Elena <alin-marin.elena@stfc.ac.uk>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
d888ac17 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
ed84a4e7 — Zach White 4 years ago
Improve the qmk lint readme check (#13941)

* improve lint readme check

* improve if
9a0118c6 — Zach White 4 years ago
Architecture documentation for Configurator and API (#13935)

* Architecture documentation for the configurator and api

* Apply suggestions from code review

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

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