Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
[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>
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Fix documentation so UCIS example compiles. (#11541)