~ruther/qmk_firmware: 749d9f2227422f8d70f1e37c913f62ed857fbcaf

749d9f22 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

c46619d8 — Joshua Diamond 4 years ago

[Keyboard] eliminate nested layout warnings in kbd75 (#11540)

a668640a — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

b323ab89 — melonbred 4 years ago

[Keyboard] Added Ortho support to Program Yoink kb (#11534)

* Added Ortho support

* Updated JSON

18ae86fa — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

1f633c02 — J.Flanagan 4 years ago

[Keyboard] Add VIA support for CA66 (#11522)

* Add VIA support

made changes to add VIA support for the CA66

- added VIA keymap.c, readme.md, rules.mk
- changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no)
- changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK)

* Minor changes to CA66 for VIA support

edited keymap info
enabled backlight

* Update vendorID

Change to vendorID to remove conflict with previously chosen vendorID already in use

* Update keyboards/playkbtw/ca66/rules.mk

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

* Update keyboards/playkbtw/ca66/keymaps/via/readme.md

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

* Update keyboards/playkbtw/ca66/keymaps/via/keymap.c

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

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

15f0fa85 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

1f38221e — duoshock 4 years ago

[Keyboard] Add ISO Macro keyboard (#11517)

* -

* -

* -

* -

* -

Co-authored-by: online <33636898+online@users.noreply.github.com>

3dfaf120 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

68c3773c — Eithan Shavit 4 years ago

[Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510)

* Adding new breeze keyboard under afternoonlabs

* Compiling only Rev0, moving readme there

* Apply suggestions from code review

Addressing review comments, removing legacy description config. Removing copy paste leftovers

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

* Addressing review, remove empty rules.mk

* typos

* Apply suggestions from code review

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

Co-authored-by: Eithan Shavit <eithan@fb.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

770e0f08 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

5dfb6459 — Josh Johnson 4 years ago

[Keyboard] Add Hub20 keyboard (#11497)

* add Hub20 support

* Keymap formatting cleanup

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

* Delete bootloader_defs.h as no longer required

* Correct make / flashing example

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

* Update rules.mk

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

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

ea7b82b3 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

d97d4794 — koshinoya 4 years ago

[Keyboard] Add Rect44 keyboard (#11484)

* Add Rect44 keyboard

* Update keyboards/rect44/readme.md

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

* Delete config.h files in keymaps

* Update keyboards/rect44/rules.mk

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

* Update keyboards/rect44/readme.md

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

* Update keyboards/rect44/config.h

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

c7cfdd82 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

b48a5b57 — Adam Gwilliam 4 years ago

[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>

3810bda5 — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

eb0ce0ab — qpockets 4 years ago

[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>

84e71ecf — QMK Bot 4 years ago

Merge remote-tracking branch 'origin/master' into develop

501f3ed4 — David Dejaeghere 4 years ago

[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>