summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2 (#11739)Andy Freeland2021-02-288-3/+176
| | | | | | | | | | | | | | | | | | * [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2 This is already supported by VIA. * [Keymap] Fix kbd67 catrielmuller_camilad keymap * [Keyboard] Add my keymap for KBDfans KBD67 rev2 using 'LAYOUT_65_ansi_split_bs'
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-1/+16
|\|
| * Satisfaction 75 turn off backlight on suspend, restore config on wakeup (#11774)Mario Medina2021-02-282-1/+16
| | | | | | | | | | * Satisfaction 75 turn off backlight on suspend, restore config on wakeup * Disable SLEEP_LED_ENABLE because it has no effect
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2814-0/+814
|\|
| * Added n60_s folder (#11455)NightlyBoards2021-02-2814-0/+814
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create Alter folder * Revert "Create Alter folder" This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c. * Added n60_s folder * Fixed the url of the image in the readme * Updated readme * Updated readme * Updated readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-1/+136
|\|
| * [Docs] New section to modifier docs: Checking Modifier State (#10550)precondition2021-02-282-1/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added new section to docs: Checking Modifier State * Added id anchors to all headers in modifiers docs * Added a Wikipedia link to bitwise operators and... crosslinked to the QMK macro docs. * Added an explanation on the format of mod bitmask * Added .md extension to hyperlinks to macros docs * Corrected mod mask order and changed notation * Documented add_oneshot_mods and del_oneshot_mods * Mentioned modifier checks in the macro docs * Explained strict modifier checking i.e. using `get_mods() & MOD_MASK == MOD_MASK` instead of simply `get_mods() & MOD_MASK` * Added (un)register_mods to the docs * Put left term of comparison in parens
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-3/+3
|\|
| * fix: ryloo studio m0110 layout 60 ansi fixed (#11685)Paweł Kiszteliński2021-02-281-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2814-103/+1058
|\|
| * Fixing K-type RGB lighting (#11551)Andrew-Fahmy2021-02-2814-103/+1058
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial rgb driver fix * added underglow LEDs and fixed typo in RGB locations * removed test code * added my key maps * updated rgb keymap to work with changes * refactored my code to make it more maintainable and updated keymaps. * added GPL licence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2810-0/+621
|\|
| * 17 key Panasonic rotary encoder BLE pad (#11659)haierwangwei20052021-02-2810-0/+621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create rules.mk * Create glcdfonr.c * Create keymap.c * Create keymap.c * Create rules.mk * Add files via upload * Update readme.md * Update readme.md * Update readme.md * Update config.h * Update 10bleoledhub.h * Update 10bleoledhub.c * Update info.json * Update keymap.c * Update keymap.c * Rename glcdfonr.c to glcdfont.c * Update config.h * Update config.h * Update config.h * Update rules.mk * Update 10bleoledhub.c * Update 10bleoledhub.h * Update info.json * Update config.h * Update rules.mk * Update keymap.c * Update keymap.c * Update glcdfont.c * Update keyboards/10bleoledhub/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/10bleoledhub/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/10bleoledhub/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/10bleoledhub/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/10bleoledhub/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/10bleoledhub/10bleoledhub.h Co-authored-by: Ryan <fauxpark@gmail.com> * Create readme.md * Create rules.mk * Create latin47ble.h * Create latin47ble.c * Create info.json * Create config.h * Create keymap.c * Create rules.mk * Create keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latin47ble/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update latin47ble.h * Update latin47ble.c * Update latin47ble.h * Update latin47ble.c * Update keymap.c * Update keymap.c * Update config.h * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/latin47ble/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/latin47ble/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Delete info.json * Update readme.md * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/latin47ble.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/latin47ble.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keymap.c * Update keymap.c * Update latin47ble.h * Update keymap.c * Update keymap.c * Update keymap.c * Update keymap.c * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/latin47ble.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/latin47ble/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update config.h * Create readme.md * Add files via upload * Create glcdfont.c * Create keymap.c * Create keymap.c * Create rules.mk * Update config.h * Update config.h * Update config.h * Update config.h * Update config.h * Update latinpadble.c * Update latinpadble.h * Update config.h * Update config.h * Update keymap.c * Update config.h * Update rules.mk * Update config.h * Update rules.mk * Update rules.mk * Update config.h * Update keyboards/latinpadble/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/latinpadble/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keymap.c * Update glcdfont.c 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-0/+61
|\|
| * Onekey keymap: quine (#10732)ridingqwerty2021-02-282-0/+61
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2813-0/+631
|\|
| * Add keyboard: 7c8/Framework (#11593)Steven Nguyen2021-02-2813-0/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 7c8/framework keyboard * Update VIA framework.json definition * Code cleanup and styling to conform to QMK style guide * Code cleanup and moving some keymap definitions to a 'steven' keymap in order to create a cleaner default keymap for other users * Update keyboards/7c8/framework/config.h Remove #define DESCRIPTION Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/config.h remove #define UNUSED_PINS Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/framework.h Change layout name to existing layout name. Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/7c8/framework/keymaps/via/keymap.c change biton32 to get_highest_layer Co-authored-by: Drashna Jaelre <drashna@live.com> * change vendor ID from 0x07c8 to 0x77c8, which is unused * delete VIA .json definition from via keymap folder * Change framework_grid to LAYOUT_ortho_5x12 in default keymap.c * remove framework.json from 'steven' keymap folder * cleanup * Update keyboards/7c8/framework/config.h 0x77c8 -> 0x77C8 Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2814-298/+126
|\|
| * Hub16 QMK configurator support + various bugfixes (#11496)Josh Johnson2021-02-2814-298/+126
| | | | | | | | | | | | | | | | | | | | * qmk configurator support + various bugfixes * Update keyboards/hub16/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-10/+39
|\|
| * Add support for using podman to util/docker_build.sh (#10819)Max Audron2021-02-282-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | * add podman support to docker_build.sh script * break out runtime into the RUNTIME variable * allows RUNTIME to be set by the user * decides on docker or podman if docker isn't avaible * rewrote check for docker-machine to account only for docker runtime * put --user arg into a variable only to be used with docker this is not needed with podman as podman maps the containers root id to the users id. * add podman to getting_started_docker documentation
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-0/+21
|\|
| * Add suggestion for indirect unicode input on Linux (#10854)MRAAGH2021-02-281-0/+21
| | | | | | | | | | | | | | | | | | * Add suggestion for indirect unicode input on Linux I have used this approach myself with great success, and it seems to be the only good solution that doesn't involve IBus. * Elaborate on keyboard layout on Linux This should be enough to allow people to figure out how to add custom characters to a Linux keyboard layout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-5/+5
|\|
| * Fixes #4072, #6214. Revision of #156 to clear before AS/TD. (#9941)Isaac Elenbaas2021-02-281-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2851-52/+1
|\|
| * remove keyboard_folder from info.jsonZach White2021-02-2751-52/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-274-27/+26
|\|
| * Fix compile errors (#12048)Zach White2021-02-274-27/+26
| | | | | | | | | | * fix compile errors * fix broken json files
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-2/+2
|\|
| * Format code according to conventions (#12046)github-actions[bot]2021-02-271-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-0/+2
|\|
| * Fix build for attiny85-based boards. (#12044)Nick Brassel2021-02-281-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-273-0/+3
|\|
| * Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel2021-02-283-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-271-0/+1
|\|
| * Fix build for linworks/whale75. (#12042)Nick Brassel2021-02-271-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-270-0/+0
|\|
| * Force update the version tagJames Young2021-02-270-0/+0
| |
* | Branch point for 2021 May 29 Breaking ChangeJames Young2021-02-27