Commit graph

4229 commits

Author SHA1 Message Date
QMK Bot
e43a59a6a0 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:07:42 +00:00
Salicylic-acid3
4f10e57dd7 [Keyboard] Add nknl7en keyboard (#11590)
* Add nknl7en keyboard

A 70 keys ANSI Layout split keyboard.
Salicylic-acid3

* Update readme.md

The name, photo, and link were wrong, so they have been corrected.

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

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

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

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

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

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

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07 09:06:59 -08:00
QMK Bot
64f507b1c9 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:05:04 +00:00
Salicylic-acid3
792773c140 [Keyboard] Add ergoarrows keyboard (#11592)
A 76 keys Ergo Layout split keyboard.
Salicylic-acid3
2021-02-07 09:04:29 -08:00
QMK Bot
d8d5b24c39 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 16:54:55 +00:00
Moritz
7d63f1a248 [Keyboard] Whale 75 (#11486)
* initial commit

* various fixes

* minor formatting fixes

* fixed typo in config

* switched underglow from bitbang to pwm

* fixed indicator leds not working

* improved comment syntax

* fixed matrix

* remove outdated indicator custom code

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

* add new indicator definitions

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

* removed duplicate define for underglow pin

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

* removed unneeded lines

* fixed readme to fit template

* added picture to readme

* fixed readme formatting

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07 08:54:23 -08:00
QMK Bot
ae04415245 Merge remote-tracking branch 'origin/master' into develop 2021-02-06 21:04:30 +00:00
Xelus22
5db9006c44 [Keyboard] VIA fix firmware sizes (#11770) 2021-02-06 13:04:01 -08:00
QMK Bot
1d8d3d1f3e Merge remote-tracking branch 'origin/master' into develop 2021-02-05 11:31:55 +00:00
Sam Hudson
d3afc19387 [Keyboard] add shk9 macropad (#11505)
* added shk9 macropad

* updated readme

* removed json file

* updated config

* removed commented config

* fixed website address

* added bootloader mode info to readme

* remove midi enable rule

* fixed comment

* fixed default keymap

* changed layout to ortho

* fixed typo

* fixed broken layout

* pr changes

* added keymap spacing
2021-02-05 03:31:15 -08:00
QMK Bot
255937ddf3 Merge remote-tracking branch 'origin/master' into develop 2021-02-05 06:19:03 +00:00
Joshua Borton
995d9aa5e8 [Keyboard] Add VIA support to v60 Type R (#11758)
* Add support VIA support to v60 Type R

* Update keyboards/v60_type_r/config.h

Revert combining product and manufacturer

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

* Update keyboards/v60_type_r/keymaps/via/keymap.c

Remove empty `led_set_user` function

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

* Update keyboards/v60_type_r/rules.mk

Don't enable bootmagic lite

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

* Add missing empty layers for VIA

* Update keyboards/v60_type_r/rules.mk

Fix comment formatting

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

* Update the VENDOR_ID

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-04 22:18:20 -08:00
QMK Bot
4037a09ebc Merge remote-tracking branch 'origin/master' into develop 2021-02-05 05:07:22 +00:00
18438880
48a9a913af [Keyboard] add latin17rgb (#11680)
* Create readme.md

* Add files via upload

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Update config.h

* Update rules.mk

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

* Update keyboards/latin17rgb/keymaps/via/keymap.c

* Update keyboards/latin17rgb/latin17rgb.h

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

* Update keyboards/latin17rgb/keymaps/via/keymap.c

* Update keyboards/latin17rgb/rules.mk

* Update keyboards/latin17rgb/info.json

* Delete latin17RGB.json

* Update info.json

* Update keymap.c

* Update keymap.c

* Update info.json

* Update latin17rgb.h

* Update latin17rgb.h

* Update keymap.c

* Update keymap.c

* Update latin17rgb.h

* Update keyboards/latin17rgb/readme.md

* Update keyboards/latin17rgb/readme.md

* Update keyboards/latin17rgb/rules.mk

* Update keyboards/latin17rgb/rules.mk

* Update keyboards/latin17rgb/info.json

* Update keyboards/latin17rgb/rules.mk

* Update keyboards/latin17rgb/latin17rgb.h

* Update keyboards/latin17rgb/rules.mk

* Update keyboards/latin17rgb/readme.md

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

* Update keyboards/latin17rgb/keymaps/via/keymap.c

* Update latin17rgb.c

* Update latin17rgb.c

* Update keyboards/latin17rgb/latin17rgb.c
2021-02-04 21:06:50 -08:00
QMK Bot
eac2de4722 Merge remote-tracking branch 'origin/master' into develop 2021-02-05 03:02:37 +00:00
alittlepeace
a6d0fe7fc9 [Keyboard] Adding YMDK Wings Keyboard (#11693)
* Add files via upload

* Add files via upload

* Update rules.mk

* Update rules.mk

* Update info.json

* Update wings.h

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update keyboards/ymdk/wings/info.json

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

* Update keyboards/ymdk/wings/keymaps/via/keymap.c

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

* Update keyboards/ymdk/wings/keymaps/via/keymap.c

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

* Update keyboards/ymdk/wings/keymaps/via/keymap.c

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

* Update keyboards/ymdk/wings/keymaps/via/keymap.c

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

* Update keyboards/ymdk/wings/keymaps/via/keymap.c

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

* Update keyboards/ymdk/wings/keymaps/default/keymap.c

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

* Update keyboards/ymdk/wings/info.json

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

* Update keyboards/ymdk/wings/wings.h

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

* Update keyboards/ymdk/wings/readme.md

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

* Update keyboards/ymdk/wings/readme.md

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

* Update keyboards/ymdk/wings/info.json

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

* Update keyboards/ymdk/wings/keymaps/default/keymap.c

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-04 19:01:59 -08:00
QMK Bot
35a45a96c3 Merge remote-tracking branch 'origin/master' into develop 2021-02-05 00:24:40 +00:00
npspears
109c3b6c75 [Keyboard] add Pursuit40 PCB for Panc40 (#11683)
* added Pursuit40 PCB for Panc40

Pursuit40 is another PCB option for the Panc40 that was sold on Panc.co/store

* added via support

* Apply suggestions from code review

* Apply suggestions from code review

* deleted extra row in VIA keymap

sorry about that - extra row was a holdover from a copy-paste

* deleted commented extra row

extra row was a holdover from a copy-paste

* updated VIA keymap

empty layer added

* fixed bug

* Apply suggestions from code review

committed
2021-02-04 16:24:09 -08:00
QMK Bot
4513726d7a Merge remote-tracking branch 'origin/master' into develop 2021-02-05 00:22:26 +00:00
Brandon Claveria
eb35285f94 [Keyboard] add The Galleon by swiftrax (#11700)
* initial addition

* fix keymap / keyboard.h

* add animation

* change pid

* fix layout macro

* Apply suggestions from code review

* Update keyboards/handwired/swiftrax/the_galleon/info.json

* move wpm enable
2021-02-04 16:21:51 -08:00
QMK Bot
21ea7629c8 Merge remote-tracking branch 'origin/master' into develop 2021-02-05 00:20:11 +00:00
yfuku
65ee45227a Add VIA support for claw44 (#11677)
* add via keymaps for claw44

* Update keyboards/claw44/keymaps/via/config.h

* Update keyboards/claw44/keymaps/via-oled/config.h

* Update keyboards/claw44/keymaps/via-oled/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* Update keyboards/claw44/keymaps/via-oled/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* Applied the review to other keymaps.

* Update keyboards/claw44/keymaps/oled/keymap.c

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

* Update keyboards/claw44/keymaps/via-oled/keymap.c

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

* Update keyboards/claw44/keymaps/via-oled/keymap.c

* Update keyboards/claw44/keymaps/via-oled/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* Update keyboards/claw44/keymaps/via/keymap.c

* remove via-oled

* change vendor ID for yfuku

* add readme.md for rev1

* Update keyboards/claw44/rev1/readme.md

* Update keyboards/claw44/rev1/readme.md

* Update keyboards/claw44/rev1/readme.md
2021-02-04 16:19:37 -08:00
QMK Bot
bd3501e745 Merge remote-tracking branch 'origin/master' into develop 2021-02-04 21:58:36 +00:00
moyi4681
9685fb5185 [Keyboard] KBDfans Bella RGB ANSI and Bella RGB ISO (#11438)
* add bella rgb keyboards

* Update rgb_iso.c

* fix error

* Update rgb_iso.h

* Update keyboards/kbdfans/bella/rgb/rules.mk

* Update keyboards/kbdfans/bella/rgb_iso/rules.mk

* Update keymap.c

* Update keyboards/kbdfans/bella/rgb/info.json

* Update keyboards/kbdfans/bella/rgb_iso/info.json

* Update keyboards/kbdfans/bella/rgb_iso/config.h

* Update keyboards/kbdfans/bella/rgb/config.h

* Update keyboards/kbdfans/bella/rgb_iso/rules.mk

* Update keyboards/kbdfans/bella/rgb_iso/rules.mk

* Update keyboards/kbdfans/bella/rgb_iso/rules.mk

* Update keyboards/kbdfans/bella/rgb/rules.mk

* Update keyboards/kbdfans/bella/rgb/rules.mk

* Update keyboards/kbdfans/bella/rgb/rules.mk

* Update rgb_iso.c

* Update rgb.c

* Update rgb_iso.c

* Update rgb_iso.h

* Update keyboards/kbdfans/bella/rgb/config.h

* Update keyboards/kbdfans/bella/rgb/rgb.h

* Update keyboards/kbdfans/bella/rgb/info.json

* Update keyboards/kbdfans/bella/rgb/info.json

* Update keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c

* Update keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/bella/rgb_iso/readme.md

* Update keyboards/kbdfans/bella/rgb_iso/readme.md

* Update keyboards/kbdfans/bella/rgb_iso/readme.md

* Apply suggestions from code review

kbdfans/bella/rgb: Change remaining instances of LAYOUT_all to LAYOUT

* Apply suggestions from code review

kbdfans/bella/rgb: update readme

- update keyboard name
- include flashing and bootloader instructions

* Apply suggestions from code review

kbdfans/bella/rgb_iso: update keyboard name

Changes remaining instances of "BELLA_RGB_ISO" to "BELLA RGB ISO".

* Apply suggestions from code review

kbdfans/bella/rgb_iso: Change LAYOUT_all to LAYOUT

* Apply suggestions from code review

kbdfans/bella/rgb_iso: Move ISO Enter's keycode to home row per QMK standard
2021-02-04 13:58:02 -08:00
QMK Bot
0e8dcd67b3 Merge remote-tracking branch 'origin/master' into develop 2021-02-04 17:46:21 +00:00
Brandon Claveria
34bcce898a [Keyboard] Add KL-90 (#11494)
* add kikoslab kl90

* fix info.json

* Update keyboards/kikoslab/kl90/rules.mk

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

* Update keyboards/kikoslab/kl90/info.json

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

* update info.json

* fix layout macro

* add support for hotswap space

Co-authored-by: Swiftrax <swiftrax@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-02-04 09:45:47 -08:00
QMK Bot
e13a99211f Merge remote-tracking branch 'origin/master' into develop 2021-02-04 17:30:54 +00:00
moyi4681
61f0d64c09 [Keyboard] add primus75 keyboard (#11440)
* add primus75 keyboard

* Update keyboards/iLumkb/primus75/info.json

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

* Update keyboards/iLumkb/primus75/keymaps/default/keymap.c

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

* Update keyboards/iLumkb/primus75/keymaps/via/keymap.c

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

* Update keyboards/iLumkb/primus75/keymaps/default/keymap.c

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

* Update keyboards/iLumkb/primus75/keymaps/via/keymap.c

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

* Update keyboards/iLumkb/primus75/primus75.h

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

* Update keymap.c

* Update keyboards/iLumkb/primus75/rules.mk

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

* Update keyboards/iLumkb/primus75/rules.mk

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

* Update keyboards/iLumkb/primus75/readme.md

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

* Update keyboards/iLumkb/primus75/config.h

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

* Update keymap.c

* Update keymap.c

* Update keyboards/iLumkb/primus75/keymaps/default/keymap.c

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

* Update keyboards/iLumkb/primus75/readme.md

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

* Rename keyboards/iLumkb/primus75/config.h to keyboards/ilumkbprimus75config.h

* Rename keyboards/ilumkbprimus75config.h to keyboards/ilumkbprimus75/config.h

* Rename keyboards/ilumkbprimus75/config.h to keyboards/ilumkb/primus75/config.h

* Rename keyboards/iLumkb/primus75/info.json to keyboards/ilumkb/primus75/info.json

* Rename keyboards/iLumkb/primus75/primus75.c to keyboards/ilumkb/primus75/primus75.c

* Rename keyboards/iLumkb/primus75/primus75.h to keyboards/ilumkb/primus75/primus75.h

* Rename keyboards/iLumkb/primus75/readme.md to keyboards/ilumkb/primus75/readme.md

* Rename keyboards/iLumkb/primus75/rules.mk to keyboards/ilumkb/primus75/rules.mk

* Rename keyboards/iLumkb/primus75/keymaps/default/keymap.c to keyboards/ilumkb/primus75/keymaps/default/keymap.c

* Rename keyboards/iLumkb/primus75/keymaps/via/rules.mk to keyboards/ilumkb/primus75/keymaps/via/rules.mk

* Rename keyboards/iLumkb/primus75/keymaps/via/keymap.c to keyboards/ilumkb/primus75/keymaps/via/keymap.c

* Update keyboards/ilumkb/primus75/keymaps/default/keymap.c

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

* Update keyboards/ilumkb/primus75/info.json

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

* Update keyboards/ilumkb/primus75/keymaps/via/keymap.c

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

* Update keyboards/ilumkb/primus75/info.json

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-04 09:30:21 -08:00
QMK Bot
fe03e418ac Merge remote-tracking branch 'origin/master' into develop 2021-02-03 19:55:09 +00:00
Brandon Claveria
4c03ad6477 [Keyboard] add koalafications (#11628)
* add koalafications

* fix keymap

* add oled

* oled stuff

* fix oled stuff

* add animation

* more oled stuff

* update rules.mk

* oled annimation

* change PID

* Update keyboards/handwired/swiftrax/koalafications/info.json

* Update keyboards/handwired/swiftrax/koalafications/readme.md
2021-02-03 11:54:30 -08:00
QMK Bot
dd6d6d0ee6 Merge remote-tracking branch 'origin/master' into develop 2021-02-01 11:05:50 +00:00
Jay Greco
2ca1100602 [Keyboard] Add nullbitsco SCRAMBLE (#11078)
* Add SCRAMBLE

* Make requested changes to PR

* Add all layers to VIA keymap

Implement drashna's PR feedback in order to avoid random data within the layers in VIA.

* Make requested changes to PR

Implement fauxpark's PR feedback to clean up readme.md and rules.mk.

* Make changes based on PR feedback

-Changed VIA layers to enum
-Added info on how to enter the bootloader to readme
2021-02-01 03:05:10 -08:00
QMK Bot
dde946f4bf Merge remote-tracking branch 'origin/master' into develop 2021-01-31 07:09:30 +00:00
Rys Sommefeldt
2809a1cbfd Fix missing F2 in top row in AoS TKL maps (#11735) 2021-01-31 18:09:00 +11:00
QMK Bot
529c37e21f Merge remote-tracking branch 'origin/master' into develop 2021-01-30 04:09:47 +00:00
CMMS-Freather
589ff42ba6 [Keyboard] add sam's sg81m keyboard (#11624)
* new repo: create cmm.studio folder, add saka qmk firmware

new folder for cmm.studio line up keyboard
added saka68 keyboard qmk and via firmware support

* Update keyboards/cmm.studio/saka68/config.h

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

* Update keyboards/cmm.studio/saka68/rules.mk

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

* Update keyboards/cmm.studio/saka68/keymaps/via/rules.mk

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

* Update keyboards/cmm.studio/saka68/config.h

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

* fix on keymap, readme

fix on keymap, readme

* Update keyboards/cmm.studio/saka68/readme.md

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

* Update keyboards/cmm.studio/saka68/keymaps/default/keymap.c

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

* update vendor name with _ instead of .

update vendor name with _ instead of .

* Update readme.md

change the make format

* Update keyboards/cmm_studio/saka68/keymaps/default/keymap.c

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

* deleted some files from cmm.studio, changes to cmm_studio

deleted some files from cmm.studio, changes to cmm_studio

* Update readme.md

make command changed

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added pic for pcb

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/config.h

tested and does work now. deleting these lines

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

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added use physical reset button instruction

* change to the cmm saka folder

making the changes to cmm saka firmware

seperated solder version firmware and hotswap version firmware

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* change to the cmm saka hotswap folder

* add sam's sg81m keyboard

add sam's sg81m keyboard firmware

* Update keymap.c

* Update keymap.c

* update keymap

update default keymap and via keymap

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keyboards/sam/sg81m/sg81m.c

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

* Update config.h

* Update config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-29 20:09:11 -08:00
QMK Bot
fb1520cb0e Merge remote-tracking branch 'origin/master' into develop 2021-01-27 00:53:05 +00:00
Brandon Claveria
f6d6c339d6 pull retropad out of handwired and update readme.md (#11545)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-01-27 00:52:17 +00:00
QMK Bot
e77b8c892d Merge remote-tracking branch 'origin/master' into develop 2021-01-24 15:04:16 +00:00
Vinam Arora
2d16be0610 Increased dynamic keymap layers in via keymap (#11575) 2021-01-24 15:03:34 +00:00
QMK Bot
d67ab13494 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 14:52:27 +00:00
Anand
2f124cde68 Add VIA support for dm9records/tartan (#11666) 2021-01-24 14:52:11 +00:00
QMK Bot
f40074eade Merge remote-tracking branch 'origin/master' into develop 2021-01-24 00:00:06 +00:00
David Dejaeghere
9d0a5f5d41 [Keyboard] adding support for new keyboard Dawn (#11564)
* initial commit Dawn keyboard

* fixing some matrix

* final tweaks to keymaps and info.json layout

* fix info.json missing delimiter

* missing elements in info.json layout, resolved through lint

* fixed missing link image in readme

* Update keyboards/mechstudio/dawn/readme.md

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

Co-authored-by: David <david@tarpit.be>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-23 15:59:15 -08:00
QMK Bot
96945312f4 Merge remote-tracking branch 'origin/master' into develop 2021-01-23 17:32:40 +00:00
Kyle McCreery
c7998a56af [Keymap] Adding Fancy and Bongocat Keymap to Mercutio Keyboard (#11520)
* Initial commit on new clean branch. Testing out functionality of oled and encoder for default features.

* Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly.

* Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR.

* Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies.

* Initial commit of branch specifically for implementing the more complicated fancy keymap as I expect the main PR to be approved first.

* testing bongo cat out

* Progress with intended OLED behavior. Needs to be cleaned up still.

* Cleaned up bongocat and added WPM display on it.

* Almost there. Need to rethink the layer checking in encoder.

* Fixing all the merge issues I didn't check before doing the last commit. Learn from my mistakes, check your commits.

* Fixed and updated fancy firmware and bongocat firmware.

* Updating license year since I will be doing a PR anyway.

* Update keyboards/mechwild/mercutio/keymaps/fancy/keymap.c

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-23 09:32:10 -08:00
QMK Bot
a5998682f6 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 17:11:22 +00:00
James Young
0fd4ce9bd9 Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO (#11657)
* Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO

* update readme formatting
2021-01-22 09:10:52 -08:00
QMK Bot
c4a56d5d40 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:38:26 +00:00
James Young
b5d1260ffd [Keyboard] Pinky refactor (#11643)
* QMK Configurator layout support for Pinky

3-row and 4-row versions

* refactor default keymaps

- use an enum for layer names
- remove redundant definitions
- qmk cformat pass
- modify pinky/4 via keymap to mirror pinky/4 default functionality

* remove LAYOUT_kc macros

This usage is not endorsed by QMK as it has been found to be confusing to novice users.

* add VIA support to pinky/3

* update config.h files

Removes unnecessary definitions for Backlight, RGB Underglow, Magic config and MIDI.

* update main rules.mk file

Updates the rules.mk file to match the formatting of the current QMK-provided template. Removes sample bootloader comments, feature rules that are no longer included in the template, and updates the in-line comments.

* update and split keyboard readme

Updates the main readme file's formatting, adds instructions to access bootloader mode, and adds more specific readmes for each version.

* add line breaks between rows in the info.json files

* rename layout macros for Community Layout forward compatibility

The layouts of the Pinky3 and Pinky4 aren't currently Community Layouts, but support for them could be added with a rules.mk edit should the layouts be added to QMK.
2021-01-22 08:37:36 -08:00