Commit Graph

7939 Commits

Author SHA1 Message Date
QMK Bot
1cdea7f530 Merge remote-tracking branch 'origin/master' into develop 2021-01-23 17:32:40 +00:00
Kyle McCreery
05a4583ce8
[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
5a7ad4cb2d Merge remote-tracking branch 'origin/master' into develop 2021-01-23 03:24:06 +00:00
Ryan
7d774fa1dc
Infinity60 refactor (#11650) 2021-01-23 14:23:38 +11:00
QMK Bot
08b37a58bb Merge remote-tracking branch 'origin/master' into develop 2021-01-23 02:03:09 +00:00
James Young
3a7573436a
Program Yoink! refactor (#11636)
* split config.h for each variant

* split rules.mk for each variant

* split source and header files for each variant

* move keymaps to the appropriate variant

* update keyboard readme

* update keymap readmes

* differentiate Staggered and Ortho USB Device Strings

* clean up formatting in info.json

* split info.json files for each variant

* break up the info.json for readability

* correct key positioning and board dimensions

* correct key object sequences

* add weak encoder function to keyboard level

Allows Configurator-compiled firmware to have encoder functionality.

* add variant-specific readme files and bootloader instructions
2021-01-22 18:02:40 -08:00
Joel Challis
a07c2a1377
Remove QMK_KEYBOARD_CONFIG_H (#11576) 2021-01-22 19:32:10 +00:00
QMK Bot
397e8e461f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 17:11:22 +00:00
James Young
7e77c2361f
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
f52baa4bc1 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:49:05 +00:00
Ryan
188c0bacb0
Woodpad refactor (#11651) 2021-01-23 03:48:27 +11:00
QMK Bot
1c3ec3a91f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:38:26 +00:00
James Young
a7d79f4c00
[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
QMK Bot
20ef2aa57f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:32:28 +00:00
Eithan Shavit
3b663ee495
[Keymap] Breeze keymap eithanshavit (#11640)
Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-01-22 08:31:53 -08:00
QMK Bot
b58d164504 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:23:41 +00:00
Drashna Jaelre
7a08b9d374
[Keymap] Cleanup and updating of drashna keymap code (#11516)
* Update other keyboards for rgb matrix changes

* Remove customized bootmagic code

* Fix corne layout compilation error

* Fix compiler errors with all keymaps

* Add Simple Visualizer for ergodox infinity

* Fix compile issue with Corne

* Fix keymap stuff

* Add alias for mouse layer

* Add Halmak Keyboard layout

* Updates for Kyria

* Add support for oled interval

* Change RGB stuff

[CHANGE] Fix coexistence issues

* Fix rgb_stuff

* Add custom ploopyco mouse keymap

* Decrease default dwell time

* Updates based on last breaking changes update

* Disable command on dactyl

* Update ergodox to use proper commands for rgb matrix indicators

* Update all rgb matrix indicator functions

* Update rules for dactyl-manuform

* Reduce wait time for mouse layer off event

* Add more info to logger

* Add wrappers for get_tapping term

* Move version.h include into only file that actually needs it

* Update rgb sleep stuff

* Update key print function

* Change DM keymap settings

* Change pin for DM Manuform

* Add Proton C stuff for Corne keymap

* more arm corne tinkering

* Even more arm stuff for corne

* Cleanup corne stuff

* redirect default keymap to drashna

because I am a very bad man

* change corne rgb priority

* Update tractyl manuform to not conflict

* Add more secret stuff

* more dactyl tweaks

* Add more options to split transport

* Changes of oled support

* Change split settings

* Improve keylogger formatting more

* tweak oled stuff

* Oled and such tweaks

* Reduce brightness due to leds

* Decrease brightness more

* Only run layer code if master
2021-01-22 08:23:03 -08:00
QMK Bot
37ebbe8d9e Merge remote-tracking branch 'origin/master' into develop 2021-01-22 02:27:36 +00:00
James Young
c16a3dcb54
Isometria 75: Configurator/CLI fixes (#11612)
* info.json: human-friendly formatting

* info.json: update key object labels

Some of the characters in the original file don't play nicely with `qmk info -l` on Windows.

* info.json: correct key object order
2021-01-21 18:27:05 -08:00
QMK Bot
e4ff5eb3eb Merge remote-tracking branch 'origin/master' into develop 2021-01-21 22:23:58 +00:00
Danny
71d8e72b80
Add 3rd encoder to VIA keymap (#11580) 2021-01-21 17:23:27 -05:00
QMK Bot
aa73ba7a67 Merge remote-tracking branch 'origin/master' into develop 2021-01-21 21:05:55 +00:00
jakobkg
c03ad0f802
Remove rules.mk in leafcutterlabs/bigknob:default (#11652) 2021-01-21 21:05:19 +00:00
QMK Bot
344f61f247 Merge remote-tracking branch 'origin/master' into develop 2021-01-21 15:35:05 +00:00
mtei
b79ee92a12 update CI list about helix keyboards
* exclude 'helix/rev3_4rows' from CI
  Since helix/rev3_4rows is almost the same as helix/rev3_5rows, there is no point in checking with travis-ci.

* include 'helix/pico/back' to CI
  helix pico and helix rev2 are still available. I would like to check both by travis-ci, but here I will add a check only for helix pico.
2021-01-21 07:34:00 -08:00
Nick Brassel
bdb757e189
ChibiOS conf migrations... take 11 (#11646)
* Allow forcing re-migration.

* ChibiOS conf upgrade for acheron/arctic

 acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368

* ChibiOS conf upgrade for acheron/austin

 acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7

* ChibiOS conf upgrade for acheron/keebspcb

 acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4

* ChibiOS conf upgrade for acheron/lasgweloth

 acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581

* ChibiOS conf upgrade for aeboards/ext65/rev2

 aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87

* ChibiOS conf upgrade for ai03/vega

 ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80

* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7

* ChibiOS conf upgrade for at_at/660m

 at_at/660m - 9999583e8bec2772046132a22818482d24e18c84

* ChibiOS conf upgrade for box75

 box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e

* ChibiOS conf upgrade for bt66tech/bt66tech60

 bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454

* ChibiOS conf upgrade for cannonkeys/an_c

 cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f

* ChibiOS conf upgrade for cannonkeys/atlas

 cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743

* ChibiOS conf upgrade for cannonkeys/chimera65

 cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5

* ChibiOS conf upgrade for cannonkeys/db60

 cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09

* ChibiOS conf upgrade for cannonkeys/devastatingtkl

 cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2

* ChibiOS conf upgrade for cannonkeys/instant60

 cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4

* ChibiOS conf upgrade for cannonkeys/instant65

 cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda

* ChibiOS conf upgrade for cannonkeys/iron165

 cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03

* ChibiOS conf upgrade for cannonkeys/obliterated75

 cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc

* ChibiOS conf upgrade for cannonkeys/onyx

 cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e

* ChibiOS conf upgrade for cannonkeys/ortho48

 cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1

* ChibiOS conf upgrade for cannonkeys/ortho60

 cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc

* ChibiOS conf upgrade for cannonkeys/ortho75

 cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647

* ChibiOS conf upgrade for cannonkeys/practice60

 cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5

* ChibiOS conf upgrade for cannonkeys/practice65

 cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c

* ChibiOS conf upgrade for cannonkeys/rekt1800

 cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf

* ChibiOS conf upgrade for cannonkeys/sagittarius

 cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9

* ChibiOS conf upgrade for cannonkeys/satisfaction75

 cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a

* ChibiOS conf upgrade for cannonkeys/savage65

 cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4

* ChibiOS conf upgrade for cannonkeys/tmov2

 cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778

* ChibiOS conf upgrade for cannonkeys/tsukuyomi

 cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d

* ChibiOS conf upgrade for cheshire/curiosity

 cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a

* ChibiOS conf upgrade for coarse/cordillera

 coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093

* ChibiOS conf upgrade for converter/siemens_tastatur

 converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4

* ChibiOS conf upgrade for cutie_club/borsdorf

 cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7

* ChibiOS conf upgrade for dekunukem/duckypad

 dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2

* ChibiOS conf upgrade for ebastler/isometria_75/rev1

 ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0

* ChibiOS conf upgrade for ergodox_infinity

 ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964

* ChibiOS conf upgrade for function96

 function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2

* ChibiOS conf upgrade for geekboards/macropad_v2

 geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18

* ChibiOS conf upgrade for generic_panda/panda65_01

 generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458

* ChibiOS conf upgrade for handwired/ck4x4

 handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7

* ChibiOS conf upgrade for handwired/onekey/blackpill_f401

 handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d

* ChibiOS conf upgrade for handwired/onekey/blackpill_f411

 handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30

* ChibiOS conf upgrade for handwired/onekey/bluepill

 handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a

* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco

 handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099

* ChibiOS conf upgrade for handwired/onekey/teensy_32

 handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c

* ChibiOS conf upgrade for handwired/onekey/teensy_lc

 handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05

* ChibiOS conf upgrade for handwired/pill60/blackpill_f401

 handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8

* ChibiOS conf upgrade for handwired/pill60/blackpill_f411

 handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51

* ChibiOS conf upgrade for handwired/pill60/bluepill

 handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3

* ChibiOS conf upgrade for handwired/riblee_f401

 handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b

* ChibiOS conf upgrade for handwired/riblee_f411

 handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013

* ChibiOS conf upgrade for handwired/sono1

 handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a

* ChibiOS conf upgrade for handwired/t111

 handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c

* ChibiOS conf upgrade for handwired/twadlee/tp69

 handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158

* ChibiOS conf upgrade for handwired/z150

 handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb

* ChibiOS conf upgrade for hub20

 hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e

* ChibiOS conf upgrade for iron180

 iron180 - 5efb6f21c848b3c964795d9debddceac7628933d

* ChibiOS conf upgrade for jm60

 jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299

* ChibiOS conf upgrade for keebio/bdn9/rev2

 keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d

* ChibiOS conf upgrade for keebio/choconum

 keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f

* ChibiOS conf upgrade for misterknife/knife66

 misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699

* ChibiOS conf upgrade for misterknife/knife66_iso

 misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70

* ChibiOS conf upgrade for nebula12

 nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610

* ChibiOS conf upgrade for nemui

 nemui - 4030faa372512f766fd747876cb28176302453f9

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918

* ChibiOS conf upgrade for nightingale_studios/hailey

 nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be

* ChibiOS conf upgrade for planck/rev6

 planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10

* ChibiOS conf upgrade for primekb/meridian

 primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50

* ChibiOS conf upgrade for projectkb/alice

 projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc

* ChibiOS conf upgrade for projectkb/signature87

 projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d

* ChibiOS conf upgrade for ramonimbao/squishy65

 ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53

* ChibiOS conf upgrade for ramonimbao/wete

 ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00

* ChibiOS conf upgrade for rart/rartlice

 rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0

* ChibiOS conf upgrade for retro_75

 retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91

* ChibiOS conf upgrade for rocketboard_16

 rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54

* ChibiOS conf upgrade for satt/vision

 satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a

* ChibiOS conf upgrade for technika

 technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2

* ChibiOS conf upgrade for tkc/godspeed75

 tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6

* ChibiOS conf upgrade for tkw/stoutgat/v2/f411

 tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426

* ChibiOS conf upgrade for viktus/styrka

 viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60

* ChibiOS conf upgrade for westfoxtrot/prophet

 westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b

* ChibiOS conf upgrade for whitefox

 whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c

* ChibiOS conf upgrade for wolfmarkclub/wm1

 wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4

* ChibiOS conf upgrade for xelus/kangaroo

 xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e

* ChibiOS conf upgrade for xelus/trinityxttkl

 xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79

* ChibiOS conf upgrade for xelus/valor_frl_tkl

 xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c

* ChibiOS conf upgrade for zoo/wampus

 zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a

* ChibiOS conf upgrade for zvecr/split_blackpill

 zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
2021-01-21 17:00:53 +11:00
QMK Bot
34b88a2fd4 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:33:12 +00:00
datafx
1328ab7c7d
Correct LED physical mapping on monstargear xo87 rgb pcb (#11629)
* corrected LED physical mapping

* Corrected issue that made VIA display layer 1 incorrectly

Co-authored-by: datafx <digitalfx@phreak.tech>
2021-01-19 23:32:39 -08:00
QMK Bot
b1e6f1b7e0 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:27:33 +00:00
James Young
9a070475ef
Handwired ASkeyboard Sono1: Configurator fixes (#11625)
* info.json: human-friendly formatting

* info.json: correct key order
2021-01-19 23:27:04 -08:00
QMK Bot
ef3bd54a17 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 05:07:32 +00:00
LSChyi
eacb596d8b
[Keyboard] Add indicator LED support to playkbtw/helen80 (#11560)
* add indicator led support

* use LED config instead
2021-01-19 21:06:35 -08:00
QMK Bot
87d9534d81 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:15:12 +00:00
X-Bows Tech
1bb9f155a6
[Keyboard] Update X-Bows Nature Keyboard (#11538)
* Update config.h

* Update nature.c

* Update rules.mk

* Update keymap.c
2021-01-19 19:14:39 -08:00
Raphael Megzari
6db22011a5
[Keymap] add happysalada (#11535)
* add keymap: happysalada

* use enum instead of define

* remove uneeded config file
2021-01-19 19:14:16 -08:00
QMK Bot
1ab1ba3c3e Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:05:53 +00:00
Aaron Ireland
45bec2d281
[Keymap] Mac-friendly KBD 75% layouts (#11507)
* Add Aaron's KBD75 v2 for Macbook

* Add Colemak & Dvorak layers

* Update keymap to adhere to style guide and add license

* Rename README.md to readme.md
2021-01-19 19:05:23 -08:00
QMK Bot
a9dee31362 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:52:01 +00:00
Craig Gardner
d28d474dc0
[Keyboard] Leafcutterlabs (#11464)
* add support for bigknob

Add support for bigknob macropad

* corrected files

* Apply suggestions from code review

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

* corrected tap dance

* Update config.h

* correct image link

* Apply suggestions from code review

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

* added GPL headers

* Update readme.md

* update rules to disable tap dance

* remove tap dance

* Update rules.mk

trying to get to pass travis test

* Update rules.mk

remove tap dance

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:51:33 -08:00
QMK Bot
0857321317 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:05:38 +00:00
MesaKeyboards
974d3f1ffd
[Keyboard] Add Mesa TKL (#11294)
* Add keyboard: Mesa TKL

* Fix image link in readme

* Update keyboards/mesa/mesa_tkl/mesa_tkl.c

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

* Update keyboards/mesa/mesa_tkl/rules.mk

White space changes

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

* Replace tabs with spaces per C coding conventions.

* Update keyboards/mesa/mesa_tkl/readme.md

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:05:08 -08:00
QMK Bot
1bc8e785bf Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:47:32 +00:00
melonbred
e6a90c8b04
Update info.json - Program Yoink (#11558)
* Update info.json

Fix ortho_split
2021-01-19 17:47:02 -08:00
QMK Bot
b9ddccf035 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:42:07 +00:00
Ryan
2cdc3699e1
Remove DESCRIPTION, W-Z (#11633) 2021-01-20 12:41:34 +11:00
QMK Bot
36784a99a9 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:41:10 +00:00
Ryan
e0ed2c950d
Remove DESCRIPTION, R-V (#11632) 2021-01-20 12:40:35 +11:00
QMK Bot
d5ab40aa60 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 00:58:19 +00:00
Ryan
4ed67d666e
Remove DESCRIPTION, N-Q (#11631) 2021-01-20 11:57:45 +11:00
Nick Brassel
9e18f41fcf Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 10:00:28 +11:00
Ryan
1e1b469fa2
Remove DESCRIPTION, K-M (#11619) 2021-01-20 09:56:41 +11:00
Nick Brassel
78fe155b72
Fix up comments showing how to execute config migration. (#11621) 2021-01-20 02:19:36 +11:00
Nick Brassel
3b1ffd2ede
ChibiOS enable memory allocations (#11620) 2021-01-19 14:50:51 +00:00
Ryan
62f304a225
Remove DESCRIPTION, H-J (#11616) 2021-01-20 00:38:12 +11:00
Nick Brassel
19c180ef88
ChibiOS conf migrations... take 10 (#11617)
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for chavdai40

 chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8
 chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad

* ChibiOS conf upgrade for jm60

 jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
2021-01-20 00:35:24 +11:00
Nick Brassel
d85b27bbbc
Leftover early initialisation conversions (#11615)
* jm60

* ergodox_stm32

* F042 bootloader jumps.

* xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.

* matrix/m20add, matrix/noah
2021-01-20 00:23:07 +11:00
Nick Brassel
d668fd3977 Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 00:18:11 +11:00
Glen D'souza
d24fe4f1ca
GCC 10 compatibility for Ploopy optical encoder (#11586) 2021-01-19 13:23:54 +11:00
CMMS-Freather
677789df77
change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap fimware (#11443)
* 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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 13:23:13 +11:00
QMK Bot
6b0ed6a29b Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:12:14 +00:00
Benjamin Garcia
1dc466d22b
New keymaps with KC_LGUI on another key and scroll with encoder (#11479)
* feat(kyria): new keymaps with KC_LGUI on another key

add also possibility to scroll with encoder and finally play with olded
screen to replace default kyria logo by Magic the Gathering mana color
icon.

* Update keyboards/kyria/keymaps/benji/keymap.c

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

* add magic logo

* add mouse button

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-19 13:11:45 +11:00
QMK Bot
732e80e3fe Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:09:28 +00:00
James Young
01bc8e3b52
Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)
* info.json: human-friendly formatting

* info.json: correct key object order

* info.json: replace Unicode characters

They don't play nice with `qmk info -l`.

* info.json: correct keyboard dimensions
2021-01-19 13:08:57 +11:00
QMK Bot
2f18993905 Merge remote-tracking branch 'origin/master' into develop 2021-01-19 01:22:57 +00:00
James Young
dfb8a29718
Caps Unlocked CU65 layout macro fixes (#11606) 2021-01-19 12:22:26 +11:00
Nick Brassel
94746b6557
Fixup builds on develop branch. (#11600) 2021-01-19 12:18:57 +11:00
QMK Bot
814c4cb56d Merge remote-tracking branch 'origin/master' into develop 2021-01-18 18:59:13 +00:00
datafx
3bb1897bdc
[Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)
* Support for Monstargear XO87 Hot-Swap PCB

* Remove manufacturer from product line

* Removed alternate bootloaders

* Updated info.json

* Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h

* Delete kb.h

* Update rgb.h

* Update rules.mk

* Add files via upload

* Delete kb.h

* Update keymap.c

* Update config.h

* Update rgb.c

* Add via RGB support

* Update info.json

* Update readme.md

* Update readme.md

* Update config.h

* Update rgb.h

* Update config.h

* Mirror factory layout

* Mirror factory layout

* Update rgb.h

* Update keyboards/xo87/rgb/rgb.c

* Update rgb.c

* Update keyboards/xo87/rgb/config.h

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update config.h

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* remove deprecated action_get_macro()

* rearrange layout per request

* rearrange layout per request

* Update keyboards/xo87/rgb/rgb.h

* Update keyboards/xo87/rgb/keymaps/default/readme.md

* Update keyboards/xo87/rgb/readme.md

* Bugfix for RGB Matrix

* Bugfix for RGB Matrix

* Moved to new subdirectory and updated build commands to reflect changes

* Remove old files
2021-01-18 10:58:09 -08:00
QMK Bot
ffaaadc270 Merge remote-tracking branch 'origin/master' into develop 2021-01-18 12:47:01 +00:00
James Young
03bacec87d
Naked64 Configurator update and rework (#11568) 2021-01-18 23:45:56 +11:00
Nick Brassel
e0e67df933
ChibiOS conf migrations... take 9 (#11598)
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f

* ChibiOS conf upgrade for jm60

 jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18 13:16:59 +11:00
QMK Bot
82a875056c Merge remote-tracking branch 'origin/master' into develop 2021-01-18 01:50:00 +00:00
Ryan
cc3f2e2865
Remove DESCRIPTION, E-G (#11574) 2021-01-18 12:49:25 +11:00
QMK Bot
98b1cccd12 Merge remote-tracking branch 'origin/master' into develop 2021-01-17 17:04:28 +00:00
nibiria
f0f6174136
[Keyboard] add Stream15 keyboard (#11515)
* add keyboard Stream15

* committted changes as suggested by drashna

* committed further changes as suggested

* Update info.json

removed excessive comma

* Update keyboards/nibiria/stream15/rules.mk

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

* Update keyboards/nibiria/stream15/keymaps/via/rules.mk

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

* Update keyboards/nibiria/stream15/readme.md

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

* resolved 2 more issues

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-17 09:03:53 -08:00
Nick Brassel
f08a11fad3
ChibiOS conf upgrade for hub20 (#11588)
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
2021-01-17 13:53:03 +00:00
QMK Bot
f35b1127fa Merge remote-tracking branch 'origin/master' into develop 2021-01-15 21:50:23 +00:00
ridingqwerty
c628408688
New Keyboard: walletburner/cajal (#10458)
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* New Keyboard: walletburner/cajal

* Added license attribution to *.{c,h} files

* Update keyboards/walletburner/cajal/config.h

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

* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c

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

* Rename 'ortho' keymap to 'default_ortho'

* Update keyboards/walletburner/cajal/cajal.c

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

* Update readme.md

Adding bootloader instructions.

Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-15 16:49:49 -05:00
QMK Bot
6525551357 Merge remote-tracking branch 'origin/master' into develop 2021-01-15 20:41:00 +00:00
Peter Peterson
fe14907039
Adds VIA support for the KPRepublic's BM60 Poker (#11267)
* WIP working on new keymap

* tweaking keymap

* updated keymap

* cleaned up a little bit

* New preonic keymap

* my preonic keymap

* added mac layout

* preonic map update

* cleaning up old repo

* cleaning up to match upstream

* more cleanup

* removing old keymaps

* cleaned up commit history for bm60poker via support

* cleaned up via keymap

* fixed copywrite

Co-authored-by: Peter Peterson <ppeterson@noao.edu>
2021-01-15 15:40:26 -05:00
QMK Bot
fef4ed568e Merge remote-tracking branch 'origin/master' into develop 2021-01-15 08:26:36 +00:00
James Young
d72f5435fb
Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)
* human-friendly formatting

* correct key order
2021-01-15 00:25:50 -08:00
fauxpark
ca7da3866d Merge remote-tracking branch 'upstream/master' into develop 2021-01-15 18:34:12 +11:00
James Young
8cf5f72aad
Cutie Club Borsdorf: Configurator key sequence fix (#11549)
* human-friendly formatting

* correct key order (ISO Enter)
2021-01-14 23:26:30 -08:00
Ohashi
6009a91514
[Keyboard] Add cool836A 1_2 (#11467)
* 1st trial on 1_2

* remove keymaps/default/km_default.c

* fix cool836A.h

* fix keymap.c into 3x12

* rename to cool836a (not 'A')

* remove cool836A (not a)

* remove backslashes at keymap.c

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

* update keymap.c (add licence)

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

removed "<br>" in line 2

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

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

remove "<br>" in line 4

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

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

remove "<br>" in line 8

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

* Update keyboards/cool836a/cool836a.h

remove cool836a.h line 30:36

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 22:27:21 -08:00
Andy
f1b06d0ae7
[Keymap] Adds ymdk/ymd09 andys8 layout (#11320)
Custom layout for macropad. It shows the usage of macros with unicode,
and other layouts (ISO-DE) with unicode, emojis, and git commands.
2021-01-14 11:29:22 -08:00
Domantas
e9f73e5454
[Keymap] Add domnantas lily58 keymap (#10910)
* Initialize domnantas layout

* Update oled status display

* Layout and oled changes

* Updates to keymap

* Add F keys and page moves

* Add media keys, rearrange home and end

* Add instructions

* Swap backspace and enter

* Remove unnecesary Enter keymap

* - Change display timeout
- Update minus sign to work on both English and Lithuanian layouts

* Add copyright header

* Replace static strings with PSTR

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/rules.mk

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 11:04:30 -08:00
Ryan
f325bd6eb2
Remove DESCRIPTION, B-D (#11513) 2021-01-15 05:00:04 +11:00
QMK Bot
4b44452900 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 16:58:07 +00:00
Nick Blyumberg
3525a61baf
Updated documentation for new BDN9 board revisions (#11380)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
2021-01-14 11:57:30 -05:00
QMK Bot
749d9f2227 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:08:25 +00:00
Joshua Diamond
c46619d8fb
[Keyboard] eliminate nested layout warnings in kbd75 (#11540) 2021-01-13 23:07:47 -08:00
QMK Bot
a668640a3f Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:03:47 +00:00
melonbred
b323ab89e0
[Keyboard] Added Ortho support to Program Yoink kb (#11534)
* Added Ortho support

* Updated JSON
2021-01-13 23:03:12 -08:00
QMK Bot
18ae86faf5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:01:48 +00:00
J.Flanagan
1f633c027b
[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>
2021-01-13 23:01:14 -08:00
QMK Bot
15f0fa85c9 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:58:28 +00:00
duoshock
1f38221ec5
[Keyboard] Add ISO Macro keyboard (#11517)
* -

* -

* -

* -

* -

Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-01-13 22:57:55 -08:00
QMK Bot
3dfaf12030 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:51:52 +00:00
Eithan Shavit
68c3773c8e
[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>
2021-01-13 22:51:24 -08:00