1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

7600 commits

Author SHA1 Message Date
QMK Bot f410dfa091 Merge remote-tracking branch 'origin/master' into develop 2021-01-01 23:16:33 +00:00
Kyle McCreery 1d2a9a1cdb
[Keyboard] New Keyboard - Mercutio (#11214)
* 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.

* Apply suggestions from code review

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

* Update keyboards/mechwild/mercutio/readme.md

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

* Fixing json syntax.

* Update keyboards/mechwild/mercutio/rules.mk

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-01 15:16:00 -08:00
QMK Bot 428eb5faad Merge remote-tracking branch 'origin/master' into develop 2021-01-01 23:05:35 +00:00
Ross Montsinger fcd921f3aa
[Keyboard] Rebound, adding files for VIA compat (#11193)
* changes for via

* add manu to product name

* remove manu from product value

* remove description

* i m licensed
2021-01-01 15:05:02 -08:00
QMK Bot d288f2f5da Merge remote-tracking branch 'origin/master' into develop 2021-01-01 16:32:49 +00:00
Ryan c01a8b030e
O4L 5x12 refactor (#11392)
* O4L 5x12 refactor

* Remove config.h
2021-01-01 16:32:21 +00:00
QMK Bot 5fe3de3153 Merge remote-tracking branch 'origin/master' into develop 2021-01-01 14:59:27 +00:00
Ryan b5fc6f0682
Fix rart4x4 info.json (#11390) 2021-01-01 14:58:55 +00:00
QMK Bot 8a2a39ed06 Merge remote-tracking branch 'origin/master' into develop 2021-01-01 13:53:22 +00:00
Ryan aab056a4a6
Manta60 refactor (#11378) 2021-01-02 00:52:49 +11:00
QMK Bot 7b83bb188a Merge remote-tracking branch 'origin/master' into develop 2021-01-01 13:43:06 +00:00
Joel Challis 565a038a3d
Fix layout ortho_4x12 macro for montsinger/rebound/rev4 (#11382) 2021-01-01 13:42:36 +00:00
fauxpark e3da93e658 Merge remote-tracking branch 'upstream/master' into develop 2021-01-01 05:09:50 +11:00
Ryan 53e9213a22
Quark refactor (#11377) 2021-01-01 05:04:00 +11:00
Joel Challis a68d289fa5
Manually run formatting CI process (#11375) 2021-01-01 03:50:32 +11:00
QMK Bot da8423ca97 Merge remote-tracking branch 'origin/master' into develop 2020-12-31 15:00:40 +00:00
npspears 4ef4347543
Quark PCB for Planck/Preonic (#11206)
* Quark PCB for Planck/Preonic

Quark provides alternate bottom row layouts for both the OLKB Planck and Preonic

* Rename rules.mk.txt to rules.mk

* added Tapping Toggle

removed tapping toggle from keymap level

* Update info.json

took out } as requested

* update config.h

added GPL2+ license and #pragma once

* update info.json again

cleaned up syntax

* Apply suggestions from code review

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

* update config.h

added GPL2+ License

* Update info.json - and again

fixed it - oops

Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-31 10:00:08 -05:00
QMK Bot 42cdba8680 Merge remote-tracking branch 'origin/master' into develop 2020-12-31 14:53:38 +00:00
Chas 028d2c91dc
Fixed typo in readme.md (#11333)
* Fixed typo in readme.md

censor -> sensor

* Censor -> Sensor in the Ploopy Trackball Readme
2020-12-31 14:53:06 +00:00
QMK Bot e319d501f7 Merge remote-tracking branch 'origin/master' into develop 2020-12-31 12:59:26 +00:00
Álvaro A. Volpato 9f690c94b8
Change PRODUCT_ID descriptors for M80S and M80H (#11371)
* Change PRODUCT_ID descriptors for M80S and M80H

* Update config.h

* Update config.h

* Update config.h

* Remove PRODUCT_ID from root config.h
2020-12-31 12:58:59 +00:00
Zach White 47b9b11009
Configure keyboard matrix from info.json (#10817)
* Make parameters from info.json available to the build system

* move all clueboard settings to info.json

* code formatting

* make flake8 happy

* make flake8 happy

* make qmk lint happy

* Add support for specifying led indicators in json

* move led indicators to the clueboard info.json

* Apply suggestions from code review

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* add missing docstring

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-12-30 10:27:37 -08:00
QMK Bot f231f24dda Merge remote-tracking branch 'origin/master' into develop 2020-12-30 16:35:16 +00:00
Nick Blyumberg 5e5ee3f8de
Correct encoder pins on BDN9v2 (#11357)
* Update config.h

Wrong pin used for the left encoder, should be A4

* Update config.h

Added a media keys fix as well
2020-12-30 16:34:40 +00:00
QMK Bot 78b12dee89 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 09:06:36 +00:00
Enoch 1aa8a3b424
[Keymap] Yd60mq add 64 key layout (#11207)
* 64 key layout

* add license

* add license

add name
2020-12-30 01:06:02 -08:00
QMK Bot a63db4b179 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 03:56:14 +00:00
swampmonster a038b712d0
[Keyboard] Add support to Kyria for the 2x2u layout (#11227)
* Adding support for the 2 x 2u layout.

This adds a macro to support the 2 x 2u layout which facilitates
a cleaner looking layout configuration for the people using it.

* Update keyboards/kyria/kyria.h

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

Co-authored-by: swampmonster <>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-29 19:55:40 -08:00
QMK Bot ade1a34cc8 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 03:26:45 +00:00
ReFil fda514bbd7
[Keyboard] Polarity works CRBN support (#11107)
* Initial CRBN compatibility

Updated readme.md too

* formatting tweaks to meet requirements

* Update crbn.c

* Create readme.md

* Required fixes and licence header

* Fixes

* Apply suggestions from code review

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

* Update keyboards/crbn/rules.mk

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

* Update keyboards/readme.md

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

* Update crbn.c

* Update keyboards/crbn/crbn.c

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

* Licence headers

* Create info.json

* Apply suggestions from code review

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

* Configurator support

* Update keymap.c

* Update keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-29 19:26:16 -08:00
QMK Bot c989da4cfd Merge remote-tracking branch 'origin/master' into develop 2020-12-30 03:22:16 +00:00
Joshua Diamond c9156b50d9
[Keymap] spidey3 keymap for DMQDesign Spin (#11194)
* My first cut at firmware for te DMQDesign Spin

* Turn off underglow when computer sleeps

* dmqdesigns spin - a little more refined keymap now

* a few more refinements for spin

* missing key up event for CH_CPNL and CH_ASST

* better naming for keymap

* cformat

* Apply suggestions from code review

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

* Old #include habits die hard... :)

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-29 19:21:44 -08:00
QMK Bot 163e47c29d Merge remote-tracking branch 'origin/master' into develop 2020-12-30 02:06:23 +00:00
kb-elmo b4ea0a70be
Add Axolstudio Helpo (#11117)
* add axolstudio helpo

* reverse matrix

* fix path in readme

* Apply suggestions from code review

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

* Update keyboards/axolstudio/helpo/readme.md

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>
2020-12-30 02:05:48 +00:00
QMK Bot ed94fe28bf Merge remote-tracking branch 'origin/master' into develop 2020-12-30 01:49:49 +00:00
cole smith c89930ca01
The mark: 65 (#11060)
* added main keyboard files

* working default and iso maps

* add via config

* made default ansi map

* fixed info.json and made readme

* renamed folders

* reincluding the folders I renamed

* Apply suggestions from code review

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

* I made a change before PR to clean up VIA map that broke it now its fixed

* Apply suggestions from code review

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

* Update keyboards/boardsource/the_mark/the_mark.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-12-30 01:49:13 +00:00
QMK Bot 5e9b002808 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 01:46:45 +00:00
Suschman a94044c15c
40percentclub sixpack support (#11007)
* QMK support for 40percentclub SixPack

* Update readme.md

* QMK support for 40percentclub SixPack

* fix info.json

* Apply suggestions from code review

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

* update PRODUCT name and change BL levels to 6

* Add Fkeys keymap

* correct readme

* add via keymap

* correct readme

* change indentation

* Apply suggestions from code review

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

* requested change and more cleanup

* Update keyboards/40percentclub/sixpack/sixpack.h

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Suschman <suschman@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-12-30 01:46:16 +00:00
QMK Bot 154bf92b5b Merge remote-tracking branch 'origin/master' into develop 2020-12-30 01:28:05 +00:00
Álvaro A. Volpato 457042f179
Mode80 support (#10945)
* Add default mode eighty firmware

* Add via keymap

* Mode80 firmware upgrades

- Removed SPI and PWM drivers from MCU configuration, HAL configuration and Chibi configuration as neither peripherals are being used
- Included second backspace key (row 5, col 14) which should solve the non-appearance of the backspace key on the hotswap PCB

* Add default mode eighty firmware

* Add via keymap

* Update keyboards/mode/eighty/config.h

Remove comment lines from config.h

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

* Update keyboards/mode/eighty/config.h

Remove comments from config.h

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

* Update eighty.c

Add GPLv2 header

* Update eighty.h

Add GPLv2 license header

* Update readme.md

Update README

* Update keyboards/mode/eighty/config.h

Remove keyboard description

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

* Delete config.h

Delete config.h in keynap folder

* Update keyboards/mode/eighty/rules.mk

Remove feature disabling in rules.mk

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

* Move rules.mk to VIA folder

* Update keyboards/mode/eighty/keymaps/via/rules.mk

Use LTO_ENABLE as short for LINK_TIME_OPTIMIZATION_ENABLE

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

* Update keyboards/mode/eighty/readme.md

Puts a single image embedded in the readme, and links to the full gallery

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

* Update keyboards/mode/eighty/readme.md

Use * for markdown list

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

* Apply suggestions from code review

Correct comment characters

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

* Adjusted copyright name, USB descriptor and removed info.json

* Separate Mode80 S and H firwares into subfolders

* Added info.json files for QMK Configurator

* Lowercase folder and filenames

* Remove config definition macros in M80H

* Remove config definition macros in M80S and root

* Change definitions to lowercase parameters

* Moce chconf and mcuconf chibiOS files to root folder

* Move halconf to root folder, keymaps to subfolders

* Update readme for building/flashing guide

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

* Add layers to VIA keymaps, remove CONSOLE_ENABLE

* Push master changes to lib/

* Retrieve lufa and googletest submodules to previous heads at master

* Disabled LTO in VIA keymaps

* Fix layout declaration to lowercase in m80s default keymap

* Added readme's for each M80S and M80H

Co-authored-by: Jaicob <jaicob@icloud.com>
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-12-30 01:27:33 +00:00
QMK Bot aae0e12385 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 01:14:12 +00:00
LongerHV 944feb2da5
[REDOX] Fix default keymap formatting (#11288) 2020-12-30 12:13:37 +11:00
QMK Bot e3ce3d6e30 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 01:07:23 +00:00
TJ b49c657ac1
[Keyboard] Add via support for le chiffren (#10597)
* add Via support and improve default keymap

* Update OLED widgets with Sickbabies updates. Add license headers

* Add led matrix config

* Add g_led_config

* Fix rules for matrix

* rules.mk updates

* Fix key lock state widgets
rebase on master

* Rules fixes

* remove LED_MAP
2020-12-29 17:06:52 -08:00
QMK Bot dae6249efa Merge remote-tracking branch 'origin/master' into develop 2020-12-30 00:58:48 +00:00
NightlyBoards ac433b218d
[Keyboard] Add the Octopad (#9946)
* Create Alter folder

* Revert "Create Alter folder"

This reverts commit 361103b821.

* Add octopad folder

* Added a new keyboard, the Octopad

* Edited files based on requested changes

* Moved encoder code in keyboard level

* Updated the readme

* Corrected the rows and columns of encoders on config.h

* Changed the Vendor ID to D812 since the first one was already taken

* Added support for ast1109MLTRQ speakers

* Increased number of layers to 8 on VIA keymap

* Edited files based on comments

* Edited rules.mk as per comment

* Edited readme.md as per comment
2020-12-29 16:58:14 -08:00
Aldehir Rojas 4f2f21dc05
Rewrite APA102 support (#10894)
* Rewrite APA102 support

The APA102 source was broken by commit 16a15c1cfc as it did not include the
quantum header. This commit addresses that, as well as other issues with
transferring bytes over the SPI interface, i.e. it was not setting the
clock pin back to low after sending a bit.

The deviation when sending the end frame is kept, but updated to the
latest from the referenced project.

Finally, these changes expose the global LED brightness parameter
of the APA102. Brightness values are configurable through
`APA102_DEFAULT_BRIGHTNESS` and `APA102_MAX_BRIGHTNESS`.

* Fix typo in led brightness extern

* Move driver out of AVR directory and add delay for ARM

* Experimental APA102 support on AVR and ARM

Co-authored-by: Alde Rojas <hello@alde.io>

* Refactor apa102_send_byte() calls to a loop

* Implement io_wait function for ARM

* Move APA102 drivers to own directory, fix copyright notice

* Add APA102 keymap to handwired/onekey

* Simplify RGBLIGHT_ENABLE/DRIVER option handling

Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
2020-12-30 00:28:49 +00:00
QMK Bot 7dd99f2b22 Merge remote-tracking branch 'origin/master' into develop 2020-12-30 00:06:16 +00:00
Naoto Takai 8ee03f6a6b
Update Choco60 firmware to support new PCB (#11218)
* Update vendor and product info

* Add rev2 for Choco60

* Add keymap for VIA

* Add readme.md for rev1 and rev2

* Use list instead of new line

* Remove DESCRIPTION

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

* Update rev1/readme.md to specify rev1 directly.

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

* Remove some definitions

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

* Remove comments

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-30 00:05:48 +00:00
QMK Bot e29b9e32bb Merge remote-tracking branch 'origin/master' into develop 2020-12-30 00:03:43 +00:00