1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

14470 commits

Author SHA1 Message Date
QMK Bot c7cfdd82bb Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:39:46 +00:00
Adam Gwilliam b48a5b573f
[Keymp] add gwillad's keymap for prime_e (#11477)
* new keymap

* Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c

use a more concise pin setting method

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

Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-13 22:39:15 -08:00
QMK Bot 3810bda5a5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:02:33 +00:00
qpockets eb0ce0abc7
[Keyboard] Add space space keyboard (#11425)
* add space_space keyboard

* update space_space readme

* fix space_space formatting issue

* add layout readme, vid & pid

* experiment

* readme fix

* readme fix

* readme fix

* readme formatting

* readme formatting

* readme formatting

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update readme.md

change keymap readme to reflect keymap changes

* Apply suggestions from code review

remove deprecated  "key count" from .json

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

* Apply suggestions from code review

-move combo and modtap defines to the keymap level
-formatting issues

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

* move combo defines to keymap level and update config.h

* Apply suggestions from code review

add lower resolution readme picture and sleep LED note

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 22:01:58 -08:00
QMK Bot 84e71ecf10 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:58:55 +00:00
David Dejaeghere 501f3ed419
[Keyboard] Adding new keyboard UD_40 ortho version (#11401)
* Adding keyboard UD_40 Ortho

* Update keyboards/mechstudio/ud_40_ortho/info.json

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* fixing syntax after merging suggestions

* Update keyboards/mechstudio/ud_40_ortho/config.h

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* Update keyboards/mechstudio/ud_40_ortho/config.h

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

Co-authored-by: David <david@tarpit.be>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 21:58:16 -08:00
QMK Bot 1504b328d1 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:57:02 +00:00
Christian Eiden 8ea28429e9
[Keymap] own Lily58 keymap (#11395)
* [Keymap] own Lily58 keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>

* adjustments of personal keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>
2021-01-13 21:56:22 -08:00
QMK Bot 8233ab83c2 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:52:48 +00:00
James 214528b1e7
[Keymap] urbanvanilla keymap for drop/alt (#11365)
* added urbanvanilla keymap

Urbanvanilla's keymap for massdrop/alt keyboard
adds in an idle timer to turn off RGB after set amount of time.
poor unsuccessful attempt at replicating a velocikey like functionality.
Grave escape is enabled on ESC.

* Update readme.md

* updating documentation

* Create readme.md

* restoring default documentation

* update with review changes implemented

removed unnecessary lines and files.
increased wait_us() parameter to 40 as was still getting chatter at 20.
removed some code for the terrible rudimentary attempt at velocikey for rgb matrix

* Update matrix.c

* Revert "Merge pull request #3 from urbanvanilla/dev_branch"

This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing
changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5.

* Update keymap.c

* added urbanvanilla keymap

Urbanvanilla's keymap for massdrop/alt keyboard
adds in an idle timer to turn off RGB after set amount of time.
poor unsuccessful attempt at replicating a velocikey like functionality.
Grave escape is enabled on ESC.

* Update readme.md

* updating documentation

* Create readme.md

* restoring default documentation

* update with review changes implemented

removed unnecessary lines and files.
increased wait_us() parameter to 40 as was still getting chatter at 20.
removed some code for the terrible rudimentary attempt at velocikey for rgb matrix

* Update matrix.c

* Revert "Merge pull request #3 from urbanvanilla/dev_branch"

This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing
changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5.

* Delete matrix.c

* Update keyboards/massdrop/alt/keymaps/urbanvanilla/config.h

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

* Update keymap.c

* Update keymap.c

* Update keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 21:52:11 -08:00
QMK Bot e608447382 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:52:00 +00:00
Richard Titmuss 523c8315a2
[Keyboard] Improvements for the Torn keyboard (#11268)
* Add bongo cat animation

* Map all keys on base layer

... to make it easier to test newly built keyboards. The encoders
are optional and can be placed in different locations.

* Fix Torn in QMK configurator

This removes additional variables defined in the keymap.c file, so
that the default firmware can be compiled by the configurator.

Co-authored-by: Richard Titmuss <richardt@spotify.com>
2021-01-13 21:50:18 -08:00
QMK Bot 811e0155ef Merge remote-tracking branch 'origin/master' into develop 2021-01-14 04:36:39 +00:00
Ananya Kirti 73235e7ca0
[Keyboard] Add support for hp69 (#11339)
* init

init

* Update keyboards/hp69/config.h

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

* Update keyboards/hp69/keymaps/via/rules.mk

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

* Update keyboards/hp69/rules.mk

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

* re-added audio support

re-added audio support

* Update keyboards/hp69/readme.md

reduced the size of the default image

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

* Update keyboards/hp69/readme.md

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

* Update keyboards/hp69/info.json

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 20:36:00 -08:00
QMK Bot 605d7c3ca2 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 00:18:18 +00:00
Ryan 72ca319bee
Uni660 refactor (#11526) 2021-01-14 11:17:47 +11:00
QMK Bot bf1d9de1d8 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 00:12:36 +00:00
Erovia b5c2e5e8fd
Fix documentation so UCIS example compiles. (#11541) 2021-01-14 11:11:59 +11:00
Zach White f4cf0d2f28 remove duplicate manufacturer 2021-01-13 16:03:52 -08:00
Zach White 3c8da5eba8 move the info.json rules above userspace 2021-01-13 16:01:21 -08:00
QMK Bot 70e143e0c1 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 17:04:55 +00:00
Joel Challis 6e931cc90b
Fix leafcutterlabs/bigknob compiles in configurator (#11531)
* Fix leafcutterlabs/bigknob compiles in configurator

* Revert change
2021-01-13 17:04:18 +00:00
QMK Bot 30cd3faf97 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 16:13:04 +00:00
Zach White 6368a5697d
Exclude more keyboards from CI (#11436)
* exclude all of handwired

* exclude more keyboards from CI
2021-01-13 08:12:28 -08:00
QMK Bot 6155987d9f Merge remote-tracking branch 'origin/master' into develop 2021-01-13 04:53:32 +00:00
Ryan 09835033da
keymap_fr_ch: undef CH_H (#11537) 2021-01-13 15:53:00 +11:00
QMK Bot 1ade5aa922 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 01:56:46 +00:00
Rob Hilgefort b297f1ce8d
[Keymap] rjhilgefort's Ergodox Infinity (#11345)
* initial commit- copy of default

* beginnings of ergodox layout conversion

* from scratch 2020 RJH ergodox layout!

* remove extra line in keymap

* only shift to layers, led work

* Fleshed out readme

* tweak alt placement

* updated readme

* PR feedback, updated default layer

* Update keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-12 17:56:18 -08:00
QMK Bot 7cfcb0d271 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 01:53:50 +00:00
Dan Hertz c81e07fef5
[Keymap] Add dhertz' kanu layout (#11346)
* Add dhertz' kanu layout

* Fix delete button

* Add weak user layer change
2021-01-12 17:53:15 -08:00
Takeshi ISHII 302b35c2a0
fix matrix_io_delay() timing in quantum/matrix.c (#9603)
* fix matrix_io_delay() timing in quantum/matrix.c

* Updated comments explaining the need for matrix_io_delay() in quantum/matrix.c

* fix matrix_io_delay() timing in quantum/split_common/matrix.c

* Update quantum/matrix.c

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

* Update quantum/split_common/matrix.c

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

* Update quantum/matrix.c

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

* Update quantum/split_common/matrix.c

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

* add waitOutputPinValid() and wait_cpuclock() into quantum/quantum.h and tmk_core/common/wait.h

* add matrix_output_select_delay() and matrix_output_unselect_delay()

* fix quantum/matrix_common.c, tmk_core/common/matrix.h

* fix tmk_core/common/wait.h

* fix quantum/quantum.h, tmk_core/common/wait.h

* waitOutputPinValid() rename to waitInputPinDelay() in quantum/quantum.h.

* waitOutputPinValid() rename to waitInputPinDelay() in quantum/matrix_common.c

* update tmk_core/common/wait.h

* update comment in quantum/matrix.c, quantum/split_common/matrix.c

* update quantum/quantum.h: Make more margin in the GPIO_INPUT_PIN_DELAY default value.

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 12:46:22 +11:00
Nick Brassel 017aa5988a
ChibiOS conf migrations... take 7 (#11529)
* ChibiOS conf upgrade for alpine65

 alpine65 - 91e88b87653234a9023f4ad98913a6ea52c8b3fb

* ChibiOS conf upgrade for cannonkeys/onyx

 cannonkeys/onyx - 2adf507afd4e288761a675de9cfbb6e34c540e29

* ChibiOS conf upgrade for ck60i

 ck60i - 98be5d22a3cd1b38d92e080f32c4795260db181b

* ChibiOS conf upgrade for cutie_club/borsdorf

 cutie_club/borsdorf - 81734ebf770ab731ca8dcfac6fce5574e948890e
2021-01-13 00:19:56 +00:00
QMK Bot 42f404d854 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 00:00:35 +00:00
Joel Challis 1eaad6dd65
Fix inverted indicator leds on kbdfans/kbd19x (#11532) 2021-01-12 23:58:01 +00:00
QMK Bot f4b0cd3dfa Merge remote-tracking branch 'origin/master' into develop 2021-01-12 20:59:53 +00:00
Sascha Grunert 5e46f72f75
[Keymap] keymap/sascha: disable autoshift (#11525)
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2021-01-12 12:59:18 -08:00
QMK Bot d96463ce12 Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:34:34 +00:00
Drashna Jaelre 16d43af493
[Keyboard] Fix printf calls in Moonlander matrix (#11511) 2021-01-12 12:33:55 +00:00
QMK Bot 9b9012767c Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:21:46 +00:00
James Young 68f321f24b
Acheron Lasgewloth: layout macro rework (#11523)
* Acheron Lasgewloth: layout macro rework

Arrange the layout macro to match the assembled board.

* rename layout macro

The layout supported is equivalent to 60% ANSI with split Backspace and split Right Shift, and supports every extant switch position.

Adds community layout support.

* add LAYOUT_60_ansi support

* add Configurator data

* convert tabs to spaces in lasgweloth.h
2021-01-12 12:21:13 +00:00
QMK Bot 1c0ccf9aaf Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:15:07 +00:00
Ryan 8729afece5
Telophase: add info.json (#11524) 2021-01-12 12:14:32 +00:00
Nick Brassel 79d1db3324
Keep track of last matrix activity (#10730)
* Allow recording of the last matrix activity time, to simplify implementation of display timeouts and the like.

* Add requested changes from code review.

* Simplify split matrix last changed.
2021-01-12 19:48:24 +11:00
QMK Bot a2aed8ebd7 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 19:02:54 +00:00
Vlad K 5127ef1f02
[Keymap] vladkvit keymap for keebio/bfo9000 (#10825)
* layouts for bfo9000

* cleaning up layout

* moved to a better layout name

* Added readme

* Removed zip, updated license

* Removed layers.json

* Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c

removing trailing backslashes

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

* Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c

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

Co-authored-by: Vlad Kvitnevskiy <vladkvit@outlook.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-11 11:02:00 -08:00
QMK Bot 1e061c7d59 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 16:06:11 +00:00
Sergey Shulepov e941f04891 Fix macOS build 2021-01-11 08:05:28 -08:00
QMK Bot 4244c306a8 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 09:27:07 +00:00
Nick Brassel 11bd51441b Fixup line endings. 2021-01-11 20:26:28 +11:00
Ryan 415d683ea7
Remove unused action_get_macro() usages in user files (#11165) 2021-01-11 01:25:45 -08:00