Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce helix build variation5 #34

Merged
merged 1,472 commits into from
Oct 25, 2020
Merged

Reduce helix build variation5 #34

merged 1,472 commits into from
Oct 25, 2020

Conversation

mtei
Copy link

@mtei mtei commented Oct 24, 2020

すみません、PR 32 でやった qmk とのコンフリクト解消の master からのマージが間違っていました。
お手数かけますが、以下の手順でいったん PR 32 と PR 33 をキャンセルして、その後に、この PR 34 を取り込んでもらえないでしょうか。

まず、ないんさんの PC で以下を実行おねがいします。

$ cd qmk_formware
$ git fetch origin
$ git checkout reduce_helix_build_variation
$ git reset --hard 313203ea79271d14419b4634cd37de9f91696933
$ git push --force origin reduce_helix_build_variation

これで、PR 31 のマージ直後の状態になり、 PR 32, PR 33 をキャンセルした状態になるはずです。
念の為、以下のコマンドをいれて、

$ git log -1

以下のようなコミットが表示されることを確認おねがいします。

commit 313203ea79271d14419b4634cd37de9f91696933
Merge: ae529e1f4 3653ae8af
Author: MakotoKurauchi <[email protected]>
Date:   Sun Apr 26 21:17:15 2020

    Merge pull request #31 from mtei/reduce_helix_build_variation2

    Reduce helix build variation2

そののち、この PR 34 をマージおねがいします。

dayofdoom and others added 30 commits September 19, 2020 21:02
@dayofdoom @fauxpark
Align RoMac+ vendor and product info (qmk#10349)
12fe78e 
* Update config.h

adding vendor and product info so VIA will recognize it.

* Update keyboards/kingly_keys/romac_plus/config.h

thank you for this. commiting suggestion.

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

Co-authored-by: Ryan <[email protected]>
@pagondel @noroadsleft
[Keymap] Adds pagondel layout for dz65rgb v2 (qmk#9914)
08ef4b4 
* Adds pagondel layout for dz65rgb v2

* Adds license information

* replaces define by enums

* Update license year

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

Co-authored-by: James Young <[email protected]>
@firetech
[Keyboard] Make WPM sync between halves on Ergodox Infinity (qmk#9526)
6eab8a0 
* Make WPM able to sync between keyboard halves on Ergodox Infinity.

* Fix mixed indentation in ergodox_infinity.c.
@stephen-huan
Add stephen-huan keymap and fix LED problem in the default Plaid keym…
3abb609 
…ap (qmk#9306)

* change layers, add pinmode to fix LEDs

* fix LEDs by setting the pin mode

* edit README

* edit GPIO documentation, edit keymap

* add markov chain

* simplify LED logic

* undo documentation changes

* keymap changes, fix LED enum logic
@pabile @ridingqwerty
@drashna @noroadsleft
[Keyboard] add P40 Ortho, P42, and P20 ver2 by pabile (qmk#9980)
741856d 
* Add files via upload

* removed

* Add files via upload

* Rename pabile40.c to p40.c

* Rename pabile40.h to p40.h

* Add files via upload

* Update p40.c

* Update p40.h

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Updated readme file

* Updated readme file

* Add files via upload

* modified:   keyboards/pabile/p18/config.h
	modified:   keyboards/pabile/p18/keymaps/default/keymap.c
	modified:   keyboards/pabile/p18/p18.h
	modified:   keyboards/pabile/p18/rules.mk
	modified:   keyboards/pabile/p40/config.h
	modified:   keyboards/pabile/p40/keymaps/default/keymap.c

* config update

* Delete README.md.save

* Delete keymap.c.save

* Delete keymaps.c

* modified:   keyboards/pabile/p18/keymaps/default/keymap.c

* Update p18.h

* testing layout config

* Create info.json

* Create info.json

* Create readme.md

* Update readme.md

* Updated description

* Updated description

* Update config.h

updated vendor ID to 0000

* Update keymap.c

removed unnecessary comments

* Update keyboards/pabile/p18/p18.h

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p18/p18.h

Co-Authored-By: ridingqwerty <[email protected]>

* Update p18.h

removed unnecessary comments

* Update keyboards/pabile/p18/rules.mk

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p18/rules.mk

Co-Authored-By: ridingqwerty <[email protected]>

* Update config.h

updated vendor id and removed unnecessary comments

* Update keyboards/pabile/p40/info.json

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/keymaps/default/keymap.c

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/p40.h

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/p40.h

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/p40.h

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/rules.mk

Co-Authored-By: ridingqwerty <[email protected]>

* Update keyboards/pabile/p40/rules.mk

Co-Authored-By: ridingqwerty <[email protected]>

* Added p20 macropad

* Update README.md

* Updated VID and PID

* Updated VID and PID

* Update rules.mk

* Update config.h

* Update config.h

* Update config.h

* Update keymap.c

* Replaced blank keys with KC_NO

* Update keyboards/pabile/p18/keymaps/default/keymap.c

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keyboards/pabile/p18/p18.h

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keyboards/pabile/p18/rules.mk

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keyboards/pabile/p20/keymaps/default/keymap.c

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keymap.c

* Update keymap.c

* Update keyboards/pabile/p20/rules.mk

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keyboards/pabile/p40/info.json

Co-Authored-By: Drashna Jaelre <[email protected]>

* Update keyboards/pabile/p20/p20.h

Co-Authored-By: Drashna Jaelre <[email protected]>

* Updated product ID

* Updated product ID

* Update keyboards/pabile/p20/config.h

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

* Update keyboards/pabile/p20/p20.h

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

* Update keyboards/pabile/p20/p20.h

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

* Update keyboards/pabile/p20/keymaps/default/keymap.c

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

* Update keyboards/pabile/p18/readme.md

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

* Update keyboards/pabile/p20/README.md

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

* Update keyboards/pabile/p20/rules.mk

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

* Update keyboards/pabile/p20/rules.mk

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

* Update keyboards/pabile/p20/rules.mk

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

* Update keyboards/pabile/p20/rules.mk

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

* Update keyboards/pabile/p40/README.md

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

* Update keyboards/pabile/p40/rules.mk

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

* Update keyboards/pabile/p40/rules.mk

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

* Update keyboards/pabile/p18/rules.mk

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

* Update keyboards/pabile/p18/rules.mk

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

* Update keyboards/pabile/p40/config.h

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

* Update keyboards/pabile/p40/config.h

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

* Update keyboards/pabile/p18/readme.md

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

* Changed to lowercase filename

* Rename README.md to readme.md

* Update keyboards/pabile/p18/rules.mk

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

* Add files via upload

* typo

* New keyboard

* Updated image link

* Updated default ortho keymap

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update keymap.c

* default firmware

* Delete pabile_p40_ortho.hex

* Update keymap.c

added KC_SPC to make keymap compatible with both grid and MIT. keymap is designed for MIT.

* Update keymap.c

* Update info.json

added MIT layout

* Update p40.h

added MIT layout option

* Added support for version 2 PCB

New/corrected pin locations. (Backlight) LED pin now on B6. Up to 3 rotary encoder support.

* Update readme.md

update for PCB v2

* Update readme.md

updated link

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

removed backlight pins

* Update keymap.c

added encoder. simplified layout.

* Update keymap.c

* Update p42.h

* Update keymap.c

simplified

* Update keymap.c

* Update readme.md

replaced photo

* Added new keyboard

Initially placed under p40. separated as a new keyboard following an advise from gh.

* start rename

* removed old folder

* reverted to last merge

* revert to last merge

* Update p40.h

reverted to last merge

* Update keymap.c

* Update keymap.c

removed encoder support

* Update config.h

removed encoder support

* Update config.h

removed encoder support

* Update keymap.c

removed encoder support

* Update readme.md

removed encoder support

* Update info.json

* Update keymap.c

* Update keymap.c

* Update keyboards/pabile/p20/rules.mk

added numpad option

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

* added numpad option

* Update keyboards/pabile/p40/keymaps/ortho/config.h

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

* Update keyboards/pabile/p18/config.h

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

* Update keyboards/pabile/p20/config.h

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

* moved to p40_ortho keyboard rather than a keymap

* moved to p40_ortho keyboard rather than a keymap

* moved to p40_ortho keyboard rather than a keymap

* Update config.h

Added copyright details.

* Update keyboards/pabile/p20/p20.h

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

* Update keyboards/pabile/p20/p20.h

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

* Update keymap.c

alignment

* Update keyboards/pabile/p42/rules.mk

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

* Update keyboards/pabile/p42/rules.mk

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

* Update keyboards/pabile/p40_ortho/config.h

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

* Update keyboards/pabile/p40_ortho/info.json

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

* Update keyboards/pabile/p40_ortho/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/p42.h

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

* Update keyboards/pabile/p40_ortho/keymaps/default/keymap.c

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

* Update keyboards/pabile/p40_ortho/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p40_ortho/keymaps/default/keymap.c

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

* Update keyboards/pabile/p40_ortho/keymaps/default/keymap.c

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

* Update keyboards/pabile/p40_ortho/p40_ortho.h

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

* Update keyboards/pabile/p40_ortho/p40_ortho.h

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/info.json

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

* Update keyboards/pabile/p42/config.h

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

* Update keyboards/pabile/p40_ortho/rules.mk

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

* Update keyboards/pabile/p40_ortho/rules.mk

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

* Update keyboards/pabile/p40_ortho/rules.mk

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

* Update keyboards/pabile/p20/keymaps/ver2/config.h

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

* Update config.h

Added copyright statement

* Update config.h

Added copyright statement

* Update config.h

Added license header

* Update keymap.c

Added license header

* Update p20.h

Added license header

* Update p40_ortho.c

Added license header

* Update p40_ortho.h

Added license header

* Update keymap.c

Added license header

* Update keyboards/pabile/p42/rules.mk

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

* Update keymap.c

Updated LAYOUT to LAYOUT_default in response to Run failed: PR Lint keyboards - master (0f278a2)

* Update p42.h

Updated LAYOUT to LAYOUT_default in response to Run failed: PR Lint keyboards - master (0f278a2)

* Update p42.h

Added license header

* Update keyboards/pabile/p42/p42.h

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* Update keyboards/pabile/p42/keymaps/default/keymap.c

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

* add pabile/p20/ver2

* add missing license header

* Update keyboards/pabile/p20/ver2/keymaps/default/keymap.c

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

* Update keyboards/pabile/p20/ver1/ver1.c

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

Co-authored-by: root <[email protected]>
Co-authored-by: ridingqwerty <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: James Young <[email protected]>
@rtitmuss @tzarc
@noroadsleft @drashna @fauxpark
[Keyboard] Add Torn keyboard (qmk#10207)
e1437c1 
* Add Torn keyboard

* Apply suggestions from code review

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

* Remove via json file

* Add mcp23081_pin_t

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Richard Titmuss <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>
Co-authored-by: James Young <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
Co-authored-by: Ryan <[email protected]>
@yuruko @drashna
[Keymap] Add lily58/muuko keymap (qmk#10355)
ed2ba64 
* lily58 layout with working bongo cat timeout

* lily58 layout with working bongo cat timeout

* spacing

* spacing

* spacing

* spacing

* spacing

* layout

* spacing

* keymap

* keymap

* spacing

* keymap

* spacing

* Update keyboards/lily58/keymaps/muuko/config.h

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

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

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

* review

* spacing

* remove unnecessary func

* changed proximity of layer button

Co-authored-by: Drashna Jaelre <[email protected]>
@coseyfannitutti
[Keyboard] add iso compatibility for mysterium rev1.1 pcb (qmk#10348)
a2ff3c4
@noroadsleft
KBD67 MkII Soldered: ISO layout patches (qmk#10367)
fb4a6ad 
* KBD67 MkII Soldered: Fix ISO blocker layout

Matrix data was wrong; KC_NUHS key did not work.

* KBD67 MkII Soldered: Add ISO blocker with Split Backspace layout
@sigprof
Disable the command feature for onekeys (qmk#10366)
fee953c 
There is no way to invoke the command feature while having just a single
physical key, and disabling that feature fixes build for keymaps like
`handwired/onekey/promicro:rgb` without resorting to LTO (the command
feature consumes more than 4900 bytes with avr-gcc 8.4.0).
@LostQuasar
Fix media keys in via keymap for 2% milk (qmk#10357)
9f0a2a7 
* Allow media keys in milk via

* Update rules.mk

* Update rules.mk

* Update rules.mk
@worldspawn00
[Keyboard] adding V2 support (qmk#10309)
7f34a6b 
updating image for V2 options
@wilba
Fix typo in via.c (qmk#10000)
bc7a745
@afewyards
[Keyboard] knife66 added (qmk#9877)
0384237 
* feat: keyboard knife66 added

* fix: requested changes applied

* docs: updated readme

* feat: added support for ws2812

* fix: adjusted headers and readme

* fix: moved to LAYOUT_all
[Docs] Clarify functionality of update_tri_layer_state (qmk#10370)
2f637e4 
* Add information to docs
- If layer z is not a higher layer than both x and y, the layer change code
does not function correctly.

* Update docs/ref_functions.md

* Update docs/ref_functions.md

* Update docs/ref_functions.md
Minor updates 60_ansi_arrow (qmk#10332)
becaf32 
* Minor updates 60_ansi_arrow

* Update keymap.c

* Update keymap.c

* Minnor updates

* Minnor updates

* Update readme.md
Minor updates dz60:mrsendyyk (qmk#10334)
c4eb0df 
* Minor updates dz60:mrsendyyk

* Update keymap.c

* Update keymap.c

* Update readme.md
@MakotoKurauchi @keyaki-namiki
add VIA support for Quick7 (qmk#10281)
b350827 
* update "Hardware Availability"

* add a section of "How to build"

* update "Hardware Supported"

* add VIA keymaps

* add 2 layers to VIA keymaps

Co-authored-by: keyaki-namiki <[email protected]>
@delivrance
[Keymap] Add delivrance's keymap for 40percentclub/mf68 (qmk#10294)
e4cf0a4
@brandonschlack
Enable Extrakey in VIA for CFTKB keyboards (qmk#10308)
6bebb12
@loksonarius
Add Amethyst keybindings for some dcompact implementations (qmk#10345)
ebbcb83 
* Fix missing VAI

* Add amethyst keybindings

* Add amethyst bindings for planck
@sambaum
bm60rgb_iso: add underglow support (qmk#10307)
e3f9569 
* add underglow definition
@ericvw
massdrop/alt: Remove unused user functions and config in default keym…
bc8fe91 
…aps (qmk#10313)

The default keymaps don't make use of the global `keymap_config` 
variable nor the `matrix_*_user()` functions.  Therefore, remove them to
avoid confusion for future keymap authors.
@2Moons-JP
Copyright Updates for basekeys/slice (qmk#10383)
b86fa3d 
* Copyright Updates

* Copyright Updates
@gwillad
update vendor id of 4x12 to match 3x4 and 5x12 for boardsource (qmk#1…
dc037f1 
…0306)
@333fred
Add OLED driver function to determine if the screen is currently on (q…
c236676 
…mk#10382)
[Keymap] add codecoffeecode keymap for Preonic (qmk#10364)
ccab502 
* Adding preonic layout

* deleting unnecessary files

* Fixing spacing

* I need to not commit things while I'm not sober

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Adding license header
update jotix ortho_4x12 keymap: add some missing keycodes (qmk#10289)
924823c
@marksard
Fixed info.json file for treadstone48/rev2 (qmk#10290)
0b2eae7 
* Keyboard: add treeadstone48

* rename layout defines

* Use of pragma once

* move common include code

* fixed info.json

* change keymap layout from kc to normal

* fix alpha revision keymap

* fixed info.json

* remove USE_Link_Time_Optimization

* Fixed info.json file.
@bcat
Update bcat keymaps for crkbd and lily58(qmk#10298)
342ab6a 
* Swap ergo lower layer shortcuts for zoom keys
ramonimbao and others added 25 commits October 17, 2020 11:40
@ramonimbao
[Keyboard] AELITH (qmk#10652)
aa1c1c3 
* 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
@drashna
[Keymap] Drashna Code Cleanup (qmk#10656)
855dd2d 
* 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
@yulei
Fix iNETT Studio SQUARE.X overcurrent issue (qmk#10660)
3633330
@soenkehahn
[Keymap] moonlander:shahn-neo (qmk#10667)
de0153f 
* 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
@mrsendyyk
mrsendyyk Keymap Cleanup (qmk#10539)
f663ba5 
* 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
@dezlidezlidezli
[Keymap] Add miniMACRO5 User Keymaps (qmk#10595)
47ea522 
* 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
@pierrechevalier83
Ferris reorganization (qmk#10564)
704934c 
* 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
@Foxboron
50-qmk.rules: Move udev rules from documentation into a file (qmk#10664)
7d5ba88 
This makes it overall easier to package for downstream distributions
instead of keeping tabs with inline documentation.

Signed-off-by: Morten Linderud <[email protected]>
@skullydazed
Improve ANSI support and --no-color (qmk#10537)
445cd95 
* 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
@drashna @fauxpark
Add last breaking changes log to sidebar (qmk#10680)
40e694e 
Co-authored-by: Ryan <[email protected]>
@strawy @fauxpark
Enabled the use of VIA for KPRepublic BM40 (qmk#10677)
8be058d 
Co-authored-by: Ryan <[email protected]>
@cmdremily @noroadsleft @fauxpark
Support OpenDeck 32 keyboard (qmk#10305)
f952d4f 
Co-authored-by: James Young <[email protected]>
Co-authored-by: Ryan <[email protected]>
@yiancar
Nebula12 RGBLIGHT buffer workaround (qmk#10555)
d49dcdd 
* Work around for rgblight buffer

* Update config.h

* Prettify

* Clip led range
@melgeek001365
[Keyboard] Melgeek Mojo75 (qmk#10426)
4d22bc9 
* [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
@npspears
[Keyboard] Plexus75 (qmk#10668)
6ad813e 
* 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
@zvecr @noroadsleft @tzarc
Initial auto PR labeler config (qmk#9814)
8456625 
* 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]>
@rezaadio
[Keyboard] add rartlice (qmk#10495)
e468380 
* 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
@mexsistor @drashna
@fauxpark @noroadsleft
[Keyboard] Add mexsistor/ludmila (qmk#10506)
0728a6b 
* 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 cfbe534.

* 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]>
@jackhumbert @drashna
[Keymap] Adds Jack's 4x12 grid keymap (qmk#10586)
7622678 
* 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]>
@spbgzh
[Keyboard] Add support for ikki68 (qmk#10576)
c492dd7 
* ikki68 from wuquestudio

* NEW ikki68

* Add support for ikki68

* Update readme.md

Co-authored-by: root <[email protected]>
@cwebster2
[Keymap] add cwebster2 userspace and keymaps (qmk#10541)
8bb2eea 
* 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
@mtei
add 'helix/pico/qmk_conf' and 'helix/rev2/qmk_conf' target
3c7cd83
@mtei
add ChangeLog for Helix: PR 8669
cd2edbd
@mtei
Merge commit '8bb2eeaab' into reduce_helix_build_variation
95ddddc
@mtei
fix helix/pico/qmk_conf compile error
b6bb6c0
@MakotoKurauchi MakotoKurauchi force-pushed the reduce_helix_build_variation branch from 093f9d6 to 313203e Compare October 25, 2020 02:41
@MakotoKurauchi MakotoKurauchi merged commit 8c291e3 into MakotoKurauchi:reduce_helix_build_variation Oct 25, 2020
@MakotoKurauchi
Copy link
Owner

ありがとうございます！

@mtei mtei deleted the reduce_helix_build_variation5 branch December 21, 2020 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.