1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

15369 commits

Author SHA1 Message Date
QMK Bot 862b01d4c0 Merge remote-tracking branch 'origin/master' into develop 2021-03-24 02:00:40 +00:00
duoshock 7b07ce3fef
Add UC-1 keypad (#11926)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-03-24 13:00:07 +11:00
QMK Bot 9afbbf21fd Merge remote-tracking branch 'origin/master' into develop 2021-03-23 18:19:00 +00:00
Viktor Eikman d395c81606
Configurator fixes for handwired/concertina/64key (#12316)
* Fixed bug that was hiding a key in info.json.

* Improvements to presentation.
2021-03-23 11:18:19 -07:00
QMK Bot b2cfb629e4 Merge remote-tracking branch 'origin/master' into develop 2021-03-23 15:11:57 +00:00
Danny be257b6f9f
Add Sinc Rev. 2 (#12138) 2021-03-23 11:11:07 -04:00
QMK Bot 34423580e0 Merge remote-tracking branch 'origin/master' into develop 2021-03-23 07:01:25 +00:00
Luca Di Bartolomeo d4a8123267
Update readme.md on quefrency (#12276)
* Update readme.md on quefrency

Fix incorrect flashing instructions

* Update keyboards/keebio/quefrency/readme.md
2021-03-23 00:00:34 -07:00
QMK Bot e6d83644e8 Merge remote-tracking branch 'origin/master' into develop 2021-03-23 01:59:02 +00:00
Zach White e1a7027fe8
use layout aliases when processing info.json (#12333) 2021-03-22 18:58:07 -07:00
QMK Bot fe58770df8 Merge remote-tracking branch 'origin/master' into develop 2021-03-21 02:43:41 +00:00
kb-elmo c5b0366a25
Fix Kira80 license headers (#12303)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-03-21 13:43:04 +11:00
Donald Kjer 00a0c81f8e
Durgod keyboard refactor in preparation for adding additional durgod keyboards (#11978)
* Durgod keyboard refactor in preparation for adding additional durgod keyboards

* Moving Durgod board configuration into a common location
* Reformatting layout macro whitespace
* Moving TGUI key functionality to the keyboard level
* Replacing default keymap.c with keymap.json
* Changing default and default_toggle_mac_windows keymaps to LAYOUT_all
* Increasing EEPROM size to support more VIA layers
* Fixing media keys; KC_MRWD/KC_MFFD => KC_MPRV/KC_NXT

* Move ISO Enter key to the correct row in Durgod K320

* Minor whitespace and readme cleanup for K320

* Changing durgod/k320 debounce back to default

* Simplifying DURGOD_STM32_F070's chconf.h

Co-authored-by: Simon Arlott <sa.me.uk>
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
2021-03-21 11:11:22 +11:00
QMK Bot 945b7a0613 Merge remote-tracking branch 'origin/master' into develop 2021-03-20 03:53:28 +00:00
James Young 217e3a59c4
Boston: correct LAYOUT macro data (#12282)
- correct macro reference
- add missing encoder position
- correct maintainer value to reference keyboard maintainer's GitHub account
- remove trailing whitespace
2021-03-20 14:53:02 +11:00
Ryan ed28795651
LED Matrix: Additional common_features.mk tweaks (#12187) 2021-03-20 14:52:33 +11:00
QMK Bot 9d547a8443 Merge remote-tracking branch 'origin/master' into develop 2021-03-20 00:13:10 +00:00
noclew 0ab88f5342
[Keyboard] Vanana, Vaguette Lite, and Waaffle (#11441)
* added Vanana / Vaguette Lite / Waaffle

* changed extra GPIO allocations of Waaffle and Vanana

* Apply suggestions from code review

changed layout name of vaguette Lite / requested by drashna

* Apply suggestions from code review

Requested keymap changes have been made.

* all changes requested by collaborators are made

* RGB config updated / keymap updated

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* Apply suggestions from code review

request changes are made

* pre rename h

* vaguettelite reanmed to lowercases

* fixed vanana keymap

* Apply suggestions from code review

* changed Bootmagic key of VaguetteLite as suggested

* Updated via keymap of Vaguette Lite as suggested

* add vaguette lite 6.25 layout

* added vaguette lite noclew keymap

* updated vaguette lite 6.25u keymap description

* updated vanana default keymap

* updated keymap spacing

* reabased from the official repo

* Update keymap.c

fixed vaguette lite keymap

* Apply suggestions from code review

All the requested changes by a collaborator were made.

* updated info.json of Vanana and readme files of Vanana and waffle

* rename LAYOUT_waaffle to LAYOUT_ortho_5x16

Also adjusts the info.json data to put a visual gap between the extension and main PCBs.

* make rules.mk and info.json specific to rev3

Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository.

* add controller board build targets

Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each.

Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build.
2021-03-19 17:12:38 -07:00
QMK Bot c2dc3008b5 Merge remote-tracking branch 'origin/master' into develop 2021-03-19 19:37:22 +00:00
James Young 8dfe37a3a3
Sirius UniGo66 touch-up (#12280)
* un-nest layout macros

* use #pragma once include guard in unigo66.h

* unify rules.mk to QMK AVR template

- remove Bootloader selection comment block
- unify Build Option header comment
- align Build Option rules and inline comments

* remove unused LAYOUT_all macro

* update readme.md to match QMK template
2021-03-19 12:36:52 -07:00
github-actions[bot] 32f0567ca5
Format code according to conventions (#12292)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-19 16:24:36 +00:00
Xelus22 6f7466b6dd
ARM WS2812 SPI config (baudrate and circular buffer) (#12216)
* initial commit

* include circular buffer command

* add endif

* circular buffer mode

* remove untrue comment

* revamp and add documentation

* do not allow WS2812_SPI_SYNC & CIRCULAR_BUFFER
2021-03-19 19:29:18 +11:00
Zach White f2715a0593
Consistently use bin/qmk when that script is called (#12286)
* Pass QMK_BIN down to build_keyboard.mk

* choose the correct qmk script
2021-03-18 16:10:40 -07:00
QMK Bot 90b1e271a8 Merge remote-tracking branch 'origin/master' into develop 2021-03-18 17:25:01 +00:00
Ryan 69eca63a84
qmk doctor: Don't run udev checks under WSL (#12231) 2021-03-19 04:24:21 +11:00
QMK Bot d97a9fb4ff Merge remote-tracking branch 'origin/master' into develop 2021-03-18 14:26:24 +00:00
Xelus22 a5576f9738
[Keyboard] Add Pachi (#12132)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-19 01:25:37 +11:00
QMK Bot 6d050b7282 Merge remote-tracking branch 'origin/master' into develop 2021-03-18 13:17:59 +00:00
kb-elmo c833b77646
Fixed keymap names of Noah AVR (#12265)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-19 00:17:21 +11:00
QMK Bot 74c89de3e9 Merge remote-tracking branch 'origin/master' into develop 2021-03-18 03:38:43 +00:00
James Young ed446360a4
Aleblazer Zodiark touch-up (#12279) 2021-03-18 14:38:08 +11:00
QMK Bot af5c10ef0c Merge remote-tracking branch 'origin/master' into develop 2021-03-18 01:29:25 +00:00
github-actions[bot] 9807225f90
[CI] Format code according to conventions (#12277)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-18 12:28:50 +11:00
QMK Bot 4aa57e9e46 Merge remote-tracking branch 'origin/master' into develop 2021-03-18 00:48:52 +00:00
Ryan 9331c22620
XT converter cleanup (#12264) 2021-03-18 11:48:09 +11:00
QMK Bot d0c2f3c403 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 22:33:49 +00:00
Salman cc84831cae
Adding Keyboard: GMMK Pro (#12030)
* GMMK Pro QMK Firmware Code

* info.json added

* updated info.json for the unused keys

* redoing info.json

* readme for pro

* gmmk initial readme

* pipeline fix, issue with compiling gmmk.h

* gmmk pro code formatting changes

* removed rules.mk

* noci file

* Updates

* updated matrix function to match keymap

* updating the keymap layout, renaming matrix, updating layout name to LAYOUT

* fauxpark changes added

* PID VID updates

* removed chconfig and made rules.mk comments cleaner

Co-authored-by: Drashna Jael're <drashna@live.com>
2021-03-18 09:33:16 +11:00
QMK Bot 31b657e8ea Merge remote-tracking branch 'origin/master' into develop 2021-03-17 17:08:39 +00:00
klausweiss f490777502
[Keyboard] Add handwired/bolek keyboard (#12234)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-17 10:07:56 -07:00
QMK Bot 3367705ac2 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 17:02:38 +00:00
Felix Springer 6e79767f5a
[Keymap] jumper149 keymap for the dztech/dz65rgb (#12142) 2021-03-17 10:02:00 -07:00
QMK Bot 6671344602 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 16:44:59 +00:00
Robert Verst 3bc7f46412
[Keymap] Add userspace rverst (#12205)
Co-authored-by: Robert Verst <robert.verst@tobit.com>
2021-03-17 09:44:21 -07:00
XScorpion2 60837c9d0f
[Keyboard] Split RGB Matrix Zygomorph support (#11083) 2021-03-16 23:56:39 -07:00
QMK Bot d4ac56226d Merge remote-tracking branch 'origin/master' into develop 2021-03-17 06:50:58 +00:00
tszaboo 8a2d3a8861
[Keyboard] Add support for ortho4exent (#11699)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-16 23:50:22 -07:00
QMK Bot 29589ce832 Merge remote-tracking branch 'origin/master' into develop 2021-03-17 06:48:33 +00:00
im a can what do you think lmao? 538194344a
[Keyboard] add oled and encoder function to lck75 (#11825)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-16 23:48:03 -07:00
QMK Bot 5e7a7c7e2f Merge remote-tracking branch 'origin/master' into develop 2021-03-17 06:47:59 +00:00
Salicylic-acid3 23765332fa
[Keyboard] Modification of ErgoArrows info.json (#11980)
The order of key descriptions in ErgoArrows info.json was wrong, so it has been corrected.
2021-03-16 23:47:18 -07:00