Squashed commit of the following: · joeyv120/joes_qmk_firmware@43c7dd3

This repository has been archived by the owner on Dec 2, 2021. It is now read-only.

Commit

Squashed commit of the following:

commit 1d85fe176a12c31c959865fa78f340e090fff587
Author: Ryan <[email protected]>
Date:   Thu Oct 29 06:14:11 2020 +1100

    VN66 refactor (#10776)

commit a42e3ba2cb4a3520ed7e7691288694f3795321c4
Author: Ryan <[email protected]>
Date:   Thu Oct 29 06:13:52 2020 +1100

    Stella refactor (#10775)

commit c745cbb77a66a44549ee1ab3b1998c495c1a1ca5
Author: Guillaume Gérard <[email protected]>
Date:   Wed Oct 28 18:20:06 2020 +0100

    [Keymap] greatwizard userspace and ortho 4x12 and 5x12 keymaps (#9584)

commit 6b1ae7e6aa7180b00759b5692d2ea5bd0303c566
Author: Zach White <[email protected]>
Date:   Tue Oct 27 10:40:33 2020 -0700

    add rsync to the api update process

commit a602ef75fba2a7c6df932d049d9f89856bafe6c1
Author: stanrc85 <[email protected]>
Date:   Tue Oct 27 13:35:38 2020 -0400

    [Keyboard] Add Projectkb/alice/rev2 LAYOUT_alice support (#10697)

    * my alice community layout

    * add LAYOUT_alice support to projectkb/alice/rev2

    * add addition BSPC key to default layout

    * add define to support LAYOUT_default

commit 1ba93875bac62721828fdf9741a27259cfc764ab
Author: Reibl János Dániel <[email protected]>
Date:   Tue Oct 27 15:39:51 2020 +0100

    [Keyboard] Add handwired F411 (#10504)

    Co-authored-by: Janos Daniel Reibl <[email protected]>

commit 33074bcbadbafa3a359efda5a45a9412e4eca7d2
Author: Drashna Jaelre <[email protected]>
Date:   Mon Oct 26 23:09:11 2020 -0700

    [Keyboard] Bug fixes and improvements to PloopyCo devices (#10573)

    Co-authored-by: Ryan <[email protected]>

commit 555b1640b26fa09ea5f6b5bc7ea07dc654a326f9
Author: Ryan <[email protected]>
Date:   Tue Oct 27 10:56:34 2020 +1100

    Add layout: 65_iso_blocker_split_bs (#10733)

    * Add layout: 65_iso_blocker_split_bs

    * Add layout to readme

commit f149c07d68c3819e26198f8d4f97857de3a1c78e
Author: Sergey Vlasov <[email protected]>
Date:   Tue Oct 27 02:40:59 2020 +0300

    Fix KEYBOARD_SHARED_EP incompatibility with VIA (#9930)

    The `KEYBOARD_SHARED_EP=yes` option was breaking the VIA support,
    because the raw HID interface number in this case was 0 instead of 1,
    and the VIA app depends on the exact interface number for raw HID.
    Change the interface ordering to put the shared interface before the raw
    HID interface if `KEYBOARD_SHARED_EP` is enabled, so that the raw HID
    interface can keep its number.

commit 2c92ee1f56b92b15403b2f070c827162db37c9ba
Author: Ryan <[email protected]>
Date:   Tue Oct 27 06:14:56 2020 +1100

    Allow modified keycodes in Unicode input (#10658)

commit 0c42f91f4ccf98a37f055afb777ed491da56335e
Author: Zach White <[email protected]>
Date:   Sun Oct 25 14:48:44 2020 -0700

    Generate api data on each push (#10609)

    * add new qmk generate-api command, to generate a complete set of API data.

    * Generate api data and push it to the keyboard repo

    * fix typo

    * Apply suggestions from code review

    Co-authored-by: Joel Challis <[email protected]>

    * fixup api workflow

    * remove file-changes-action

    * use a more mainstream github action

    * fix yaml error

    * Apply suggestions from code review

    Co-authored-by: Erovia <[email protected]>

    * more uniform date handling

    * make flake8 happy

    * Update lib/python/qmk/decorators.py

    Co-authored-by: Erovia <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Erovia <[email protected]>

commit 8ef82c466e73e555fd74107d4c57e678d7152ecc
Author: James Young <[email protected]>
Date:   Sun Oct 25 11:07:02 2020 -0700

    manta60: update Configurator layout data (#10756)

commit ad86894ae7d5fbb7aed697d9f576cd186bfd1c9c
Author: Erovia <[email protected]>
Date:   Sun Oct 25 15:23:42 2020 +0000

    Rename keyboard-level readmes to lower-case (#10759)

    This is the recommendation in the [PR
    Checklist](https://docs.qmk.fm/#/pr_checklist?id=keyboard-prs) and it
    will make working with them easier in the CLI/API/etc.

commit af455a8368dc564df51f9657b04932956ccf580b
Author: Filip Paryż <[email protected]>
Date:   Sun Oct 25 01:54:38 2020 +0200

    [Keyboard] Freoduo - handwired split ortho keyboard. (#10724)

    * Freoduo v1 - with fixes from @fauxpark and rebased to master branch of QMK.

    * One more suggested fix from @fauxpark

    * Fixes after @drashna review.

commit ac37a94e49a39a014b3df829442cca84bf3f2071
Author: James Young <[email protected]>
Date:   Sat Oct 24 16:07:30 2020 -0700

    emajesty/eiri: fix info.json key sequence (#10751)

    * emajesty/eiri: info.json debug linting

    * fix info.json key sequence

commit 24ae9232e2656e5d8ebf32cbdfba22bc42946876
Author: Blake <[email protected]>
Date:   Sat Oct 24 20:28:34 2020 +0100

    draytronics/scarlet: add website and key labels to info.json (#10747)

    * Correctly name keyboard in info.json

    * Added website and layout key labels to info.json

commit 14cb662280852f6cd4d84dae9e46c00fdd971ef4
Author: AlisGraveNil <[email protected]>
Date:   Sat Oct 24 12:17:07 2020 -0600

    [keyboard] Add Roadster support (#10698)

    * Roadster

    * Update keyboards/clawsome/roadster/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/clawsome/roadster/config.h

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 3d183ed7a0af937279eea5f981be505f0d13dc07
Author: James Young <[email protected]>
Date:   Sat Oct 24 05:09:28 2020 -0700

    draytronics/scarlet: fix info.json data (#10746)

commit 4e30f4d102da9ec617cb4a119d7913aee2379f74
Author: James Young <[email protected]>
Date:   Sat Oct 24 05:07:10 2020 -0700

    doodboard/duckboard: fix info.json data (#10745)

commit bf92957ff276eb6b4f225bc68d254dbbe97965bc
Author: Joel Challis <[email protected]>
Date:   Sat Oct 24 01:29:17 2020 +0100

    Add additional auto labeler rules (#10704)

    * Auto label all the things

    * Makefiles are core changes

    * Add label to submodule changes

commit 33bd17a68a281db6e497b6e4679d208d0b0dad70
Author: stanrc85 <[email protected]>
Date:   Fri Oct 23 20:11:52 2020 -0400

    [Keymap] my alice community layout (#10696)

commit 7daad08a9140024921d887a33c344eb2e7af393d
Author: Benjamin Grosse <[email protected]>
Date:   Sat Oct 24 02:10:45 2020 +0200

    [Keymap] plaid keymap with custm LED animation (#10701)

commit d689f76110ee20e45d6531eac31bf72461ed504b
Author: Anne Demey <[email protected]>
Date:   Fri Oct 23 17:14:17 2020 -0500

    [Keyboard] Add Terrazzo Keyboard (#10408)

    * Ciao Terrazzo!

    * Keymap updates

    * Adding info json
    Cleaning up keymap files
    Readme updates with template

    * Coding style updates

    * Removing vscode files

    * PR feedback updates

    * biton32 -> get_highest_layer update
    Adding license headers

commit 5d2deaca069834843bacb5769787c907bdd6bf15
Author: Alabahuy <[email protected]>
Date:   Sat Oct 24 04:58:54 2020 +0700

    [Keyboard] add via support and fix info.json for rartlice (#10690)

    * Update info.json

    * Create keymap.c

    * Create config.h

    * Create rules.mk

    * Update keymap.c

    * Update keymap.c

commit 8e7517aebcfbb438857aae50e4b8f5da0227a654
Author: Fidel Coria <[email protected]>
Date:   Fri Oct 23 16:31:24 2020 -0500

    [Keyboard] Add pteron44 keyboard (#10708)

    * Add pteron44

    * Apply suggestions from code review

    Co-authored-by: Ryan <[email protected]>

    * Apply suggestions from code review part 2

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit b5f425b2759283b55a3d4bc1178d82be9304b530
Author: null-ll <[email protected]>
Date:   Fri Oct 23 16:18:55 2020 -0500

    [Keyboard] add Basketweave keyboard (#10729)

    * add basketweave keyboard

    * Fixed missing key in info.json layout

    * Update keyboards/basketweave/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/basketweave/readme.md

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 47ce1a9ed055da1460388693fb519af298d1aadd
Author: kb-elmo <[email protected]>
Date:   Fri Oct 23 23:12:03 2020 +0200

    [Keyboard] make Canoe Gen2 indicator configurable (#10722)

commit 85f344db49022ba196b4d77719652389f42cfdf8
Author: Leon Anavi <[email protected]>
Date:   Sat Oct 24 00:11:17 2020 +0300

    [Keymap] Add Zoom keymap for ANAVI Macro Pad 8 (#10715)

    Zoom keymap for ANAVI Macro Pad 8 with the following shortcuts:

    * Alt+V: Start/stop video
    * Alt+A: Mute/unmute my audio
    * Alt+M: Mute/unmute audio for everyone except the host
    * Alt+S: Start/stop screen sharing
    * Alt+R: Start/stop local recording
    * Alt+P: Pause/resume recording
    * Alt+C: Start/stop cloud recording
    * Switch to 2nd layout to control backlighting and underlighting

    Signed-off-by: Leon Anavi <[email protected]>

commit 225af5d16146b1ddb1b531c555ae07a620b2f2e2
Author: coarse <[email protected]>
Date:   Sat Oct 24 05:10:04 2020 +0800

    [Keyboard] Add Cordillera PCB (#10711)

    * Add initial Cordillera config

    * Update readme

    * Update info.json layouts

    * Update preview image

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Remove extra rules

    Co-authored-by: Ryan <[email protected]>

    * Update bootmagic rule

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 870cc373653ac392660d020c91cd98cdd07424e7
Author: Ryan <[email protected]>
Date:   Sat Oct 24 07:03:06 2020 +1100

    Fix two `qmk info` complaints (#10737)

    * Fix two `qmk info` complaints

    * Oops

commit 9093f877a2f7b23576cbd03140acf2904d2a1c92
Author: Drashna Jaelre <[email protected]>
Date:   Fri Oct 23 02:13:14 2020 -0700

    [Keyboard] Fix Moonlander indicator LEDs during sleep (#10683)

commit 5e9c078c7846d93b67e1c94a24b4c50781d739f2
Author: Xelus22 <[email protected]>
Date:   Fri Oct 23 07:08:17 2020 +0000

    [Core] IS31FL3731/36/37 bug fix (#10612)

    * 3731 bug fix

    * bug fixes

commit fe50bee9884f4d6117d6951ca4f2814fccf1eaf5
Author: André Silva <[email protected]>
Date:   Fri Oct 23 07:50:05 2020 +0100

    Update shell.nix (#10712)

    * nix-shell: update nixpkgs reference

    * nix-shell: add missing python dependency

commit 999326acc81687794e25ad7731f37da59881e0ca
Author: Jay Greco <[email protected]>
Date:   Thu Oct 22 23:47:14 2020 -0700

    Add nullbits nibble (#9250)

    * Add NIBBLE keyboard

    * Update VID for VIA compatibility

    * Add QMK PR feedback

    * Update matrix_init_remote_kb()

    * Update with requested changes

    Clean up config, makefile rules, and keymap files

    * Update with changes for unified ANSI/ISO layout

    * Add NO_USB_STARTUP_CHECK note in readme

    * Add license info, update with PR changes

    -Refactor encoder, via_extras code
    -Refactor VIA specific code to live in keymap folder
    -Remove non-inclusive naming in remote keyboard.c/h
    -Add documentation to remote_keyboard.c
    -Add compiler check for vusb_detect for non-avr micros

    * Fix print formatter in encoder handler

    Co-authored-by: Nick Brassel <[email protected]>

    * Small PR updates

    -Remove unneded matrix code from nibble.c
    -Clean up include code in nibble_encoder.h

    * Update Big LED headerfile

    -Declare Big LED functions in header file (derp)

    * Update keyboards/nullbitsco/nibble/nibble.c

    -Update with drashna's suggested CAPS LED code change

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/nullbitsco/nibble/rules.mk

    -Update with drasha's suggested makefile formatting changes

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Fix caps_lock typo

    Co-authored-by: Nick Brassel <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>

commit 8cbaea9e8d00b959ccb1b474fa8a81417b651de2
Author: KgOfHedgehogs <[email protected]>
Date:   Fri Oct 23 05:16:33 2020 +0200

    [Keyboard] Fix jian backlight related ifdefs (#10679)

    * Add jian backlight enabled ifdefs

    * Fix adavnced layout LAYOUT_dips usage

commit e7d8ccdbb2c14af9cf37be680af1d8633729b65a
Author: Mika Kuitunen <[email protected]>
Date:   Fri Oct 23 06:08:56 2020 +0300

    [Keyboard] Add support for Tunks Ergo33 keyboard (#10665)

    * [Keyboard] Add support for Tunks Ergo33

    * [Keyboard] Ergo33: Code style fixes

    * [Keyboard] Ergo33: Add GPL license headers

    * [Keyboard] Ergo33: remove keymap_config declarations

    * Apply suggestions from code review

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit c45d7e526c9c5315c3fe2e831b01778c51b7a953
Author: mechlovin <[email protected]>
Date:   Fri Oct 23 10:06:50 2020 +0700

    Add Cospad VIA support (#10642)

    * Add Cospad VIA support

    * Update keymap.c

commit f078980fb17ff5b9c11583427c66e13116972fd2
Author: mechlovin <[email protected]>
Date:   Fri Oct 23 09:55:32 2020 +0700

    [Keyboard] Add infinity88 PCB, add VIA support for Kanu (#10531)

    * add infinity88 PCB

    * Update rules.mk

    * Update info.json

    * Add VIA support Kanu PCB

    * Update keyboards/mechlovin/infinity88/rules.mk

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 619eb0071e36b5b724b713f2b785978f0e1b1e28
Author: Draevin <[email protected]>
Date:   Thu Oct 22 19:46:46 2020 -0700

    [Keymap] Add Draevin userspace and maps (#10581)

    * Initial userspace

    * DZ60 map

    * Quefrency map

    * Sinc map

    * Set up MAKE key for all personal maps

    * Light userspace cleanup

    * Formatting and comments zzz...

    * Licensing and userspace README

    * Swap: EXTRAFLAGS -> LTO_ENABLE in userspace rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Improve KC_MAKE: KC_ENT -> \n

    Co-authored-by: Ryan <[email protected]>

    * Swap left grouping on _FN for pairs

    * Add '?' -> backslash on _FN

    * Remove commented code

    * Organize lines in rules.mk

    * Add left hand scroll keys

    * Move configs to config.h

    * License blitz

    Co-authored-by: Ryan <[email protected]>

commit 2b9b267e8ee1a49c448b5f0f5b9fd634bd6c4489
Author: Ryan <[email protected]>
Date:   Fri Oct 23 12:21:56 2020 +1100

    Fix RGB matrix for ATmegaxxU2 (#10723)

commit f9bd9d3b269ef0e1be9189b2395350e2062fe4d0
Author: Ryan <[email protected]>
Date:   Fri Oct 23 12:21:32 2020 +1100

    c2json: Fix TypeError on MSYS2 (#10709)

commit 168ce1a743a905ae4a77309277b250d84dd70392
Author: Félix Sanz <[email protected]>
Date:   Thu Oct 22 19:42:34 2020 +0200

    Update keymap_spanish_dvorak.h (#10213)

    Co-authored-by: Ryan <[email protected]>

commit 120c42255baecb664ae813d58aa3010760f97795
Author: Adrian <[email protected]>
Date:   Thu Oct 22 12:05:01 2020 +0200

    Added EEPROM emulation for STM32F042x6 series processors (#10685)

    * Added STM32F042x6 support for EEPROM emulation

    * Default to lower stack size on STM32F042

    * Moved stack setting

    * Re-moved stack definition

    * Removed unnecessary check

commit f9853433c140700ce6bfbfba7517e1e0620789d4
Author: csc027 <[email protected]>
Date:   Thu Oct 22 09:12:55 2020 +0000

    csc027/keymap-updates (#10250)

commit caf61a19c64e4ee8ae213690a6f9d65a8dbe7241
Author: James Young <[email protected]>
Date:   Wed Oct 21 15:52:56 2020 -0700

    GH60 v1.3: update default keymap (#10703)

commit ca6a3e0832160c996efe416ab24b7debabf25937
Author: Ramon Imbao <[email protected]>
Date:   Wed Oct 21 17:04:39 2020 +0800

    Add the Mona keyboard (#10702)

commit 4b2da8daf4da000ae09df083d4fd5da656cab504
Author: Joel Challis <[email protected]>
Date:   Tue Oct 20 14:01:53 2020 +0100

    Update PR labeler to use pull_request_target (#10695)

    * Update labeler to use pull_request_target

    * Add back whitespace

    * Add CI label

commit c3ce06c2e7f383c7239558bcebb1c5cbec0725cf
Author: Ryan <[email protected]>
Date:   Tue Oct 20 04:36:18 2020 +1100

    Fix CLI warning for Massdrop udev rule (#10691)

commit 9f1f43bb8620cc8fe6715019c3dc58cd4f79cf17
Author: M-AS <[email protected]>
Date:   Sun Oct 18 19:30:24 2020 -0400

    [Keymap] Updated personal Massdrop CTRL keymap (#10649)

    * initial port of keymap to latest qmk version

    * forgot to add space cadet shift, fixed

    * corrected colors and added color macros

    * added custom rgb matrix effects

    * enabled extrakey

    * updated readme

    * Added GPL3 License Headers

    * Added images to readme

    * clang-format

    * Apply suggestions from code review

    Co-authored-by: Ryan <[email protected]>

    * renamed README.md to readme.md

    Co-authored-by: Ryan <[email protected]>

commit c4d87f307385ba61b4a3ac3f5f6e596105b0bf07
Author: AnthonyL <[email protected]>
Date:   Sun Oct 18 18:16:42 2020 -0500

    [Keyboard] Add IDOBAO ID87 (#10577)

    * Add IDOBAO ID87.

    * Layout changes.

     * Updated rules.mk
     * Implemented capslock led.
     * Updated readme to new version.
     * Fixed the info.info.json for the new layout.
     * Updated RGB number config.h.
     * Update rules.mk to try and line up nicely.

    * Fix via keymap.keymap.c

    * Fix all the auto-created labels.

     * Update keymaps again.

    * Add additional RGB commands.

    * Update keyboards/id87/info.json

    Format update.

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/id87/readme.md

    Remove quotations.

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/id87/readme.md

    Change Flash to Flashing

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/id87/rules.mk

    Alignment Fix

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/id87/info.json

    Remove qmk_converter link meta.

    Co-authored-by: James Young <[email protected]>

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: James Young <[email protected]>

commit 8bb2eeaabb6d79e774c6aae6c651857ce2e380dc
Author: Casey Webster <[email protected]>
Date:   Sun Oct 18 15:55:38 2020 -0500

    [Keymap] add cwebster2 userspace and keymaps (#10541)

    * Adding my keymap

    * Add a starter keymap for kyria

    * Updated keymap

    * Add auto shift, tapping modifications and gravatar oled bitmap

    * Add flashing helper scripts

    * Updates to my keymap

    * Enable raw hid and rgblight sleep

    * Cleanup

    * Updated keymap and board features

    * Remove some RGB modes for space

    * Start working on a miryoku-like keymap.

    This adds homerow mods to my keymap on the base layer and adds
    a game layer that doesnt have them

    * more work on keymaps

    * Fine tuning home row mods

    * update keymap

    * Keymap update

    * add split transport

    * keymap

    * cherry pick from develop

    * merge develop

    * fix

    * keymap iterations

    * Refactoring

    * continued refactoring

    * messing with rgb

    * update layer coloring

    * continued refactoring

    * more features

    * modifier color

    * Move stuff to userspace

    * Moving stuff out to userspace

    * refactoring into userspace

    * More refactoring

    * Fixing some errors in the keymap and changing the oled output

    * Sync zen1 keymap to my userspace config

    * Update copyright notices and revert transport.c to master

    * Swap tab and esc

    * Remove a file accidentally created

    * Use LTO_ENABLE to turn on Link_Time_Optimization

    * Drop modtap thumbs on game layout

    * Update game keymap

    * More iteration on the game keymap

    * Add oled indications of kitty and i3 mod

    * Promote colemak to default

    * Update tapping term for modtap keys

    * Add per key tapping term

    * Use left modifiers on right side

commit c492dd791243b98a119fbf29c9b041d14238b102
Author: GG <[email protected]>
Date:   Sun Oct 18 23:52:03 2020 +0300

    [Keyboard] Add support for ikki68 (#10576)

    * ikki68 from wuquestudio

    * NEW ikki68

    * Add support for ikki68

    * Update readme.md

    Co-authored-by: root <[email protected]>

commit 7622678bd0cf5710df81a2f5d58096c8869ed86d
Author: Jack Humbert <[email protected]>
Date:   Sun Oct 18 16:51:15 2020 -0400

    [Keymap] Adds Jack's 4x12 grid keymap (#10586)

    * add jack's planck keymap

    * move to community layouts

    * add image to readme

    * fix imgae

    * fix image for real

    * Update layouts/community/ortho_4x12/jackhumbert/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>

commit 0728a6b7530c956494f4c026da917d4705724173
Author: mexsistor <[email protected]>
Date:   Sun Oct 18 15:45:47 2020 -0500

    [Keyboard] Add mexsistor/ludmila (#10506)

    * Add files via upload

    * Update keyboards/mexsistor/ludmila/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/mexsistor/ludmila/ludmila.h

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update ludmila.h

    * Update keymap.c

    Disable unnecessary code

    * Update rules.mk

    * Update matrix.c

    * Update keyboards/mexsistor/ludmila/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keymap.c

    * Update keyboards/mexsistor/ludmila/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keymap.c

    * Update keymap.c

    * Update ludmila.h

    * Update keyboards/mexsistor/ludmila/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/mexsistor/ludmila/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/mexsistor/ludmila/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/mexsistor/ludmila/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/mexsistor/ludmila/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/mexsistor/ludmila/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Add files via upload

    * Add files via upload

    * Delete config.h

    * Delete

    * Update readme.md

    * Update readme.md

    * Delete tapdance timing

    * Delete matrix.c

    * Create matrix.c

    * Deleted ludmila, add ludmila_v1

    * Update readme.md

    * add ludmila

    * delete ludmila_v1, create ludmila

    * Create matrix.c

    * Change in matrix.c code and sustitute yes/lite custom_matrix in rules.mk

    * Update keymap.c

    * Add description; Change on RGB PIN

    * Revert "Add description; Change on RGB PIN"

    This reverts commit cfbe5349259446f49e8885e995d9cac1b77dac01.

    * config.h and rules.mk update

    * Update keyboards/mexsistor/ludmila/info.json

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/mexsistor/ludmila/info.json

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/mexsistor/ludmila/rules.mk

    Co-authored-by: James Young <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: U-MEXSISTOR\Macropads <Kevin M>
    Co-authored-by: James Young <[email protected]>

commit e468380be62f11f8edb93eb4eb440ae7b50cb00f
Author: Alabahuy <[email protected]>
Date:   Mon Oct 19 03:41:53 2020 +0700

    [Keyboard] add rartlice (#10495)

    * Create bootloader_defs.h

    * Create chconf.h

    * Create config.h

    * Create halconf.h

    * Create info.json

    * Create mcuconf.h

    * Create rartlice.c

    * Create rartlice.h

    * Create readme.md

    * Update readme.md

    * Create rules.mk

    * Create keymap.c

    * Update config.h

    * Update rules.mk

    * Update config.h

    * Update keymap.c

    * Update rules.mk

    * Delete bootloader_defs.h

    * Update rules.mk

commit 84566256552d23fee04c65dd0345fbfbc4df0741
Author: Joel Challis <[email protected]>
Date:   Sun Oct 18 20:40:37 2020 +0100

    Initial auto PR labeler config (#9814)

    * Initial auto PR labeler config

    * Update .github/labeler.yml

    Co-authored-by: James Young <[email protected]>

    * Update since develop merged

    Co-authored-by: Nick Brassel <[email protected]>

    Co-authored-by: James Young <[email protected]>
    Co-authored-by: Nick Brassel <[email protected]>

commit 6ad813e811bd1889f8e45afcb671b118ebf5f51d
Author: npspears <[email protected]>
Date:   Sun Oct 18 13:07:22 2020 -0500

    [Keyboard] Plexus75 (#10668)

    * Added Plexus75 PCB

    * Update keyboards/plexus75/readme.md

    * Update keyboards/plexus75/rules.mk

    * Update config.h

    * Update config.h

    * Update keyboards/plexus75/readme.md

    * Update keyboards/plexus75/rules.mk

    * Update keyboards/plexus75/config.h

    * Update keyboards/plexus75/readme.md

    * Update keyboards/plexus75/info.json

    * Update keyboards/plexus75/info.json

    * Update keyboards/plexus75/info.json

    * Added License Header

    * Update plexus75.h

    added license header

commit 4d22bc9de004f40b41287cc54adbc0b64f755f78
Author: MelGeek <[email protected]>
Date:   Mon Oct 19 02:05:01 2020 +0800

    [Keyboard] Melgeek Mojo75 (#10426)

    * [Keyboard]  Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

    * Update keyboards/melgeek/mj61/mj61.c

    * Update keyboards/melgeek/mj61/mj61.c

    * [Keyboard] MJ61 Add license header for files and the link for readme

    * Update keyboards/melgeek/mj61/readme.md

    * Update keyboards/melgeek/mj61/rev1/config.h

    * Update keyboards/melgeek/mj61/rev1/rules.mk

    * Update keyboards/melgeek/mj61/mj61.c

    * Update keyboards/melgeek/mj61/mj61.c

    * [Keyboard] Support MoJo75 which is a 75% Hotswap RGB keyboard

    * Update melgeek/mojo75 vid and pid
    Add    melgeek/mojo75/rev1/rev1.c

    * Update MelGeek mojo75 VIA layout

commit d49dcdd667cc5e154a5c42a5be7e0f3391c8401c
Author: yiancar <[email protected]>
Date:   Sun Oct 18 14:37:33 2020 +0100

    Nebula12 RGBLIGHT buffer workaround (#10555)

    * Work around for rgblight buffer

    * Update config.h

    * Prettify

    * Clip led range

commit f952d4f7b779474918453b7ec3ccccdcfbd63b58
Author: Cmdr. Emily <[email protected]>
Date:   Sun Oct 18 09:37:02 2020 +0200

    Support OpenDeck 32 keyboard (#10305)

    Co-authored-by: James Young <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 8be058d55d2a50065294bac8e63020dbedae3f36
Author: Dylan Straw <[email protected]>
Date:   Sun Oct 18 18:36:43 2020 +1100

    Enabled the use of VIA for KPRepublic BM40 (#10677)

    Co-authored-by: Ryan <[email protected]>

commit 40e694ea0d9f4d5e56907c643280b024f0bdc139
Author: Drashna Jaelre <[email protected]>
Date:   Sat Oct 17 21:46:47 2020 -0700

    Add last breaking changes log to sidebar (#10680)

    Co-authored-by: Ryan <[email protected]>

commit 445cd95d1779709673857c36b752afa6327afff1
Author: Zach White <[email protected]>
Date:   Sat Oct 17 21:01:11 2020 -0700

    Improve ANSI support and --no-color (#10537)

    * Improve ANSI support and --no-color

    * tweak when levelname gets stripped of ansi

    * sync with latest milc

    * make questions work with both milc versions

    * pyformat

commit 7d5ba88e6f88979c017bf27e2ad0f4c7d912f9ec
Author: Morten Linderud <[email protected]>
Date:   Sat Oct 17 21:30:18 2020 +0200

    50-qmk.rules: Move udev rules from documentation into a file (#10664)

    This makes it overall easier to package for downstream distributions
    instead of keeping tabs with inline documentation.

    Signed-off-by: Morten Linderud <[email protected]>

commit 704934c427af1cc2176fa7c82773e86d89cbfa3c
Author: Pierre Chevalier <[email protected]>
Date:   Sat Oct 17 20:20:34 2020 +0100

    Ferris reorganization (#10564)

    * Add my own keymap

    * Layer 0: Workman
    * Layer 1: RSTHD (my own take on it)
    * Layer 2: Mouse
    * Layer 3: Navigation
    * Layer 4: Symbols right
    * Layer 5: Symbols left
    * Layer 6: Fn keys
    * Layer 7: Numbers
    * Layer 8: Vim and misceallaneaous accessible from any other layer

    * Move the current code to a 0.1 folder in preparation for upcoming changes

    Version 0.2 is currently being prototyped and uses an arm chip which
    will need its own firmware.

    There is also the Ferris sweep which uses a pro-micro compatible board
    which will need its own directory.

    * Move Ferris out of handwired and into the light

    The keyboard is now well out of the prototype phase as tens of them have
    been produced and acquired by various people.

    With 0.2 coming out, adoption is going to increase again as the board
    will be available for sale at some recognized vendors.

    Now is probably a good time to recognize its status as more than a
    prototype :)

    * Add code for the Ferris Sweep (a.k.a cradio)

    The Ferris Sweep is a creation of the talented @davidphilipbarr, a.k.a DPB.
    It has the key layout of a Ferris and uses a pro-micro connected to the
    switches via direct pins so that diodes are not needed and the soldering
    is minimal.

    With their blessing, I took the code for it from DPB's own repo:
    https://github.com/davidphilipbarr/36keys/tree/master/qmk/cradio
    and did some adaptations such as removing commented out code, enabling
    EE_HANDS and mouse keys for consistency with my existing Ferris code.

    * Fix indentation in rules.mk

    * Fix indentation in sweep's config

    * Remove unnecessary lines from sweep's rules.mk

    * Remove unnecessary lines from sweep's rules.mk

    * Rename 0.1 to 0_1

    This avoids the dot looking like the separation between a filename and
    its extension.

    In the same commit, bring matrix.c to the 0_1 folder as this was needed
    for the code to compile properly (matrix.c is referred to in the readme
    under `0_1` and is specific to that revision of the firmware).

    * Update copyright statements for Sweep

commit 47ea522e79f2b7bcc2804c309f2b94e029824eb9
Author: dezli <[email protected]>
Date:   Sun Oct 18 03:16:28 2020 +0800

    [Keymap] Add miniMACRO5 User Keymaps (#10595)

    * add kabraxcis keymap

    this is a user keymap for a member of my group-buy. this is the creation commit

    * add voaraq keymap

    this is a user keymap for a member of my group-buy

    * update kabraxcis keymap

    * add licenses

commit f663ba5ed098ae95c0357be48dfc5381622752be
Author: Sendy YK <[email protected]>
Date:   Sun Oct 18 02:14:02 2020 +0700

    mrsendyyk Keymap Cleanup (#10539)

    * Cleanup

    * Update info.json

    * Update license notice

    * Fix license notice

    * Update keymap.c

    * Update readme.md

    * Update readme.md

    * Update readme.md

    * Update readme.md

    * Update readme.md

    * Update readme.md

    * Add RGB Light Mode Static Gradient 26

    * Update

commit de0153f339a1be8436211bec59f389cedb7b755e
Author: Sönke Hahn <[email protected]>
Date:   Sat Oct 17 15:09:03 2020 -0400

    [Keymap] moonlander:shahn-neo (#10667)

    * basic keys working

    * more stuff

    * more stuff

    * empty upper layers

    * more stuff

    * cleanup

    * more stuff

    * add the letter 'j'

    * add '0' to layer 4

    * implement umlauts and eszett with menu key as compose key

    * add comment

    * renamed layout

    * change copyright notice

    * add separate readme file

commit 3633330e1ade1eaf84ddd621f38a6b771eaafad3
Author: yulei <[email protected]>
Date:   Sun Oct 18 03:05:21 2020 +0800

    Fix iNETT Studio SQUARE.X overcurrent issue (#10660)

commit 855dd2d218ba875f1fb7bddfbce8bd260e96184e
Author: Drashna Jaelre <[email protected]>
Date:   Sat Oct 17 11:46:57 2020 -0700

    [Keymap] Drashna Code Cleanup (#10656)

    * Add Launchpad keymap

    Note: RGB and Audio won't work when using B pins for audio

    * Add support for rgb matrix on launchpad

    * Update config for launchpag

    * Disable wait on layer change

    * Update config for ErgoDox EZ

    * Fixup rgb light userspace code

    * Move Corne layout to community layouts folder

    * Update config for corne to support community layouts

    * Add license header to files

    * Minor cleanup of userspace config

    * Update Pimironi Trackball code

    * Increase debounce time on ergodox

    * Fix keymap handling

    * Enable wait for USB for moonlander

    * Update/add license headers

    * fix review issues

commit aa1c1c386543a38d47331d17c414f81c8e11cb29
Author: Ramon Imbao <[email protected]>
Date:   Sun Oct 18 02:40:30 2020 +0800

    [Keyboard] AELITH (#10652)

    * Add AELITH keyboard

    * Add AELITH keyboard

    * Update keyboards/ramonimbao/aelith/rules.mk

    * Update keyboards/ramonimbao/aelith/config.h

    * Update keyboards/ramonimbao/aelith/keymaps/via/rules.mk

    * Update keyboards/ramonimbao/aelith/readme.md

    * Update keyboards/ramonimbao/aelith/readme.md

    * Update keyboards/ramonimbao/aelith/config.h

    * Update keyboards/ramonimbao/aelith/config.h

    * Change layouts based on suggestions

    * Add LAYOUT_alice macro

commit de68d294ec6fdae37e41f515407f324bcc4611ae
Author: James Young <[email protected]>
Date:   Sat Oct 17 09:50:32 2020 -0700

    [Docs] add "Adding Default Keymaps to QMK Configurator" doc (#10049)

commit f0a1ab5488425857987e94c883fd13cc661a92a8
Author: Ryan <[email protected]>
Date:   Sun Oct 18 02:45:21 2020 +1100

    MSYS and WSL installation improvements (#10593)

commit 1a2a838bc204d0b287366d9518b0d222cbb33049
Author: Ryan <[email protected]>
Date:   Sun Oct 18 02:44:38 2020 +1100

    [CLI] Remove check for Input Club boards (#10636)

commit 67474f7e3fa51ad25dad7c2772093fc134967538
Author: Blake <[email protected]>
Date:   Sat Oct 17 11:58:51 2020 +0100

    [Keyboard] Draytronics Scarlet (#10655)

    * Initial test version of Scarlet keyboard

    * First commit of DElec Scarlet

    * Change to new Draytronics branding

    * Update to keyboard details

    Update to keyboard details and link to Draytronics website.

    * Update keyboards/draytronics/scarlet/scarlet.h

    * Update keyboards/draytronics/scarlet/rules.mk

    * Update keyboards/draytronics/scarlet/readme.md

    * Update keyboards/draytronics/scarlet/keymaps/default/keymap.c

    * Update keyboards/draytronics/scarlet/config.h

    * Update keymap.c

    * Update config.h

    * Update scarlet.h

    * Update keyboards/draytronics/scarlet/config.h

    * Update keyboards/draytronics/scarlet/config.h

    * Update keyboards/draytronics/scarlet/scarlet.h

    * Update keyboards/draytronics/scarlet/keymaps/default/keymap.c

commit 39c473a6399325bc53744eb7ef74004cefc6f725
Author: shela <[email protected]>
Date:   Sat Oct 17 19:19:06 2020 +0900

    [Docs] Update feature_combo.md of Japanese document (#10671)

commit f871f7a56fd954cfc4cabefd649bbcc991083806
Author: cole smith <[email protected]>
Date:   Sat Oct 17 03:17:44 2020 -0700

    [Keyboard] Boardsource spooky (#10521)

    * added spooky keyboard t
    o boardsouce folder

    * restoring to clean start I think

    * added back in my files for this keyboard

    * Update keyboards/boardsource/holiday/spooky/config.h

    * Update keyboards/boardsource/holiday/spooky/keymaps/rip_mx/keymap.c

    * Update keyboards/boardsource/holiday/spooky/readme.md

    * Update keyboards/boardsource/holiday/spooky/spooky.h

    * updated all keymaps to support 2x3 ortho

    * Apply suggestions from code review

commit e0bdd511773ef25388a066e4db9a53f658f681ae
Author: Reid Sox-Harris <[email protected]>
Date:   Sat Oct 17 02:31:21 2020 -0700

    [Keymap] add keyhive/maypad:eosti (#10663)

    * adds eosti/maypad keymap

    * remove empty function calls

commit fba7d4e32f4292094934fb47943b22a70a28ce57
Author: JagdPietr Reneksson <[email protected]>
Date:   Sat Oct 17 17:11:51 2020 +0800

    Move Drakon to jagdpietr directory (#10155)

    * move drakon to jagdpietr directory

    * Updates

    Recommended changes implemented in this commit due to progress loss in last commit

    * Update vusb

    * Update keyboards/jagdpietr/drakon/drakon.c

commit cab49809ad43abdbcf9179a73a3c2da078defcb4
Author: Danny <[email protected]>
Date:   Sat Oct 17 03:38:35 2020 -0400

    Add Levinson VIA support (#10631)

    * Add Levinson VIA keymap

    * Update product IDs for Levinson to embed version number

    * Add layer 3 access

    * Apply suggestions from code review

commit 42696a4f8c9170f9dbf3a1ec05ca95079b7a77a9
Author: Danny <[email protected]>
Date:   Sat Oct 17 03:30:26 2020 -0400

    Update Nyquist VIA support and default keymap (#10632)

    * Update default and via keymaps

    * Update PID and enabled build options

    * Update keyboards/keebio/nyquist/keymaps/via/keymap.c

    * Update keyboards/keebio/nyquist/rev3/rules.mk

    * Update keyboards/keebio/nyquist/rev2/rules.mk

commit a4dfa45f376ac9364404a15c9adfe0b6b8d0e20e
Author: Xelus22 <[email protected]>
Date:   Sat Oct 17 07:18:50 2020 +0000

    [Keyboard] Add Kangaroo (#10511)

    * roo initial

    * update scannign t imes

    * enable dma

    * rename kangaroo

    * updates

    * update rules.mk

    * keymap

    * fix up config

    * fix reamde

    * fix up config

    * update license headers

    * rules.mk update

    * info json

    * Update keyboards/xelus/kangaroo/rules.mk

commit 616dc7dd5d1bf6e512db9a0c7f3dfcdc42fc9db1
Author: Garret G <[email protected]>
Date:   Sat Oct 17 00:19:55 2020 -0500

    [Keyboard] 45-ATS (#10104)

    * add ats folder

    * fix duplicate matrix key

    * fix matrix issues

    * fix missing comma in info.json

    * clean up info.json

    * rm game layer toggle in via keymap

    * update via keymap rules.mk

    * Update info.json

    * clear up layout graphics

    * Apply suggestions from code review

    * Update 45_ats.c

    * Update 45_ats.h

    * Update config.h

    * Update config.h

    * Update keyboards/45_ats/keymaps/default/config.h

    * Update keymap.c

    * Update keyboards/45_ats/keymaps/default/keymap.c

    * Update keymap.c

    * Update keyboards/45_ats/keymaps/via/keymap.c

    * Apply suggestions from code review

    * Update keyboards/45_ats/config.h

commit 44f9017cb8ca8bd646b5561c0b587bab476e3054
Author: Jakob Stendahl <[email protected]>
Date:   Sat Oct 17 06:29:15 2020 +0200

    Bm60rgb iso nordic keymap with sleepmode functional (#10510)

    * Add nordic keymap

    Changes from default:
    - Change button right of `LSHIFT` to `KC_NUBS`
    - Add some more keys to the second layer.

    * Add sleepmode functionality

    Added a sleepmode, this turns of the rgb_matrix if no key was pressed for x minutes. Not default on, so you have to enable it by defining `SLEEPMODE_ENABLED`.

    * Move all sleepmode config to config.h, rename keymap

    - Move all configurations for sleepmode to keymap config.h
    - rename keymap to include reference to it having sleepmode (suggestion from guy the discord-server)
    - add copyright in config.h

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/config.h

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c

    * Update keyboards/bm60rgb_iso/keymaps/iso_nordic_sleepmode/keymap.c

commit 3c4fa6800066797fd99872d1fc0909822b20bb96
Author: Harshit Goel <[email protected]>
Date:   Sat Oct 17 04:31:19 2020 +0530

    Make VIA config for redox_w (#10578)

    * Make via config for redox_w

    * Add missing layer function back, fixed typo and maintainer name

commit cb556b7a16c3ab8aa06646c6236b887bb826f63b
Author: MelGeek <[email protected]>
Date:   Sat Oct 17 06:18:06 2020 +0800

    [Keyboard] Melgeek MJ64 (#10425)

    * [Keyboard] Support MJ64 which is a 60% Hotswap RGB keyboard with arrows
    and the size of left shift is 2.25U

    * Update keyboards/melgeek/mj64/mj64.h

    * Update keyboards/melgeek/mj64/keymaps/default/keymap.c

    * Update keyboards/melgeek/mj64/keymaps/via/keymap.c

    * Update keyboards/melgeek/mj64/keymaps/via/keymap.c

    * Update keyboards/melgeek/mj64/keymaps/default/keymap.c

    * Update keyboards/melgeek/mj64/keymaps/via/keymap.c

    * Update keyboards/melgeek/mj64/rev2/rules.mk

    * Update keyboards/melgeek/mj64/rev1/rules.mk

    * Update keyboards/melgeek/mj64/keymaps/via/keymap.c

    * Update keyboards/melgeek/mj64/info.json

    * Update keyboards/melgeek/mj64/info.json

    * Update keyboards/melgeek/mj64/rev1/config.h

    * Update keyboards/melgeek/mj64/rev2/config.h

    * Update the VID and PID in mj64/config.h
    add the rev1/rev1.c
    add the rev2/rev2.c

commit 87317a3af66065c2ff350d85c7b3bbc4f8a2cb9f
Author: James Young <[email protected]>
Date:   Fri Oct 16 14:23:32 2020 -0700

    [Keyboard] GH60 v1.3 (#10575)

    * [Keyboard] GH60 v1.3 Support

    * clean up info.json

    Update key sizes and positioning.

    * add readme

    * add image to readme

    * fix up info.json LAYOUT_all

    * add LAYOUT_60_ansi

    I'm guessing at this based on a photo of the PCB. Chances are high that this isn't fully functional.

    * add matrix block comment to v1p3.h

    * add default_ansi keymap

    * add keymap readme files

    * fix LAYOUT_60_ansi macro

    * enable 60_ansi Community Layout support

    * add layouts for 60_ansi_arrow

    Add LAYOUT_60_ansi_arrow and LAYOUT_60_ansi_arrow_split_bs macros. (The user helping me test runs the split Backspace variant.)

    * add Tsangan, HHKB, and 64_ansi layout macros

    * add factory keymaps and layout info

    * update copyright headers

    I mean... if someone's gotta "own" this code...

    * fix broken factory_* keymaps

commit 92b7dff3aebb3583b5ca3e3862ea08d44f6f24cd
Author: jotix <[email protected]>
Date:   Fri Oct 16 15:09:57 2020 -0300

    Jotix ortho_4x12_layout (#10647)

    * back_to_the_roots

    * mouse layer is gone

    * mouse layer is gone

commit 0dc74dd8c49dda9b9729b25d43a168dbc6d3b294
Author: MelGeek <[email protected]>
Date:   Sat Oct 17 00:11:17 2020 +0800

    [Keyboard] Add Z70Ultra - a Hotsawp RGB 65% keyboard (#9202)

    * Add Z70Ultra which is a Hotsawp RGB 65% keyboard

    * Update keyboards/melgeek/z70ultra/z70ultra.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/rev1/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.h

    Co-authored-by: Ryan <[email protected]>

    * Update readme.md

    * Update info.json

    update the name of layout to consistent the keyboard.

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/info.json

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: Ryan <[email protected]>

    * Add Z70Ultra

    * Support Z70Ultra
      [Modified] info.json to support two different layouts
      [Add]      rules.mk to support default folder

    * Update keyboards/melgeek/z70ultra/rev1/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/z70ultra/config.h

    Co-authored-by: Ryan <[email protected]>

    * remove excessive arguments from LAYOUT_split_space

    * Update keyboards/melgeek/z70ultra/info.json

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/info.json

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.h

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.h

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/rev1/rules.mk

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c

    Co-authored-by: James Young <[email protected]>

    * Use macro replace with the literal for CS & SW

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * [Keyboard]  Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * [Keyboard] MJ61 Add license header for files and the link for readme

    * Update keyboards/melgeek/mj61/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/rev1/config.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/rev1/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Ryan <[email protected]>

    * Add GPL for files

    * Update keymaps/default/keymap.c

    * Update keymaps/via/keymap.c

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/melgeek/z70ultra/z70ultra.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: James Young <[email protected]>
    Co-authored-by: Drashna Jaelre <[email protected]>

commit 6529cbac0dabb0bb9005d18ee78fab63f370935a
Author: holtenc <[email protected]>
Date:   Fri Oct 16 00:41:44 2020 -0500

    [Keyboard] Add Prime_E RGB PCB (#10615)

    * add Prime_E RGB PCB

    * Update keyboards/primekb/prime_e/config.h

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/primekb/prime_e/std/config.h

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/primekb/prime_e/config.h

    Co-authored-by: Joel Challis <[email protected]>

    * Update keyboards/primekb/prime_e/rgb/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/primekb/prime_e/rgb/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/primekb/prime_e/rgb/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/primekb/prime_e/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/primekb/prime_e/std/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/primekb/prime_e/std/readme.md

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 139d28eaae283455c135efe71a05a1823c12fc31
Author: Andre Azzolini <[email protected]>
Date:   Thu Oct 15 23:23:24 2020 -0500

    [Docs] Add link to Tap-Hold Configuration Options from Mod-Tap (#10548)

commit a1f129edd50f0c2e751b904db9639cea9c9314e9
Author: Salicylic-acid3 <[email protected]>
Date:   Fri Oct 16 13:22:25 2020 +0900

    [Keyboard] Added via support for JISplit89 (#10547)

    -Changing the VID
    -Add a keymap via
    -Keymap and copyright fixes

commit 73699cccbce4bf04fb2667eb7c1d037f6163986a
Author: Salicylic-acid3 <[email protected]>
Date:   Fri Oct 16 13:12:09 2020 +0900

    [Keyboard] Add 7splus keyboard (#10538)

    * Add 7splus keyboard.

    A 85 keys ANSI Layout split keyboard.
    Salicylic-acid3

    * Update keyboards/7splus/keymaps/default/keymap.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/7splus/keymaps/salicylic/keymap.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/7splus/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Added VIA keymap and a few updates

    Adding a VIA Keymap
    Updating the key layout diagram
    Copywrite added for salicylic keymap

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 229dbcc547292e474113fdcaf508a3287564e946
Author: Spaceman <[email protected]>
Date:   Thu Oct 15 17:11:33 2020 -0400

    Add via keymap for pancake (#10551)

    * Add via keymap for pancake

    * Add license to keymap

    * Update rules.mk

    * Update rules.mk

    * Update keyboards/spaceman/pancake/config.h

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit c738ce2f6561d2145d04b53a5804f423acc75a3a
Author: Joel Challis <[email protected]>
Date:   Thu Oct 15 20:05:44 2020 +0100

    Move SP-111 to vendor folder (#10633)

    * Move SP-111 to vendor folder

    * Fix space indentation

commit c0b3034721f9502d6b3da82f62399b618f1523fe
Author: George Mao <[email protected]>
Date:   Thu Oct 15 11:23:35 2020 -0700

    Add alice community layout (#10518)

    * Added LAYOUT_alice

    * Added fauxpark's suggestions as well as updating keymap graphic

    * Added file header and used noroadleft's fix to the info.json for fast input mode

commit f90688e55060c3b4ebe797c42c483fd2d0412321
Author: Raleigh Wayland <[email protected]>
Date:   Thu Oct 15 12:19:51 2020 -0600

    Adding Opus keyboard (#10628)

    * Adding opus keyboard

    * Preparing keyboard for PR

    * Adding images to default keymap readme

    * Changing VENDOR_ID

    * Minor changes

    * Changing PRODUCT_ID

    * Removing comment

    * Fixing tap dance issue

    * #pragma once instead of #ifndef

    * Resolving PR suggestions

    * Removing ifndef

    * Using lower resolution image

    * Formatting comments

    * Adjusting copyright year

    Co-authored-by: Raleigh Wayland <[email protected]>

commit 0f453bc5f7685671e79a465e0bbd6c8c67a93409
Author: Harshit Goel <[email protected]>
Date:   Thu Oct 15 23:41:23 2020 +0530

    Add VIA code to ergoTravel (#10493)

    * Add VIA code to ergoTravel, VendorId changed to allow via

    * Update LTO_ENABLE for via

    * Accept comments from the QMK PR discussion

    * Restore original rules.mk from qmk master, update via rules to remove redundant bootmagic

    * rules update

    * find and use unique VID without qmk. Used 0x4A50, did not find clash

    * Removed unused via layer

    * Reset hard to last clean commit, redo changes for Hex Translation and Enum

commit 21357b658a86146f41566be8dc93900a2ca8a35f
Author: Reid Sox-Harris <[email protected]>
Date:   Thu Oct 15 10:41:04 2020 -0700

    [keyboard] Maypad: Add additional layout (#10643)

    * add split plus layout

    * update README

    * rename splitPlus to split_plus

    * Update keyboards/keyhive/maypad/rules.mk

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>

commit 2c5ad9189cbb789353514b87109213090ce56531
Author: Reid Sox-Harris <[email protected]>
Date:   Wed Oct 14 19:08:28 2020 -0700

    update eosti keymaps (#10610)

    * adds eosti/planck keymaps

    * updates eosti keymaps

    * add header guard to bdn9 config.h

    Co-authored-by: Joel Challis <[email protected]>

    * reduce file size of compiled firmware

    * move console disable to rules.mk

    Co-authored-by: Joel Challis <[email protected]>

commit b0dbe7365b56d181928e8fee06d03df6ba92ea62
Author: Ryan <[email protected]>
Date:   Thu Oct 15 12:55:31 2020 +1100

    Fix STM32duino bootloader (#10648)

commit af2c50638353ce2a277392ff0ecbc10f91f92413
Author: Reid Sox-Harris <[email protected]>
Date:   Wed Oct 14 18:10:15 2020 -0700

    adds eosti/planck keymaps (#10616)

commit 59d503e3b9fa3fe1f6c4cdb56015251732a5c1b0
Author: MechMerlin <[email protected]>
Date:   Wed Oct 14 17:37:11 2020 -0700

    [keyboard] Add Caps Lock LED Logic to exclusive/e85/soldered  (#10639)

    * on behalf of VashtaNerada commiting his code to get caps lock led working on the soldered E8d E8.5

    * Update keyboards/exclusive/e85/soldered/soldered.c

    Co-authored-by: Joel Challis <[email protected]>

    Co-authored-by: Joel Challis <[email protected]>

commit b63b2106d818860038821f41596b92759068a3cb
Author: MakotoKurauchi <[email protected]>
Date:   Thu Oct 15 05:16:17 2020 +0900

    Fix config for Helix rev3 4rows (#10641)

    * update "Hardware Availability"

    * add a section of "How to build"

    * update "Hardware Supported"

    * add SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT for rev3_4rows/config.h

    Co-authored-by: keyaki-namiki <[email protected]>

commit a2af0a352b3351add05a487443b224a8b5d7740f
Author: shela <[email protected]>
Date:   Thu Oct 15 03:24:26 2020 +0900

    Update other_vscode.md of Japanese document (#10604)

    * Update Japanese document

    * Fix inline code

    * Update docs/ja/other_vscode.md

    Co-authored-by: Takeshi ISHII <[email protected]>

    Co-authored-by: Takeshi ISHII <[email protected]>

commit 6aae926b5f90f9e05e4dd022a5b94f0ab52c8614
Author: Drashna Jaelre <[email protected]>
Date:   Wed Oct 14 08:23:08 2020 -0700

    Fix issues with suspend code for ZSA split boards (#10640)

commit 49dd1edb6961db1d5dc3850b586545eee8a21fc5
Author: gtips <[email protected]>
Date:   Wed Oct 14 18:50:35 2020 +0900

    Update reviung34 PRODUCT_ID (#10480)

    * update reviung34 PRODUCT_ID

commit 7437a388990c784a52a33847551591af346dd797
Author: Ryan <[email protected]>
Date:   Wed Oct 14 15:06:05 2020 +1100

    Whitefox refactor (#10175)

commit 381884fa9be79e4538c8accc2043654b47499f44
Author: Filip Paryż <[email protected]>
Date:   Wed Oct 14 04:41:34 2020 +0200

    Fix for issue #10386 - Can't compile preonic:dudeofawesome (#10557)

    Co-authored-by: FilipParyz <[email protected]>

commit f706e1e80e579ca799644d0230c38aab893481e1
Author: shela <[email protected]>
Date:   Wed Oct 14 05:09:59 2020 +0900

    Update Japanese document (#10607)

commit 46c77febf74e3ade637a48fd09edd3a43ae254de
Author: Takeshi ISHII <[email protected]>
Date:   Wed Oct 14 05:08:26 2020 +0900

    [Docs] Japanese translation of docs/pr_checklist.md (#10415)

    * japanese translation of docs/pr_checklist.md

    * update docs/ja/pr_checklist.md

    * update docs/ja/pr_checklist.md

    * update docs/ja/pr_checklist.md

    * add :id=lite to docs/ja/custom_matrix.md

    * add :id=... to docs/ja/custom_quantum_functions.md

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: shela <[email protected]>

    * Update docs/ja/pr_checklist.md

    * Update docs/ja/pr_checklist.md

    * Update docs/ja/pr_checklist.md

    Co-authored-by: s-show <[email protected]>

    * Update docs/ja/pr_checklist.md

    Co-authored-by: s-show <[email protected]>

    Co-authored-by: shela <[email protected]>
    Co-authored-by: s-show <[email protected]>

commit fdbf67e0da7ceaf5bffc1a4f4020065eeda6b591
Author: Taylor Walla <[email protected]>
Date:   Tue Oct 13 06:46:21 2020 -0500

    [Keyboard] Add Voyager60-Alps keyboard (#10516)

    * add voyager60_alps

    * add readme, add gpl headers

    * add info.json

    * include all keys in info.json

    * fix typo in config.h

    * Update keyboards/ai03/voyager60_alps/keymaps/default/keymap.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/ai03/voyager60_alps/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/ai03/voyager60_alps/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/ai03/voyager60_alps/rules.mk

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/ai03/voyager60_alps/voyager60_alps.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit bb35f6a6f5d1209537b80e6eedcbb730320de8a9
Author: Christian Eiden <[email protected]>
Date:   Tue Oct 13 13:40:47 2020 +0200

    [Keymap] Add own KBD67 MKII keymap (#10532)

    * own KBD67 MKII keymap

    Signed-off-by: Christian Eiden <[email protected]>

    * Update keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h

    Co-authored-by: Drashna Jaelre <[email protected]>
    Signed-off-by: Christian Eiden <[email protected]>

    Co-authored-by: Drashna Jaelre <[email protected]>

commit c87b2efef8c7ff02c997c64c6bf112af4f30622e
Merge: 2a65709db b84b6107f
Author: Drashna Jaelre <[email protected]>
Date:   Tue Oct 13 04:36:17 2020 -0700

    Add VIA keymap for EVE Meteor. (#10454)

    * Add VIA keymap for EVE Meteor.

    * Remove bootmagic flag and add vendor/product IDs.

    * Update keyboards/eve/meteor/info.json

    Co-authored-by: Ryan <[email protected]>

    * Increment EVE Vendor ID to be unique.

    * Change product IDs.

    Make the EVE Meteor IDs both unique and somewhat logical based on the product name.

    Co-authored-by: Ryan <[email protected]>

    Co-authored-by: Ryan <[email protected]>

commit 2a65709db6b6154b6780b70b26de57d8d9a63749
Author: Drashna Jaelre <[email protected]>
Date:   Tue Oct 13 04:35:36 2020 -0700

    [Keyboard] Update to ZSA Boards (#10119)

    * Add VID/PIDs to ErgoDox EZ

    * Add VID/PIDs for Planck EZ and Glow revision

    * Make names consistent

    * fix typo in docs

    * Move LED config back, for maximum compatibility

    * Add revisions for ErgoDox EZ boards

    * Fix embarassing typo

    * Typooooo

    Co-authored-by: Nick Brassel <[email protected]>

    * Update Licensing info

    * Update Moonlander default keymap to match Oryx's default

    * Fix formatting based on suggestions

    Co-authored-by: James Young <[email protected]>

    * Make indicator LEDs more configurable

    * Update default keymap

    * Handle older eeprom settings

    Co-authored-by: Nick Brassel <[email protected]>
    Co-authored-by: James Young <[email protected]>

commit 451e600476d72b6f595044844b8a6767246de5ce
Author: Nate Stein <[email protected]>
Date:   Tue Oct 13 04:35:02 2020 -0700

    [Keyboard] update boot-mode method for EVE Meteor docs (#10453)

commit 6f391094ab218d2bb8e9764a65049d10fe7c945c
Author: MelGeek <[email protected]>
Date:   Tue Oct 13 19:31:45 2020 +0800

    [Keyboard] Melgeek mj63 (#10424)

    * [Keyboard]  Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Drashna Jaelre <[email protected]>

    * [Keyboard] MJ61 Add license header for files and the link for readme

    * Update keyboards/melgeek/mj61/readme.md

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/rev1/config.h

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/rev1/rules.mk

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Ryan <[email protected]>

    * Update keyboards/melgeek/mj61/mj61.c

    Co-authored-by: Ryan <[email protected]>

    * [Keyboard] Support MJ63 which is a 60% hotswap RGB keyboard with arrows
    and the size of left shift is 2U

    * Update keyboards/melgeek/mj63/mj63.h

    Co-authored-by: James Young <[email protected]>

    * Update keyboards/melgeek/mj63/keym…

Loading branch information

Vinciguerra committed Oct 28, 2020

1 parent 08931cd commit 43c7dd3

The diff you're trying to view is too large. We only load the first 3000 changed files.

.github/PULL_REQUEST_TEMPLATE.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,8 @@ @@
     <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
     <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-    - [ ] My code follows the code style of this project.
+    - [ ] My code follows the code style of this project: [**C**](https://docs.qmk.fm/#/coding_conventions_c), [**Python**](https://docs.qmk.fm/#/coding_conventions_python)
+    - [ ] I have read the [**PR Checklist** document](https://docs.qmk.fm/#/pr_checklist) and have made the appropriate changes.
     - [ ] My change requires a change to the documentation.
     - [ ] I have updated the documentation accordingly.
     - [ ] I have read the [**CONTRIBUTING** document](https://docs.qmk.fm/#/contributing).
@@ Expand Down @@

.github/labeler.yml

-Original file line number
+Diff line change
@@ -0,0 +1,42 @@
+    core:
+      - quantum/**/*
+      - tmk_core/**/*
+      - drivers/**/*
+      - tests/**/*
+      - util/**/*
+      - platforms/**/*
+      - Makefile
+      - '*.mk'
+    dependencies:
+      - any:
+        - 'lib/**/*'
+        - '!lib/python/**/*'
+    keyboard:
+      - any:
+        - 'keyboards/**/*'
+        - '!keyboards/**/keymaps/**/*'
+    keymap:
+      - users/**/*
+      - layouts/**/*
+      - keyboards/**/keymaps/**/*
+    via:
+      - keyboards/**/keymaps/via/*
+    cli:
+      - bin/qmk
+      - requirements.txt
+      - lib/python/**/*
+    python:
+      - '**/*.py'
+    documentation:
+      - docs/**/*
+    translation:
+      - docs/fr-fr/**/*
+      - docs/es/**/*
+      - docs/ja/**/*
+      - docs/he-il/**/*
+      - docs/pt-br/**/*
+      - docs/zh-cn/**/*
+      - docs/de/**/*
+      - docs/ru-ru/**/*
+    CI:
+      - .github/**/*

.github/workflows/api.yml

-Original file line number
+Diff line change
@@ -0,0 +1,39 @@
+    name: Update API Data
+    on:
+      push:
+        branches:
+        - master
+        paths:
+        - 'keyboards/**'
+        - 'layouts/community/**'
+    jobs:
+      api_data:
+        runs-on: ubuntu-latest
+        container: qmkfm/base_container
+        steps:
+        - uses: actions/checkout@v2
+          with:
+            fetch-depth: 1
+            persist-credentials: false
+        - name: Generate API Data
+          run: qmk generate-api
+        - name: Install rsync
+          run: |
+            apt-get update && apt-get install -y rsync
+        - name: Upload API Data
+          uses: JamesIves/[email protected]
+          with:
+            ACCESS_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            BRANCH: main
+            FOLDER: api_data/v1
+            CLEAN: true
+            GIT_CONFIG_EMAIL: [email protected]
+            REPOSITORY_NAME: qmk/qmk_keyboards
+            TARGET_FOLDER: v1

.github/workflows/info.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -16,16 +16,21 @@ jobs:
  
          with:

            fetch-depth: 0

        - uses: trilom/[email protected]

          id: file_changes

          with:

            output: '\n'

        - name: Print info

          run: |

            git rev-parse --short HEAD

            echo ${{ github.event.pull_request.base.sha }}

            git diff --name-only ${{ github.event.pull_request.base.sha }}...

            echo '${{ steps.file_changes.outputs.files}}'

        - name: Run qmk info

          shell: 'bash {0}'

          run: |

            QMK_CHANGES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}...)

            QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}')

            QMK_KEYBOARDS=$(qmk list-keyboards)

            exit_code=0

    @@ -41,7 +46,7 @@ jobs:
  
                echo "linting ${KB}"

                # TODO: info info always returns 0 - right now the only way to know failure is to inspect log lines

                qmk info -kb ${KB} 2>&1 | tee /tmp/$$

                qmk info -l -kb ${KB} 2>&1 | tee /tmp/$$

                !(grep -cq ☒ /tmp/$$)

                : $((exit_code = $exit_code + $?))

              fi

.github/workflows/labeler.yml

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    name: "Pull Request Labeler"
+    on:
+      pull_request_target:
+        types: [opened, synchronize, reopened, ready_for_review, locked]
+    jobs:
+      triage:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/labeler@main
+          with:
+            repo-token: "${{ secrets.GITHUB_TOKEN }}"
+            configuration-path: '.github/labeler.yml'

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
     *.swp
     tags
     *~
+    api_data/v1
     build/
     .build/
     *.bak
@@ Expand Down Expand Up / @@ -73,4 +74,6 @@ __pycache__ @@
     # prerequisites for updating ChibiOS
     /util/fmpp*
-    lib/ugfx
+    # Allow to exist but don't include it in the repo
+    user_song_list.h

.travis.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ addons: @@
     install:
       - npm install -g moxygen
     script:
+      - git fetch --depth=50 origin $TRAVIS_BRANCH:$TRAVIS_BRANCH
       - git rev-parse --short HEAD
       - git diff --name-only HEAD $TRAVIS_BRANCH
       - bash util/travis_test.sh
@@ Expand Down @@

.vscode/settings.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,8 @@ @@
             "*.hpp": "cpp",
             "xstddef": "c",
             "type_traits": "c",
-            "utility": "c"
+            "utility": "c",
+            "ranges": "c"
         },
         "[markdown]": {
             "editor.trimAutoWhitespace": false,
@@ Expand Down @@

api_data/_config.yml

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		theme: jekyll-theme-cayman

api_data/readme.md

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    # QMK Keyboard Metadata
+    This directory contains machine parsable data about keyboards supported by QMK. The latest version is always available online at <https://keyboards.qmk.fm>.
+    Do not edit anything here by hand. It is generated with the `qmk generate-api` command.

bootloader.mk

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,37 +27,39 @@
  
    # qmk-dfu        QMK DFU (LUFA + blinkenlight)

    # bootloadHID    HIDBootFlash compatible (ATmega32A)

    # USBasp         USBaspLoader (ATmega328P)

    # kiibohd        Input:Club Kiibohd bootloader (only used on their boards)

    # stm32duino     STM32Duino (STM32F103x8)

    #

    # BOOTLOADER_SIZE can still be defined manually, but it's recommended

    # you add any possible configuration to this list

    ifeq ($(strip $(BOOTLOADER)), atmel-dfu)

        OPT_DEFS += -DBOOTLOADER_ATMEL_DFU

        OPT_DEFS += -DBOOTLOADER_DFU

        ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))

        ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))

            BOOTLOADER_SIZE = 4096

        endif

        ifeq ($(strip $(MCU)), at90usb1286)

        ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))

            BOOTLOADER_SIZE = 8192

        endif

    endif

    ifeq ($(strip $(BOOTLOADER)), lufa-dfu)

        OPT_DEFS += -DBOOTLOADER_LUFA_DFU

        OPT_DEFS += -DBOOTLOADER_DFU

        ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))

        ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))

            BOOTLOADER_SIZE = 4096

        endif

        ifeq ($(strip $(MCU)), at90usb1286)

        ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))

            BOOTLOADER_SIZE = 8192

        endif

    endif

    ifeq ($(strip $(BOOTLOADER)), qmk-dfu)

        OPT_DEFS += -DBOOTLOADER_QMK_DFU

        OPT_DEFS += -DBOOTLOADER_DFU

        ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4))

        ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))

            BOOTLOADER_SIZE = 4096

        endif

        ifeq ($(strip $(MCU)), at90usb1286)

        ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))

            BOOTLOADER_SIZE = 8192

        endif

    endif

    @@ -89,7 +91,30 @@ ifeq ($(strip $(BOOTLOADER)), lufa-ms)
  
        BOOTLOADER_SIZE = 6144

        FIRMWARE_FORMAT = bin

    endif

    ifdef BOOTLOADER_SIZE

        OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))

    endif

    ifeq ($(strip $(BOOTLOADER)), kiibohd)

        OPT_DEFS += -DBOOTLOADER_KIIBOHD

        ifeq ($(strip $(MCU_ORIG)), MK20DX128)

            MCU_LDSCRIPT = MK20DX128BLDR4

        endif

        ifeq ($(strip $(MCU_ORIG)), MK20DX256)

            MCU_LDSCRIPT = MK20DX256BLDR8

        endif

        DFU_ARGS = -d 1C11:B007

        DFU_SUFFIX_ARGS = -v 1C11 -p B007

    endif

    ifeq ($(strip $(BOOTLOADER)), stm32duino)

        OPT_DEFS += -DBOOTLOADER_STM32DUINO

        MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader

        BOARD = STM32_F103_STM32DUINO

        # STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense

        STM32_BOOTLOADER_ADDRESS = 0x80000000

        DFU_ARGS = -d 1EAF:0003 -a2 -R

        DFU_SUFFIX_ARGS = -v 1EAF -p 0003

    endif

build_keyboard.mk

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -16,7 +16,6 @@ include common.mk
  
    KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))

    TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)

    KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)

    STM32_PATH := quantum/stm32

    # Force expansion

    TARGET := $(TARGET)

    @@ -138,7 +137,7 @@ endif
  
    ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)

        TARGET := $(TARGET)_proton_c

        include $(STM32_PATH)/proton_c.mk

        include platforms/chibios/GENERIC_STM32_F303XC/configs/proton_c.mk

        OPT_DEFS += -DCONVERT_TO_PROTON_C

    endif

    @@ -148,12 +147,6 @@ endif
  
    include quantum/mcu_selection.mk

    ifdef MCU_FAMILY

        OPT_DEFS += -DQMK_STM32

        KEYBOARD_PATHS += $(STM32_PATH)

    endif

    # Find all the C source files to be compiled in subfolders.

    KEYBOARD_SRC :=

build_layout.mk

-Original file line number
+Diff line change
@@ Expand Up @@
     define SEARCH_LAYOUTS_REPO
         LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
+        LAYOUT_KEYMAP_JSON := $$(LAYOUT_KEYMAP_PATH)/keymap.json
         LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
-        ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
+        ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","")
+            -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
+            KEYMAP_C := $(KEYBOARD_OUTPUT)/src/keymap.c
+            KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON)
+            KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
+        else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
             -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
             KEYMAP_C := $$(LAYOUT_KEYMAP_C)
             KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
@@ Expand All / @@ -24,4 +30,7 @@ ifneq ($(FORCE_LAYOUT),) @@
         endif
     endif
-    $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
+    $(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
+    # Use rule from build_json.mk, but update prerequisite in case KEYMAP_JSON was updated
+    $(KEYBOARD_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)

0 comments on commit `43c7dd3`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `43c7dd3`

Commit

There are no files selected for viewing

0 comments on commit 43c7dd3

0 comments on commit `43c7dd3`