Commit Graph

8257 Commits

Author SHA1 Message Date
QMK Bot
830b795ee3 Merge remote-tracking branch 'origin/master' into develop 2021-02-01 09:18:24 +00:00
cole smith
3f91b2b8f8
added limit to RGB brightness (#11759) 2021-02-01 20:17:49 +11:00
Drashna Jaelre
9591e992cc
Move transport.c to QUANTUM_LIB_SRC (#11751) 2021-02-01 20:12:52 +11:00
Zach White
ef6329af7c
Create a system to map between info.json and config.h/rules.mk (#11548)
* generate rules.mk from a json mapping

* generate rules.mk from a json mapping

* support for config.h from json maps

* improve the mapping system

* document the mapping system

* move data/maps to data/mappings

* fix flake8 errors

* fixup LED_MATRIX_DRIVER

* remove product and description from the vision_division keymap level

* reduce the complexity of generate-rules-mk

* add tests for the generate commands

* fix qmk doctor when submodules are not clean
2021-01-31 12:46:00 -08:00
QMK Bot
6cada2a35f Merge remote-tracking branch 'origin/master' into develop 2021-01-31 10:42:07 +00:00
Drashna Jaelre
c1361005fa
[Keyboard] SplitKB's Zima (#11577)
Co-authored-by: Thomas Baart <thomas@splitkb.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-31 11:41:18 +01:00
QMK Bot
213e64f944 Merge remote-tracking branch 'origin/master' into develop 2021-01-31 07:09:30 +00:00
Rys Sommefeldt
6ce6a94216
Fix missing F2 in top row in AoS TKL maps (#11735) 2021-01-31 18:09:00 +11:00
Zach White
3af97ef6a2 Merge remote-tracking branch 'origin/master' into develop 2021-01-30 13:15:13 -08:00
Zach White
5ba21060cb remove conflicting NKRO_ENABLE flag 2021-01-30 13:11:33 -08:00
Zach White
1ed9c53816 add missing ADJUST key 2021-01-30 13:11:33 -08:00
Zach White
04d6d25ec3 make the tetris keymap fit 2021-01-30 13:11:33 -08:00
Zach White
404bcc961c fix clueboard/66:magicmonty to bring hue under the 255 limit 2021-01-30 13:11:33 -08:00
Zach White
c8edd6ec9e fix chimera_ortho:gordon so it compiles 2021-01-30 13:11:33 -08:00
Zach White
13e4bd31d7 enable bluetooth on atreus:clash to fix compile error 2021-01-30 13:11:33 -08:00
Zach White
cd53947d86 enable LTO on atreus:ibnuda to bring it below the threshold 2021-01-30 13:11:33 -08:00
Zach White
915d757eb2 fix atomic:pvc so it compiles 2021-01-30 13:11:33 -08:00
Zach White
d02c4c5241
Add a <FEATURE>_SUPPORTED flag (#9058)
* Initial attempt at allowing keyboards to indicate what features they do not support

* try to use a for loop instead

* Update disable_features.mk

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

* add a few more features

* remove my test fixture

* disable things that make all:all suggested"

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-30 13:08:58 -08:00
QMK Bot
787ff5b550 Merge remote-tracking branch 'origin/master' into develop 2021-01-30 04:09:47 +00:00
CMMS-Freather
4c4b4b6e0d
[Keyboard] add sam's sg81m keyboard (#11624)
* new repo: create cmm.studio folder, add saka qmk firmware

new folder for cmm.studio line up keyboard
added saka68 keyboard qmk and via firmware support

* Update keyboards/cmm.studio/saka68/config.h

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

* Update keyboards/cmm.studio/saka68/rules.mk

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

* Update keyboards/cmm.studio/saka68/keymaps/via/rules.mk

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

* Update keyboards/cmm.studio/saka68/config.h

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

* fix on keymap, readme

fix on keymap, readme

* Update keyboards/cmm.studio/saka68/readme.md

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

* Update keyboards/cmm.studio/saka68/keymaps/default/keymap.c

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

* update vendor name with _ instead of .

update vendor name with _ instead of .

* Update readme.md

change the make format

* Update keyboards/cmm_studio/saka68/keymaps/default/keymap.c

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

* deleted some files from cmm.studio, changes to cmm_studio

deleted some files from cmm.studio, changes to cmm_studio

* Update readme.md

make command changed

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added pic for pcb

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/config.h

tested and does work now. deleting these lines

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

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added use physical reset button instruction

* change to the cmm saka folder

making the changes to cmm saka firmware

seperated solder version firmware and hotswap version firmware

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* change to the cmm saka hotswap folder

* add sam's sg81m keyboard

add sam's sg81m keyboard firmware

* Update keymap.c

* Update keymap.c

* update keymap

update default keymap and via keymap

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keyboards/sam/sg81m/sg81m.c

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

* Update config.h

* Update config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-29 20:09:11 -08:00
QMK Bot
3780ab3fcd Merge remote-tracking branch 'origin/master' into develop 2021-01-30 03:38:45 +00:00
Eithan Shavit
42045f5b17
[Keyboard] Adding Gust Macro Board (#11610)
* Adding Gust Macro Board

* Removing some rules

* Changing some rules

Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-01-29 19:38:40 -08:00
Eithan Shavit
64da7413a0
[Keyboard] Adding Rev1 to afternoonlabs/breeze (#11611)
* Breeze Rev1

* Better bootmagic and reset

* typo

Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-01-29 19:38:18 -08:00
QMK Bot
8bcac0b726 Merge remote-tracking branch 'origin/master' into develop 2021-01-30 03:25:22 +00:00
james sa
53b35052ee
[Keyboard] A symmetric stagger keyboard: Angel (#11501)
* New symmetric stagger keyboard: Angel

* mac layout

* layout simplify

* Update keyboards/angel/info.json

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

* Update keyboards/angel/keymaps/default/keymap.c

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

* Update keyboards/angel/config.h

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

* Update keyboards/angel/readme.md

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

* Update keyboards/angel/rules.mk

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

* tab lang switch

* move to handwired and fix build instructions.

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-29 19:24:42 -08:00
Ryan
30b46fad57
UART driver refactor (#11637) 2021-01-27 17:42:49 +11:00
fauxpark
be897cbc2f Merge remote-tracking branch 'upstream/master' into develop 2021-01-27 17:39:20 +11:00
Ryan
6937f1d70e
Remove MIDI_ENABLE_STRICT from keyboards' config.h (#11679) 2021-01-27 17:26:26 +11:00
QMK Bot
349571d111 Merge remote-tracking branch 'origin/master' into develop 2021-01-27 00:53:05 +00:00
Brandon Claveria
a0d9221dcc
pull retropad out of handwired and update readme.md (#11545)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-01-27 00:52:17 +00:00
QMK Bot
784e4688f8 Merge remote-tracking branch 'origin/master' into develop 2021-01-26 04:59:49 +00:00
Matt Gilbert
7e8d97f8f0
[Keymap] Add 'mattir' keymap for the Kyria keyboard (#11428)
* First version of keymap

* cleaned up code, made some tweaks, added readme

* extended oled timeout

* resolved final issues, all features functional

* added some leader-key combos

* added missing RGB keys to layout diagram

* removed lines for older elite-c v3

* make filename lowercase

* add old update interval

* fix spacing
2021-01-25 20:59:21 -08:00
QMK Bot
2f145bc231 Merge remote-tracking branch 'origin/master' into develop 2021-01-26 04:23:57 +00:00
Tushar Khan
0e7e52c820
[Keymap] tk planck keymap (#11400)
* tushark54 base layers

* init summer keymap

* drafted new keymap layers

* added new keymap

* v2.0 mvp

* added bracket modes

* added oneshot left modifiers

* added HYPER layer

* added audio

* added audio and more

* changed layer order

* swapped SUPER and LCTL keys

* added more tunes

* added more audio

* added tunes

* major layer modifications

* major changes to keymaps

* minor changes

* added venv macro

* merge conflict

* v3 mvp

* moved DEL to hyper layer and PANIC+ALT

* fn keys on hyper, macros on lower ii

* dynamic macros and audio options

* minor audio improvements

* osl timeouts

* manually added .vscode directory

* fixed upstream file

* fixed upstream file

* base and hyper layer changes

* modified tapping term

* added more macros

* added GPL2+ compatible license headers

* removed songs

* updated licenses

* added chmod macro
2021-01-25 20:23:23 -08:00
Nick Brassel
9f1d2246a0
ChibiOS conf upgrade for durgod/k320 (#11689)
durgod/k320 - 168c88d401381d9a29166d3b07967e6f0752532d
2021-01-25 19:39:36 +00:00
QMK Bot
5680f793cf Merge remote-tracking branch 'origin/master' into develop 2021-01-25 17:30:56 +00:00
Donald Kjer
88ca4ec2cb
Add support for the DURGOD Taurus K320 keyboard (#11399)
* Initial support for Durgod K320 with BootMagic Lite

- Adding missing files
- Add Unicode Map Support & new user keymap
- Remove personalized features from Default keymap
- Added Unicode Map to both Default and kuenhlee keymap.c
- Updated readme.md
- Added additional Fn Shortcut keys

* Additional support for Durgod K320

- Simplifying default keymap
- Renaming durgod_k320 => durgod/k320
- Removing copy of ST_NUCLEO64_F070RB from K320. Replacing with local board.h
- Adding Mac keyboard layout for K320 as alternative via Fn+F12
- Implementing Windows Key lock on K320
- Cleaning up duplicated core functionality
- Adding default_toggle_mac_windows keymap with:
  - Ability to toggle between Windows and MacOS layout
  - Mac Media Lock functionality.

* Updating K320 keymap readme

Co-authored-by: kuenhlee <eos.camera.lee@gmail.com>
2021-01-26 04:30:17 +11:00
QMK Bot
c979141002 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 06:39:33 +00:00
Danny
2a34e07ff9
[Keyboard] Add Quefrency Rev. 3 (#11578)
* Update default VIA layout option

* Add Quefrency Rev. 3

* Update readme

* Add GPL2 headers

* Update keyboards/keebio/quefrency/rev3/config.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-24 22:39:00 -08:00
QMK Bot
3c743f00c0 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 06:26:19 +00:00
mrT1ddl3s
bd5d3c879e
[Keyboard] Knobgoblin keyboard initial commit (#11664)
* Knobgoblin keyboard initial commit

New macropad initial commit. Keyboard and keymap

* corrected bracket and layout name

* attempting info file fix again

* info file line 33 hanging comma fix

* Update keyboards/knobgoblin/config.h

per fauxpark review

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

* Update keyboards/knobgoblin/readme.md

per fauxpark review

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

* Update keyboards/knobgoblin/readme.md

per fauxpark review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-24 22:25:50 -08:00
QMK Bot
a4e46fc5ac Merge remote-tracking branch 'origin/master' into develop 2021-01-25 06:17:19 +00:00
Niek Blankers
c1e1166991
[Keyboard] Fix for LEDs on PocketType (#11671)
The LED anodes of the pockettype are connected to the bus voltage when a
pro micro is used, but other controllers like the Elite-C (v4) connect this
pin to GPIO B0. This means that LEDs do not work by default for those
controllers.

This commit implements a fix for that by setting the B0 pin high.
2021-01-24 22:16:42 -08:00
QMK Bot
7e5c58cdca Merge remote-tracking branch 'origin/master' into develop 2021-01-25 06:06:47 +00:00
melonbred
50690b2d5c
[Keymap] Update Program Yoink Ortho Split Layout (#11675) 2021-01-24 22:06:17 -08:00
QMK Bot
f70723da25 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 06:05:51 +00:00
Albert Y
ffb85b1f5d
[Keyboard] Add RGB Matrix support for The Mark:65 (#11676)
* Add RGB Matrix support for Mark 65 keyboard

* Update drive LED count

* Removed unnecessary define line

* Corrected typo

Co-authored-by: filterpaper <filterpaper@localhost>
2021-01-24 22:05:16 -08:00
QMK Bot
cce7b91cb1 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 05:38:32 +00:00
Ryan
c65aecc53a
Remove redundant I2C config defines from keyboards (#11661) 2021-01-25 16:37:53 +11:00
QMK Bot
9579e92451 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 03:43:36 +00:00
Brian Romanko
66836effda
[Keyboard] Add layout to torn keyboard (#11684) 2021-01-24 19:42:37 -08:00
QMK Bot
5fb4772323 Merge remote-tracking branch 'origin/master' into develop 2021-01-25 03:13:13 +00:00
Monksoffunk
711f861d83
Change VID/PID for Zinc (#11681) 2021-01-25 14:13:10 +11:00
Loïc Wisniewski
bf7e19e997
Fix midi for CRKBD (#11644)
Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
2021-01-25 14:12:28 +11:00
QMK Bot
dde9dc7b60 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 21:55:02 +00:00
Takeshi Nishio
deea6a9826
Add jones v.0.3 and v.0.3.1 keyboard (#11130)
* Update LEDの物理的接続とQMKのソフト的接続を調整し、左→アンダーグロー→右と繋がるようにした。

* Update レイヤーインジケータ関連変数を、#ifdefブロック内へ移動。

* Update コード整形

* Revert "Update コード整形"

This reverts commit c98483d9a0b41f8939a01b677cdcd18a8af34f78.

* Update 未使用のキーコード、S_SLSHに関連するコードを削除。

* Update コード整形

* Update キーごとのTappingTerm設定を使用しなくなったため、削除。

* Update 未使用コード削除。

* Update コメント追加

* Update レイヤーとIMEのON/OFFを同じキーに割り当てるのをやめたため、関連コードを削除。

* Update コメント追加

* Update コメント

* Update 誤読を避けるため、ifブロックの表記を括弧を使用したものへ変更。動作に変化なし。

* Update 未使用のため削除。

* Update LED関連でデフォルトレイヤーを格納して使用しないため、削除。

* Update コメント

* Update レイヤーによってロータリーエンコーダの動作を変える機能を追加。

* Update comment

* Update 実態に合わせて修正。

* Update JP用キーコードへの書き換え忘れを修正。

* New v.0.3.1 JP style

* Update v.0.3のJPスタイルではオーディオサポートなし。

* Update to latest information

* New

* New keyboard "stmeishi"

* Update layout name

* Update move common settings from keymap's "rules.mk" to keyboard's "rules.mk".

* Update: Move common settings from keymap's "rules.mk" to keyboard's "rules.mk".

* Update: Add "LAYOUT_all" for multiple layout.

* Update target to latest "v.0.3.1".

* Remove unused item.

* Update comments.

* Update Rotary Encoder pins to actual used count.

* Update increase value to maximum.

* Update comments.

* Change default Effects.

* Remove unused items.

* Update comment.

* Change: Use define and function insted of real value for wait.

* Update copyrght.

* Update Update: Add "LAYOUT_all" for multiple layout.

* New: Place info.json copied from v.0.3.1.

* Remove unused items.

* Update: Add comma at last element.

* Update comments.

* Update: change if block style.

* Update: Change Japanese comments to English.

* Update: Change layout name.

* Update: Change layout name.

* Update: Fix miss numbering for ANSI layout.

* Update: Move "Tap Dance" rule to keymap's rule.

* New: Add default keymap.

* Delete: Moving files to branch.

* Initial: Add files from local.

* Remove local only unused keymaps.

* Update: Remove unused, comment outed codes.

* Add default keymap for v.0.3.

* Update: Add custom keycodes.

* Update: Change layer handling from process_record_user to layer_state_set_user.

* Update comment.

* Update: Remove unused function.

* Add my ErgoDash settings.

* Add my NumAtreus_Plus8 settings.

* Add my test_k15r2 settings.

* New Colice片手分動作確認済み

* Update スプリットキーボード対応

* Update 反応が悪くずっと二度押ししているので、ESCキーをレイヤーキーとの共用から、単独機能に変更。

* Update 右手スイッチ配置変更。インジケータLED対応。

* Change インジケータLEDが眩しいので、明るさを下げた。

* Change 右手親指のキーマップ変更。

* Change NumLockの誤爆防止のため、二度押しでレイヤートグルするようにした。

* Change 左手側、Bの右側のキーを誤爆することが多く日本語入力が途切れるため、レイヤーキーの機能左右で入れ替え。

* Update 右手側、画像ソフトなどで使うため、矢印キーの左をレイヤーキーからCTRLへ変更。

* New add new keyboard

* Update Duplex-Matrixが動作した初版

* New Duplex-Matrixのサンプルコード by e3w2q を最新のQMKファームウェアで動作するよう一部修正したもの。

* update Comment-out debug print code.

* Update Colice V0.2 キープレートで矢印キー付近の物理配列が変わったことへ対応

* Update キーレイアウト

* New Initial commit

* Update Fix migrate errors from test_duplex_dp to test_col2col

* Remove unnecessary files

* Testing

* Update IKeJIさんの方法(とりあえずCOL2COLと呼ぶ)の動作テストOK

* New 2乗マトリクス配線のキーボードを追加

* Update キーレイアウト調整

* New colice_rr 初回コミット。基本動作確認OK。LED不調。

* Update Eable LED, Reduce firmwre size

* Update colice_rr キーマップ調整。

* Update colice_rr ロータリーエンコーダ機能追加。

* Move colice_rr を colice_rr_split へ移動。

* Update colice_rr_splitフォルダへ移動したことに対応。

* New colice_rr_splitの初回コミット。

* Update キーマップ調整

* Update キーマップ調整

* New initial comit

* Update 意図せずカッコを入力することがるため、LSPO、RSPCの使用を中止。

* Change Fnキー押下時の日本語入力ONを、長押し時にキャンセルするように変更。

* Change LED点灯方法変更。

* Change 基板バージョンごとにサブフォルダを作成するようにした。

* Update Windows用レイヤーを追加

* Update LED設定を調整

* New Jones v.0.2を新規追加

* Update Numレイヤー追加。キーマップ調整。レイヤーインジケータLED調整。

* Update 左手Yをやめる

* Update ESCによるNumレイヤートグルを、ESC連打でトグルするのを防止するため、ダブルタップからトリプルタップへ変更。

* Update readme

* Update QMKの標準に従うよう各ファイルの内容を変更。

* Update 長音(ー)を入力しやすくするため、レイヤー上でホームポジションに近い位置に配置。

* Update タップダンスの状態判別を、Single,Double,Triple,Holdの4つのステータスにまとめた。

* Update キーボードの電源が切れてもデフォルトレイヤーの状態を保存しておくため、MACとWINレイヤーへの変更はEEPROMへ書き込むようにした。

* Update 不要箇所削除

* Update キーマップをNarrowとWideで書き換えるのが不便なので、分割した。

* Update 最新のPCBに合わせ、デフォルトをv.0.2に変更。

* New v.0.3を新規追加

* Update キーマトリクスに後からJPを追加するため、ANSI用に表記変更。

* Update ANSI用のキーマップであることを明記。

* New JP用キーマップを新規追加。

* Update スイッチの物理的存在、Enter右側はキー1個、に合わせて、ANSIレイアウトを修正。

* New FA (Full Armor)用レイアウトを新規追加

* Update 物理的ロック付きのCAPSは使用しないため、無効化。

* Update ハードウェアのサポート対象にキープレートを追加。

* Update FAで使用するAudio、RotaryEncoderの機能追加。機能削減でファームウェアサイズ縮小。

* Update オーディオ機能にキークリックを追加。

* update FA用設定

* Update 右シフトにキー追加

* Update 変換キー調整

* New オーディを有効化。マウスキーはサイズ削減のため無効化。

* Update スイッチ配置ミス修正。

* Update ピン定義を、ロータリーエンコーダの回転方向に合わせた

* Update 2音同時発音用にピン定義を追加。

* Update ファームサイズに空きがあるので、クリッキー音をデフォルトで利用できるようにした。

* Update LED設定変更

* New 物理配列がJPで、中身はUS配列のキーマップを追加。

* Update 行と列が入り乱れたレイアウトのため、音階が正しくなるように、Music-Mode用のキーマップを定義。

* Change マイナーバージョンの表記に対応できるよう、DEVICE_VERの桁を1つ上げた。

* Update オルソ+ロースタガであることがわかるように、キーボードの簡単な説明を変更。

* New v.0.3.1の初期コミット

* Update 左右で回転方向の判定が逆になるので、右手側を左手に合わせた。

* Update キーマップ調整

* Update LEDインジケータを、v.0.3系と同じ点灯方法(2個をベースレイヤ、1個をRAISEなど)に変更。

* Update RGBLIGHT明るさ調整、エフェクト追加。

* Update 未使用キー設定を削除。

* Update Shiftと組み合わせた/?キーの反応を良くするため、キーごとにTAPPING_TERMを指定できるようにした。

* Update LEDエフェクト追加

* Update keymap

* Update 未使用のものを削除

* Update LEDの物理的接続とQMKのソフト的接続を調整し、左→アンダーグロー→右と繋がるようにした。

* Update レイヤーインジケータ関連変数を、#ifdefブロック内へ移動。

* Update コード整形

* Revert "Update コード整形"

This reverts commit c98483d9a0b41f8939a01b677cdcd18a8af34f78.

* Update 未使用のキーコード、S_SLSHに関連するコードを削除。

* Update コード整形

* Update キーごとのTappingTerm設定を使用しなくなったため、削除。

* Update 未使用コード削除。

* Update コメント追加

* Update レイヤーとIMEのON/OFFを同じキーに割り当てるのをやめたため、関連コードを削除。

* Update コメント追加

* Update コメント

* Update 誤読を避けるため、ifブロックの表記を括弧を使用したものへ変更。動作に変化なし。

* Update 未使用のため削除。

* Update LED関連でデフォルトレイヤーを格納して使用しないため、削除。

* Update コメント

* Update レイヤーによってロータリーエンコーダの動作を変える機能を追加。

* Update comment

* Update 実態に合わせて修正。

* Update JP用キーコードへの書き換え忘れを修正。

* New v.0.3.1 JP style

* Update v.0.3のJPスタイルではオーディオサポートなし。

* Update to latest information

* New

* New keyboard "stmeishi"

* Update layout name

* Update move common settings from keymap's "rules.mk" to keyboard's "rules.mk".

* Update: Move common settings from keymap's "rules.mk" to keyboard's "rules.mk".

* Update: Add "LAYOUT_all" for multiple layout.

* Update target to latest "v.0.3.1".

* Remove unused item.

* Update comments.

* Update Rotary Encoder pins to actual used count.

* Update increase value to maximum.

* Update comments.

* Change default Effects.

* Remove unused items.

* Update comment.

* Change: Use define and function insted of real value for wait.

* Update copyrght.

* Update Update: Add "LAYOUT_all" for multiple layout.

* New: Place info.json copied from v.0.3.1.

* Remove unused items.

* Update: Add comma at last element.

* Update comments.

* Update: change if block style.

* Update: Change Japanese comments to English.

* Update: Change layout name.

* Update: Change layout name.

* Update: Fix miss numbering for ANSI layout.

* Update: Move "Tap Dance" rule to keymap's rule.

* New: Add default keymap.

* Delete: Moving files to branch.

* Initial: Add files from local.

* Remove local only unused keymaps.

* Update: Remove unused, comment outed codes.

* Add default keymap for v.0.3.

* Update: Add custom keycodes.

* Update: Change layer handling from process_record_user to layer_state_set_user.

* Update comment.

* Update: Remove unused function.

* Revert "Remove: Non related files."

This reverts commit 82306568fad408427c757de832025dee91ca5a7f.

* Update: To resolve "submodule path not found" message.

* RemoRemove: Non related files.

* Revert file before miss comit.

* Update: Remove unused keycode.

* Update: レイアウト設定内のNUMレイヤへのトグルを、カスタムキーコード表記に変更。

* Update: Comment

* Update: Remove unused items.

* Update layout settings.

* Update: For simplicity, change toggle ADJUST layer method from process_record_user() to layer_state_set_user().

* Update: comment and styling.

* Update: Remove unused custom keycodes.

* Update: For simplicity, change toggle layer method from process_record_user() to layer_state_set_user().

* Update: Remove unused items.

* Update: comment and styling.

* Update: Correct comment.

* Update description and flashing example.

* Update: Remove comment-outed bootloaders.

* Update comments.

* Update: Correct LED count, without under-glow.

* Update: Chenged to common values with v.0.3.1.

* Update: Changed to common values with v.0.3.

* Updarte: Remove unused layout.

* Update: Change default layout to "ALL".

* Update comment.

* Update comment.

* Add missing file.

* Update: Change build option definition style.

* Update: Change build option definition style.

* Update: Change CUSTOM_MATRIX to "lite" and convert "matrix.c" to "lite" version.

* Update: Move "music_map" to keyboard's c file.

To provide common definition for other keymap creator.

* Update: Change keyboard name "v.0.3.1" ---> "v03_1".

For human readability, version name "v.0.3.1" remains at title on "readme.md".

* Update: Change keyboard name "v.0.3" ---> "v03".

For human readability, version name "v.0.3" remains at title on "readme.md".

* Update: Correct matrix definition at "k92".

* Apply suggestions from code review

Remove unnecessary comment block.

* Apply suggestions from code review

Remove "Optional" deprecated items.

* Apply suggestions from code review

Change "make" target keymap to standard default.

* Apply suggestions from code review

Remove rules for MIDI_ENABLE, FAUXCLICKY_ENABLE and HD44780_ENABLE.
These features are not enabled.

* Apply suggestions from code review

Convert tabs to spaces.

* Update: Change #define ROW_SHIFTER to keyboard specific.
2021-01-24 13:54:29 -08:00
QMK Bot
949fb1a91c Merge remote-tracking branch 'origin/master' into develop 2021-01-24 15:47:08 +00:00
Mohammad Juma
eda8c94c60
[Keymap] addition for mjuma in keyboards/planck/keymaps (#10885)
* Add planck layout

* switch gaming toggle to TG

* rename readme
2021-01-24 07:46:37 -08:00
QMK Bot
bf09a94fdf Merge remote-tracking branch 'origin/master' into develop 2021-01-24 15:04:16 +00:00
Vinam Arora
829075ffef
Increased dynamic keymap layers in via keymap (#11575) 2021-01-24 15:03:34 +00:00
QMK Bot
d44e3dc021 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 14:57:58 +00:00
Damien
8ab6efdc80
Fix preonic layout documentation (#11655)
* [Apple M5120] First iteration

* Cleaned apple_m5120 files

* Changes requested by PR

* Update keyboards/apple_m5120/iso/rules.mk

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

* Update keyboards/apple_m5120/iso/keymaps/default/keymap.c

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

* Updated Preonic default layout doc

* Removed non related files

Co-authored-by: dbroqua <dbroqua@mousur.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-24 14:57:22 +00:00
QMK Bot
95ecd4e1d2 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 14:52:27 +00:00
Anand
5d0cc13fcf
Add VIA support for dm9records/tartan (#11666) 2021-01-24 14:52:11 +00:00
QMK Bot
b96db514f6 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 00:16:50 +00:00
Alabahuy
29c9c6bf56
Fix number RGB RART4x4 dan matrix pin RART45 (#11582)
* Update config.h

* Update config.h
2021-01-23 16:16:24 -08:00
QMK Bot
30561a8de5 Merge remote-tracking branch 'origin/master' into develop 2021-01-24 00:00:06 +00:00
David Dejaeghere
78693dfa31
[Keyboard] adding support for new keyboard Dawn (#11564)
* initial commit Dawn keyboard

* fixing some matrix

* final tweaks to keymaps and info.json layout

* fix info.json missing delimiter

* missing elements in info.json layout, resolved through lint

* fixed missing link image in readme

* Update keyboards/mechstudio/dawn/readme.md

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

Co-authored-by: David <david@tarpit.be>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-23 15:59:15 -08:00
QMK Bot
1cdea7f530 Merge remote-tracking branch 'origin/master' into develop 2021-01-23 17:32:40 +00:00
Kyle McCreery
05a4583ce8
[Keymap] Adding Fancy and Bongocat Keymap to Mercutio Keyboard (#11520)
* Initial commit on new clean branch. Testing out functionality of oled and encoder for default features.

* Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly.

* Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR.

* Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies.

* Initial commit of branch specifically for implementing the more complicated fancy keymap as I expect the main PR to be approved first.

* testing bongo cat out

* Progress with intended OLED behavior. Needs to be cleaned up still.

* Cleaned up bongocat and added WPM display on it.

* Almost there. Need to rethink the layer checking in encoder.

* Fixing all the merge issues I didn't check before doing the last commit. Learn from my mistakes, check your commits.

* Fixed and updated fancy firmware and bongocat firmware.

* Updating license year since I will be doing a PR anyway.

* Update keyboards/mechwild/mercutio/keymaps/fancy/keymap.c

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-23 09:32:10 -08:00
QMK Bot
5a7ad4cb2d Merge remote-tracking branch 'origin/master' into develop 2021-01-23 03:24:06 +00:00
Ryan
7d774fa1dc
Infinity60 refactor (#11650) 2021-01-23 14:23:38 +11:00
QMK Bot
08b37a58bb Merge remote-tracking branch 'origin/master' into develop 2021-01-23 02:03:09 +00:00
James Young
3a7573436a
Program Yoink! refactor (#11636)
* split config.h for each variant

* split rules.mk for each variant

* split source and header files for each variant

* move keymaps to the appropriate variant

* update keyboard readme

* update keymap readmes

* differentiate Staggered and Ortho USB Device Strings

* clean up formatting in info.json

* split info.json files for each variant

* break up the info.json for readability

* correct key positioning and board dimensions

* correct key object sequences

* add weak encoder function to keyboard level

Allows Configurator-compiled firmware to have encoder functionality.

* add variant-specific readme files and bootloader instructions
2021-01-22 18:02:40 -08:00
Joel Challis
a07c2a1377
Remove QMK_KEYBOARD_CONFIG_H (#11576) 2021-01-22 19:32:10 +00:00
QMK Bot
397e8e461f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 17:11:22 +00:00
James Young
7e77c2361f
Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO (#11657)
* Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO

* update readme formatting
2021-01-22 09:10:52 -08:00
QMK Bot
f52baa4bc1 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:49:05 +00:00
Ryan
188c0bacb0
Woodpad refactor (#11651) 2021-01-23 03:48:27 +11:00
QMK Bot
1c3ec3a91f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:38:26 +00:00
James Young
a7d79f4c00
[Keyboard] Pinky refactor (#11643)
* QMK Configurator layout support for Pinky

3-row and 4-row versions

* refactor default keymaps

- use an enum for layer names
- remove redundant definitions
- qmk cformat pass
- modify pinky/4 via keymap to mirror pinky/4 default functionality

* remove LAYOUT_kc macros

This usage is not endorsed by QMK as it has been found to be confusing to novice users.

* add VIA support to pinky/3

* update config.h files

Removes unnecessary definitions for Backlight, RGB Underglow, Magic config and MIDI.

* update main rules.mk file

Updates the rules.mk file to match the formatting of the current QMK-provided template. Removes sample bootloader comments, feature rules that are no longer included in the template, and updates the in-line comments.

* update and split keyboard readme

Updates the main readme file's formatting, adds instructions to access bootloader mode, and adds more specific readmes for each version.

* add line breaks between rows in the info.json files

* rename layout macros for Community Layout forward compatibility

The layouts of the Pinky3 and Pinky4 aren't currently Community Layouts, but support for them could be added with a rules.mk edit should the layouts be added to QMK.
2021-01-22 08:37:36 -08:00
QMK Bot
20ef2aa57f Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:32:28 +00:00
Eithan Shavit
3b663ee495
[Keymap] Breeze keymap eithanshavit (#11640)
Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-01-22 08:31:53 -08:00
QMK Bot
b58d164504 Merge remote-tracking branch 'origin/master' into develop 2021-01-22 16:23:41 +00:00
Drashna Jaelre
7a08b9d374
[Keymap] Cleanup and updating of drashna keymap code (#11516)
* Update other keyboards for rgb matrix changes

* Remove customized bootmagic code

* Fix corne layout compilation error

* Fix compiler errors with all keymaps

* Add Simple Visualizer for ergodox infinity

* Fix compile issue with Corne

* Fix keymap stuff

* Add alias for mouse layer

* Add Halmak Keyboard layout

* Updates for Kyria

* Add support for oled interval

* Change RGB stuff

[CHANGE] Fix coexistence issues

* Fix rgb_stuff

* Add custom ploopyco mouse keymap

* Decrease default dwell time

* Updates based on last breaking changes update

* Disable command on dactyl

* Update ergodox to use proper commands for rgb matrix indicators

* Update all rgb matrix indicator functions

* Update rules for dactyl-manuform

* Reduce wait time for mouse layer off event

* Add more info to logger

* Add wrappers for get_tapping term

* Move version.h include into only file that actually needs it

* Update rgb sleep stuff

* Update key print function

* Change DM keymap settings

* Change pin for DM Manuform

* Add Proton C stuff for Corne keymap

* more arm corne tinkering

* Even more arm stuff for corne

* Cleanup corne stuff

* redirect default keymap to drashna

because I am a very bad man

* change corne rgb priority

* Update tractyl manuform to not conflict

* Add more secret stuff

* more dactyl tweaks

* Add more options to split transport

* Changes of oled support

* Change split settings

* Improve keylogger formatting more

* tweak oled stuff

* Oled and such tweaks

* Reduce brightness due to leds

* Decrease brightness more

* Only run layer code if master
2021-01-22 08:23:03 -08:00
QMK Bot
37ebbe8d9e Merge remote-tracking branch 'origin/master' into develop 2021-01-22 02:27:36 +00:00
James Young
c16a3dcb54
Isometria 75: Configurator/CLI fixes (#11612)
* info.json: human-friendly formatting

* info.json: update key object labels

Some of the characters in the original file don't play nicely with `qmk info -l` on Windows.

* info.json: correct key object order
2021-01-21 18:27:05 -08:00
QMK Bot
e4ff5eb3eb Merge remote-tracking branch 'origin/master' into develop 2021-01-21 22:23:58 +00:00
Danny
71d8e72b80
Add 3rd encoder to VIA keymap (#11580) 2021-01-21 17:23:27 -05:00
QMK Bot
aa73ba7a67 Merge remote-tracking branch 'origin/master' into develop 2021-01-21 21:05:55 +00:00
jakobkg
c03ad0f802
Remove rules.mk in leafcutterlabs/bigknob:default (#11652) 2021-01-21 21:05:19 +00:00
QMK Bot
344f61f247 Merge remote-tracking branch 'origin/master' into develop 2021-01-21 15:35:05 +00:00
mtei
b79ee92a12 update CI list about helix keyboards
* exclude 'helix/rev3_4rows' from CI
  Since helix/rev3_4rows is almost the same as helix/rev3_5rows, there is no point in checking with travis-ci.

* include 'helix/pico/back' to CI
  helix pico and helix rev2 are still available. I would like to check both by travis-ci, but here I will add a check only for helix pico.
2021-01-21 07:34:00 -08:00
Nick Brassel
bdb757e189
ChibiOS conf migrations... take 11 (#11646)
* Allow forcing re-migration.

* ChibiOS conf upgrade for acheron/arctic

 acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368

* ChibiOS conf upgrade for acheron/austin

 acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7

* ChibiOS conf upgrade for acheron/keebspcb

 acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4

* ChibiOS conf upgrade for acheron/lasgweloth

 acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581

* ChibiOS conf upgrade for aeboards/ext65/rev2

 aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87

* ChibiOS conf upgrade for ai03/vega

 ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80

* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7

* ChibiOS conf upgrade for at_at/660m

 at_at/660m - 9999583e8bec2772046132a22818482d24e18c84

* ChibiOS conf upgrade for box75

 box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e

* ChibiOS conf upgrade for bt66tech/bt66tech60

 bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454

* ChibiOS conf upgrade for cannonkeys/an_c

 cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f

* ChibiOS conf upgrade for cannonkeys/atlas

 cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743

* ChibiOS conf upgrade for cannonkeys/chimera65

 cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5

* ChibiOS conf upgrade for cannonkeys/db60

 cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09

* ChibiOS conf upgrade for cannonkeys/devastatingtkl

 cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2

* ChibiOS conf upgrade for cannonkeys/instant60

 cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4

* ChibiOS conf upgrade for cannonkeys/instant65

 cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda

* ChibiOS conf upgrade for cannonkeys/iron165

 cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03

* ChibiOS conf upgrade for cannonkeys/obliterated75

 cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc

* ChibiOS conf upgrade for cannonkeys/onyx

 cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e

* ChibiOS conf upgrade for cannonkeys/ortho48

 cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1

* ChibiOS conf upgrade for cannonkeys/ortho60

 cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc

* ChibiOS conf upgrade for cannonkeys/ortho75

 cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647

* ChibiOS conf upgrade for cannonkeys/practice60

 cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5

* ChibiOS conf upgrade for cannonkeys/practice65

 cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c

* ChibiOS conf upgrade for cannonkeys/rekt1800

 cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf

* ChibiOS conf upgrade for cannonkeys/sagittarius

 cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9

* ChibiOS conf upgrade for cannonkeys/satisfaction75

 cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a

* ChibiOS conf upgrade for cannonkeys/savage65

 cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4

* ChibiOS conf upgrade for cannonkeys/tmov2

 cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778

* ChibiOS conf upgrade for cannonkeys/tsukuyomi

 cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d

* ChibiOS conf upgrade for cheshire/curiosity

 cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a

* ChibiOS conf upgrade for coarse/cordillera

 coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093

* ChibiOS conf upgrade for converter/siemens_tastatur

 converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4

* ChibiOS conf upgrade for cutie_club/borsdorf

 cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7

* ChibiOS conf upgrade for dekunukem/duckypad

 dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2

* ChibiOS conf upgrade for ebastler/isometria_75/rev1

 ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0

* ChibiOS conf upgrade for ergodox_infinity

 ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964

* ChibiOS conf upgrade for function96

 function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2

* ChibiOS conf upgrade for geekboards/macropad_v2

 geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18

* ChibiOS conf upgrade for generic_panda/panda65_01

 generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458

* ChibiOS conf upgrade for handwired/ck4x4

 handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7

* ChibiOS conf upgrade for handwired/onekey/blackpill_f401

 handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d

* ChibiOS conf upgrade for handwired/onekey/blackpill_f411

 handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30

* ChibiOS conf upgrade for handwired/onekey/bluepill

 handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a

* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco

 handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099

* ChibiOS conf upgrade for handwired/onekey/teensy_32

 handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c

* ChibiOS conf upgrade for handwired/onekey/teensy_lc

 handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05

* ChibiOS conf upgrade for handwired/pill60/blackpill_f401

 handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8

* ChibiOS conf upgrade for handwired/pill60/blackpill_f411

 handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51

* ChibiOS conf upgrade for handwired/pill60/bluepill

 handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3

* ChibiOS conf upgrade for handwired/riblee_f401

 handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b

* ChibiOS conf upgrade for handwired/riblee_f411

 handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013

* ChibiOS conf upgrade for handwired/sono1

 handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a

* ChibiOS conf upgrade for handwired/t111

 handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c

* ChibiOS conf upgrade for handwired/twadlee/tp69

 handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158

* ChibiOS conf upgrade for handwired/z150

 handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb

* ChibiOS conf upgrade for hub20

 hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e

* ChibiOS conf upgrade for iron180

 iron180 - 5efb6f21c848b3c964795d9debddceac7628933d

* ChibiOS conf upgrade for jm60

 jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299

* ChibiOS conf upgrade for keebio/bdn9/rev2

 keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d

* ChibiOS conf upgrade for keebio/choconum

 keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f

* ChibiOS conf upgrade for misterknife/knife66

 misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699

* ChibiOS conf upgrade for misterknife/knife66_iso

 misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70

* ChibiOS conf upgrade for nebula12

 nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610

* ChibiOS conf upgrade for nemui

 nemui - 4030faa372512f766fd747876cb28176302453f9

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918

* ChibiOS conf upgrade for nightingale_studios/hailey

 nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be

* ChibiOS conf upgrade for planck/rev6

 planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10

* ChibiOS conf upgrade for primekb/meridian

 primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50

* ChibiOS conf upgrade for projectkb/alice

 projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc

* ChibiOS conf upgrade for projectkb/signature87

 projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d

* ChibiOS conf upgrade for ramonimbao/squishy65

 ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53

* ChibiOS conf upgrade for ramonimbao/wete

 ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00

* ChibiOS conf upgrade for rart/rartlice

 rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0

* ChibiOS conf upgrade for retro_75

 retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91

* ChibiOS conf upgrade for rocketboard_16

 rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54

* ChibiOS conf upgrade for satt/vision

 satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a

* ChibiOS conf upgrade for technika

 technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2

* ChibiOS conf upgrade for tkc/godspeed75

 tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6

* ChibiOS conf upgrade for tkw/stoutgat/v2/f411

 tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426

* ChibiOS conf upgrade for viktus/styrka

 viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60

* ChibiOS conf upgrade for westfoxtrot/prophet

 westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b

* ChibiOS conf upgrade for whitefox

 whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c

* ChibiOS conf upgrade for wolfmarkclub/wm1

 wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4

* ChibiOS conf upgrade for xelus/kangaroo

 xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e

* ChibiOS conf upgrade for xelus/trinityxttkl

 xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79

* ChibiOS conf upgrade for xelus/valor_frl_tkl

 xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c

* ChibiOS conf upgrade for zoo/wampus

 zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a

* ChibiOS conf upgrade for zvecr/split_blackpill

 zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
2021-01-21 17:00:53 +11:00
QMK Bot
34b88a2fd4 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:33:12 +00:00
datafx
1328ab7c7d
Correct LED physical mapping on monstargear xo87 rgb pcb (#11629)
* corrected LED physical mapping

* Corrected issue that made VIA display layer 1 incorrectly

Co-authored-by: datafx <digitalfx@phreak.tech>
2021-01-19 23:32:39 -08:00
QMK Bot
b1e6f1b7e0 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 07:27:33 +00:00
James Young
9a070475ef
Handwired ASkeyboard Sono1: Configurator fixes (#11625)
* info.json: human-friendly formatting

* info.json: correct key order
2021-01-19 23:27:04 -08:00
QMK Bot
ef3bd54a17 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 05:07:32 +00:00
LSChyi
eacb596d8b
[Keyboard] Add indicator LED support to playkbtw/helen80 (#11560)
* add indicator led support

* use LED config instead
2021-01-19 21:06:35 -08:00
QMK Bot
87d9534d81 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:15:12 +00:00
X-Bows Tech
1bb9f155a6
[Keyboard] Update X-Bows Nature Keyboard (#11538)
* Update config.h

* Update nature.c

* Update rules.mk

* Update keymap.c
2021-01-19 19:14:39 -08:00
Raphael Megzari
6db22011a5
[Keymap] add happysalada (#11535)
* add keymap: happysalada

* use enum instead of define

* remove uneeded config file
2021-01-19 19:14:16 -08:00
QMK Bot
1ab1ba3c3e Merge remote-tracking branch 'origin/master' into develop 2021-01-20 03:05:53 +00:00
Aaron Ireland
45bec2d281
[Keymap] Mac-friendly KBD 75% layouts (#11507)
* Add Aaron's KBD75 v2 for Macbook

* Add Colemak & Dvorak layers

* Update keymap to adhere to style guide and add license

* Rename README.md to readme.md
2021-01-19 19:05:23 -08:00
QMK Bot
a9dee31362 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:52:01 +00:00
Craig Gardner
d28d474dc0
[Keyboard] Leafcutterlabs (#11464)
* add support for bigknob

Add support for bigknob macropad

* corrected files

* Apply suggestions from code review

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

* corrected tap dance

* Update config.h

* correct image link

* Apply suggestions from code review

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

* added GPL headers

* Update readme.md

* update rules to disable tap dance

* remove tap dance

* Update rules.mk

trying to get to pass travis test

* Update rules.mk

remove tap dance

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:51:33 -08:00
QMK Bot
0857321317 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 02:05:38 +00:00
MesaKeyboards
974d3f1ffd
[Keyboard] Add Mesa TKL (#11294)
* Add keyboard: Mesa TKL

* Fix image link in readme

* Update keyboards/mesa/mesa_tkl/mesa_tkl.c

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

* Update keyboards/mesa/mesa_tkl/rules.mk

White space changes

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

* Replace tabs with spaces per C coding conventions.

* Update keyboards/mesa/mesa_tkl/readme.md

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:05:08 -08:00
QMK Bot
1bc8e785bf Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:47:32 +00:00
melonbred
e6a90c8b04
Update info.json - Program Yoink (#11558)
* Update info.json

Fix ortho_split
2021-01-19 17:47:02 -08:00
QMK Bot
b9ddccf035 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:42:07 +00:00
Ryan
2cdc3699e1
Remove DESCRIPTION, W-Z (#11633) 2021-01-20 12:41:34 +11:00
QMK Bot
36784a99a9 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 01:41:10 +00:00
Ryan
e0ed2c950d
Remove DESCRIPTION, R-V (#11632) 2021-01-20 12:40:35 +11:00
QMK Bot
d5ab40aa60 Merge remote-tracking branch 'origin/master' into develop 2021-01-20 00:58:19 +00:00
Ryan
4ed67d666e
Remove DESCRIPTION, N-Q (#11631) 2021-01-20 11:57:45 +11:00
Nick Brassel
9e18f41fcf Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 10:00:28 +11:00
Ryan
1e1b469fa2
Remove DESCRIPTION, K-M (#11619) 2021-01-20 09:56:41 +11:00
Nick Brassel
78fe155b72
Fix up comments showing how to execute config migration. (#11621) 2021-01-20 02:19:36 +11:00
Nick Brassel
3b1ffd2ede
ChibiOS enable memory allocations (#11620) 2021-01-19 14:50:51 +00:00
Ryan
62f304a225
Remove DESCRIPTION, H-J (#11616) 2021-01-20 00:38:12 +11:00
Nick Brassel
19c180ef88
ChibiOS conf migrations... take 10 (#11617)
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for chavdai40

 chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8
 chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad

* ChibiOS conf upgrade for jm60

 jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
2021-01-20 00:35:24 +11:00
Nick Brassel
d85b27bbbc
Leftover early initialisation conversions (#11615)
* jm60

* ergodox_stm32

* F042 bootloader jumps.

* xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.

* matrix/m20add, matrix/noah
2021-01-20 00:23:07 +11:00
Nick Brassel
d668fd3977 Merge remote-tracking branch 'upstream/master' into develop 2021-01-20 00:18:11 +11:00
Glen D'souza
d24fe4f1ca
GCC 10 compatibility for Ploopy optical encoder (#11586) 2021-01-19 13:23:54 +11:00
CMMS-Freather
677789df77
change to cmm.studio saka68 folder. split to solder and hotswap, add hotswap fimware (#11443)
* new repo: create cmm.studio folder, add saka qmk firmware

new folder for cmm.studio line up keyboard
added saka68 keyboard qmk and via firmware support

* Update keyboards/cmm.studio/saka68/config.h

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

* Update keyboards/cmm.studio/saka68/rules.mk

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

* Update keyboards/cmm.studio/saka68/keymaps/via/rules.mk

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

* Update keyboards/cmm.studio/saka68/config.h

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

* fix on keymap, readme

fix on keymap, readme

* Update keyboards/cmm.studio/saka68/readme.md

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

* Update keyboards/cmm.studio/saka68/keymaps/default/keymap.c

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

* update vendor name with _ instead of .

update vendor name with _ instead of .

* Update readme.md

change the make format

* Update keyboards/cmm_studio/saka68/keymaps/default/keymap.c

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

* deleted some files from cmm.studio, changes to cmm_studio

deleted some files from cmm.studio, changes to cmm_studio

* Update readme.md

make command changed

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added pic for pcb

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/config.h

tested and does work now. deleting these lines

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

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/cmm_studio/saka68/readme.md

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

* Update readme.md

added use physical reset button instruction

* change to the cmm saka folder

making the changes to cmm saka firmware

seperated solder version firmware and hotswap version firmware

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* change to the cmm saka hotswap folder

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 13:23:13 +11:00
QMK Bot
6b0ed6a29b Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:12:14 +00:00
Benjamin Garcia
1dc466d22b
New keymaps with KC_LGUI on another key and scroll with encoder (#11479)
* feat(kyria): new keymaps with KC_LGUI on another key

add also possibility to scroll with encoder and finally play with olded
screen to replace default kyria logo by Magic the Gathering mana color
icon.

* Update keyboards/kyria/keymaps/benji/keymap.c

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

* add magic logo

* add mouse button

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-19 13:11:45 +11:00
QMK Bot
732e80e3fe Merge remote-tracking branch 'origin/master' into develop 2021-01-19 02:09:28 +00:00
James Young
01bc8e3b52
Cannonkeys Onyx: Configurator/QMK CLI improvements (#11603)
* info.json: human-friendly formatting

* info.json: correct key object order

* info.json: replace Unicode characters

They don't play nice with `qmk info -l`.

* info.json: correct keyboard dimensions
2021-01-19 13:08:57 +11:00
QMK Bot
2f18993905 Merge remote-tracking branch 'origin/master' into develop 2021-01-19 01:22:57 +00:00
James Young
dfb8a29718
Caps Unlocked CU65 layout macro fixes (#11606) 2021-01-19 12:22:26 +11:00
Nick Brassel
94746b6557
Fixup builds on develop branch. (#11600) 2021-01-19 12:18:57 +11:00
QMK Bot
814c4cb56d Merge remote-tracking branch 'origin/master' into develop 2021-01-18 18:59:13 +00:00
datafx
3bb1897bdc
[Keyboard] Monstargear XO87 RGB Hot-Swap PCB (#11555)
* Support for Monstargear XO87 Hot-Swap PCB

* Remove manufacturer from product line

* Removed alternate bootloaders

* Updated info.json

* Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h

* Delete kb.h

* Update rgb.h

* Update rules.mk

* Add files via upload

* Delete kb.h

* Update keymap.c

* Update config.h

* Update rgb.c

* Add via RGB support

* Update info.json

* Update readme.md

* Update readme.md

* Update config.h

* Update rgb.h

* Update config.h

* Mirror factory layout

* Mirror factory layout

* Update rgb.h

* Update keyboards/xo87/rgb/rgb.c

* Update rgb.c

* Update keyboards/xo87/rgb/config.h

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/keymaps/via/keymap.c

* Update config.h

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/readme.md

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* Update keyboards/xo87/rgb/rules.mk

* remove deprecated action_get_macro()

* rearrange layout per request

* rearrange layout per request

* Update keyboards/xo87/rgb/rgb.h

* Update keyboards/xo87/rgb/keymaps/default/readme.md

* Update keyboards/xo87/rgb/readme.md

* Bugfix for RGB Matrix

* Bugfix for RGB Matrix

* Moved to new subdirectory and updated build commands to reflect changes

* Remove old files
2021-01-18 10:58:09 -08:00
QMK Bot
ffaaadc270 Merge remote-tracking branch 'origin/master' into develop 2021-01-18 12:47:01 +00:00
James Young
03bacec87d
Naked64 Configurator update and rework (#11568) 2021-01-18 23:45:56 +11:00
Nick Brassel
e0e67df933
ChibiOS conf migrations... take 9 (#11598)
* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f

* ChibiOS conf upgrade for jm60

 jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18 13:16:59 +11:00
QMK Bot
82a875056c Merge remote-tracking branch 'origin/master' into develop 2021-01-18 01:50:00 +00:00
Ryan
cc3f2e2865
Remove DESCRIPTION, E-G (#11574) 2021-01-18 12:49:25 +11:00
QMK Bot
98b1cccd12 Merge remote-tracking branch 'origin/master' into develop 2021-01-17 17:04:28 +00:00
nibiria
f0f6174136
[Keyboard] add Stream15 keyboard (#11515)
* add keyboard Stream15

* committted changes as suggested by drashna

* committed further changes as suggested

* Update info.json

removed excessive comma

* Update keyboards/nibiria/stream15/rules.mk

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

* Update keyboards/nibiria/stream15/keymaps/via/rules.mk

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

* Update keyboards/nibiria/stream15/readme.md

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

* resolved 2 more issues

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-17 09:03:53 -08:00
Nick Brassel
f08a11fad3
ChibiOS conf upgrade for hub20 (#11588)
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
2021-01-17 13:53:03 +00:00
QMK Bot
f35b1127fa Merge remote-tracking branch 'origin/master' into develop 2021-01-15 21:50:23 +00:00
ridingqwerty
c628408688
New Keyboard: walletburner/cajal (#10458)
* adding alpha variants

* adding cajal layouts

* adding V2 PCB support

adding additional layouts for new PCB version, and correecting incorrect image in info file

* Cleanup master -- remove alpha9

* Cleanup master -- remove g4m3ralpha

* Cleanup master -- remove cajal & sl40

* Master cleanup -- re-add sl40

* Master cleanup -- correct SL40 image

* New Keyboard: walletburner/cajal

* Added license attribution to *.{c,h} files

* Update keyboards/walletburner/cajal/config.h

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

* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c

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

* Rename 'ortho' keymap to 'default_ortho'

* Update keyboards/walletburner/cajal/cajal.c

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

* Update readme.md

Adding bootloader instructions.

Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-15 16:49:49 -05:00
QMK Bot
6525551357 Merge remote-tracking branch 'origin/master' into develop 2021-01-15 20:41:00 +00:00
Peter Peterson
fe14907039
Adds VIA support for the KPRepublic's BM60 Poker (#11267)
* WIP working on new keymap

* tweaking keymap

* updated keymap

* cleaned up a little bit

* New preonic keymap

* my preonic keymap

* added mac layout

* preonic map update

* cleaning up old repo

* cleaning up to match upstream

* more cleanup

* removing old keymaps

* cleaned up commit history for bm60poker via support

* cleaned up via keymap

* fixed copywrite

Co-authored-by: Peter Peterson <ppeterson@noao.edu>
2021-01-15 15:40:26 -05:00
QMK Bot
fef4ed568e Merge remote-tracking branch 'origin/master' into develop 2021-01-15 08:26:36 +00:00
James Young
d72f5435fb
Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)
* human-friendly formatting

* correct key order
2021-01-15 00:25:50 -08:00
fauxpark
ca7da3866d Merge remote-tracking branch 'upstream/master' into develop 2021-01-15 18:34:12 +11:00
James Young
8cf5f72aad
Cutie Club Borsdorf: Configurator key sequence fix (#11549)
* human-friendly formatting

* correct key order (ISO Enter)
2021-01-14 23:26:30 -08:00
Ohashi
6009a91514
[Keyboard] Add cool836A 1_2 (#11467)
* 1st trial on 1_2

* remove keymaps/default/km_default.c

* fix cool836A.h

* fix keymap.c into 3x12

* rename to cool836a (not 'A')

* remove cool836A (not a)

* remove backslashes at keymap.c

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

* update keymap.c (add licence)

* Update keyboards/cool836a/keymaps/default/readme.md

removed "<br>" in line 2

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

* Update keyboards/cool836a/keymaps/default/readme.md

remove "<br>" in line 4

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

* Update keyboards/cool836a/keymaps/default/readme.md

remove "<br>" in line 8

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

* Update keyboards/cool836a/cool836a.h

remove cool836a.h line 30:36

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 22:27:21 -08:00
Andy
f1b06d0ae7
[Keymap] Adds ymdk/ymd09 andys8 layout (#11320)
Custom layout for macropad. It shows the usage of macros with unicode,
and other layouts (ISO-DE) with unicode, emojis, and git commands.
2021-01-14 11:29:22 -08:00
Domantas
e9f73e5454
[Keymap] Add domnantas lily58 keymap (#10910)
* Initialize domnantas layout

* Update oled status display

* Layout and oled changes

* Updates to keymap

* Add F keys and page moves

* Add media keys, rearrange home and end

* Add instructions

* Swap backspace and enter

* Remove unnecesary Enter keymap

* - Change display timeout
- Update minus sign to work on both English and Lithuanian layouts

* Add copyright header

* Replace static strings with PSTR

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

* Update keyboards/lily58/keymaps/domnantas/keymap.c

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

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

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 11:04:30 -08:00
Ryan
f325bd6eb2
Remove DESCRIPTION, B-D (#11513) 2021-01-15 05:00:04 +11:00
QMK Bot
4b44452900 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 16:58:07 +00:00
Nick Blyumberg
3525a61baf
Updated documentation for new BDN9 board revisions (#11380)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
2021-01-14 11:57:30 -05:00
QMK Bot
749d9f2227 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:08:25 +00:00
Joshua Diamond
c46619d8fb
[Keyboard] eliminate nested layout warnings in kbd75 (#11540) 2021-01-13 23:07:47 -08:00
QMK Bot
a668640a3f Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:03:47 +00:00
melonbred
b323ab89e0
[Keyboard] Added Ortho support to Program Yoink kb (#11534)
* Added Ortho support

* Updated JSON
2021-01-13 23:03:12 -08:00
QMK Bot
18ae86faf5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 07:01:48 +00:00
J.Flanagan
1f633c027b
[Keyboard] Add VIA support for CA66 (#11522)
* Add VIA support

made changes to add VIA support for the CA66

- added VIA keymap.c, readme.md, rules.mk
- changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no)
- changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK)

* Minor changes to CA66 for VIA support

edited keymap info
enabled backlight

* Update vendorID

Change to vendorID to remove conflict with previously chosen vendorID already in use

* Update keyboards/playkbtw/ca66/rules.mk

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

* Update keyboards/playkbtw/ca66/keymaps/via/readme.md

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

* Update keyboards/playkbtw/ca66/keymaps/via/keymap.c

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

Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-13 23:01:14 -08:00
QMK Bot
15f0fa85c9 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:58:28 +00:00
duoshock
1f38221ec5
[Keyboard] Add ISO Macro keyboard (#11517)
* -

* -

* -

* -

* -

Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-01-13 22:57:55 -08:00
QMK Bot
3dfaf12030 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:51:52 +00:00
Eithan Shavit
68c3773c8e
[Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510)
* Adding new breeze keyboard under afternoonlabs

* Compiling only Rev0, moving readme there

* Apply suggestions from code review

Addressing review comments, removing legacy description config. Removing copy paste leftovers

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

* Addressing review, remove empty rules.mk

* typos

* Apply suggestions from code review

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

Co-authored-by: Eithan Shavit <eithan@fb.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 22:51:24 -08:00
QMK Bot
770e0f08d5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:46:51 +00:00
Josh Johnson
5dfb6459df
[Keyboard] Add Hub20 keyboard (#11497)
* add Hub20 support

* Keymap formatting cleanup

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

* Delete bootloader_defs.h as no longer required

* Correct make / flashing example

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

* Update rules.mk

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 22:46:07 -08:00
QMK Bot
ea7b82b33c Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:40:40 +00:00
koshinoya
d97d4794e0
[Keyboard] Add Rect44 keyboard (#11484)
* Add Rect44 keyboard

* Update keyboards/rect44/readme.md

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

* Delete config.h files in keymaps

* Update keyboards/rect44/rules.mk

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

* Update keyboards/rect44/readme.md

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

* Update keyboards/rect44/config.h

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-13 22:40:10 -08:00
QMK Bot
c7cfdd82bb Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:39:46 +00:00
Adam Gwilliam
b48a5b573f
[Keymp] add gwillad's keymap for prime_e (#11477)
* new keymap

* Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c

use a more concise pin setting method

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

Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-13 22:39:15 -08:00
QMK Bot
3810bda5a5 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 06:02:33 +00:00
qpockets
eb0ce0abc7
[Keyboard] Add space space keyboard (#11425)
* add space_space keyboard

* update space_space readme

* fix space_space formatting issue

* add layout readme, vid & pid

* experiment

* readme fix

* readme fix

* readme fix

* readme formatting

* readme formatting

* readme formatting

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update keymap.c

change I+O combo to O+P because of accidental activation

* Update readme.md

change keymap readme to reflect keymap changes

* Apply suggestions from code review

remove deprecated  "key count" from .json

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

* Apply suggestions from code review

-move combo and modtap defines to the keymap level
-formatting issues

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

* move combo defines to keymap level and update config.h

* Apply suggestions from code review

add lower resolution readme picture and sleep LED note

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 22:01:58 -08:00
QMK Bot
84e71ecf10 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:58:55 +00:00
David Dejaeghere
501f3ed419
[Keyboard] Adding new keyboard UD_40 ortho version (#11401)
* Adding keyboard UD_40 Ortho

* Update keyboards/mechstudio/ud_40_ortho/info.json

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* fixing syntax after merging suggestions

* Update keyboards/mechstudio/ud_40_ortho/config.h

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h

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

* Update keyboards/mechstudio/ud_40_ortho/rules.mk

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

* Update keyboards/mechstudio/ud_40_ortho/config.h

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

Co-authored-by: David <david@tarpit.be>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 21:58:16 -08:00
QMK Bot
1504b328d1 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:57:02 +00:00
Christian Eiden
8ea28429e9
[Keymap] own Lily58 keymap (#11395)
* [Keymap] own Lily58 keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>

* adjustments of personal keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>
2021-01-13 21:56:22 -08:00
QMK Bot
8233ab83c2 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:52:48 +00:00
James
214528b1e7
[Keymap] urbanvanilla keymap for drop/alt (#11365)
* added urbanvanilla keymap

Urbanvanilla's keymap for massdrop/alt keyboard
adds in an idle timer to turn off RGB after set amount of time.
poor unsuccessful attempt at replicating a velocikey like functionality.
Grave escape is enabled on ESC.

* Update readme.md

* updating documentation

* Create readme.md

* restoring default documentation

* update with review changes implemented

removed unnecessary lines and files.
increased wait_us() parameter to 40 as was still getting chatter at 20.
removed some code for the terrible rudimentary attempt at velocikey for rgb matrix

* Update matrix.c

* Revert "Merge pull request #3 from urbanvanilla/dev_branch"

This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing
changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5.

* Update keymap.c

* added urbanvanilla keymap

Urbanvanilla's keymap for massdrop/alt keyboard
adds in an idle timer to turn off RGB after set amount of time.
poor unsuccessful attempt at replicating a velocikey like functionality.
Grave escape is enabled on ESC.

* Update readme.md

* updating documentation

* Create readme.md

* restoring default documentation

* update with review changes implemented

removed unnecessary lines and files.
increased wait_us() parameter to 40 as was still getting chatter at 20.
removed some code for the terrible rudimentary attempt at velocikey for rgb matrix

* Update matrix.c

* Revert "Merge pull request #3 from urbanvanilla/dev_branch"

This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing
changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5.

* Delete matrix.c

* Update keyboards/massdrop/alt/keymaps/urbanvanilla/config.h

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

* Update keymap.c

* Update keymap.c

* Update keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 21:52:11 -08:00
QMK Bot
e608447382 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 05:52:00 +00:00
Richard Titmuss
523c8315a2
[Keyboard] Improvements for the Torn keyboard (#11268)
* Add bongo cat animation

* Map all keys on base layer

... to make it easier to test newly built keyboards. The encoders
are optional and can be placed in different locations.

* Fix Torn in QMK configurator

This removes additional variables defined in the keymap.c file, so
that the default firmware can be compiled by the configurator.

Co-authored-by: Richard Titmuss <richardt@spotify.com>
2021-01-13 21:50:18 -08:00
QMK Bot
811e0155ef Merge remote-tracking branch 'origin/master' into develop 2021-01-14 04:36:39 +00:00
Ananya Kirti
73235e7ca0
[Keyboard] Add support for hp69 (#11339)
* init

init

* Update keyboards/hp69/config.h

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

* Update keyboards/hp69/keymaps/via/rules.mk

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

* Update keyboards/hp69/rules.mk

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

* re-added audio support

re-added audio support

* Update keyboards/hp69/readme.md

reduced the size of the default image

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

* Update keyboards/hp69/readme.md

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

* Update keyboards/hp69/info.json

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13 20:36:00 -08:00
QMK Bot
605d7c3ca2 Merge remote-tracking branch 'origin/master' into develop 2021-01-14 00:18:18 +00:00
Ryan
72ca319bee
Uni660 refactor (#11526) 2021-01-14 11:17:47 +11:00
Zach White
f4cf0d2f28 remove duplicate manufacturer 2021-01-13 16:03:52 -08:00
QMK Bot
70e143e0c1 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 17:04:55 +00:00
Joel Challis
6e931cc90b
Fix leafcutterlabs/bigknob compiles in configurator (#11531)
* Fix leafcutterlabs/bigknob compiles in configurator

* Revert change
2021-01-13 17:04:18 +00:00
QMK Bot
30cd3faf97 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 16:13:04 +00:00
Zach White
6368a5697d
Exclude more keyboards from CI (#11436)
* exclude all of handwired

* exclude more keyboards from CI
2021-01-13 08:12:28 -08:00
QMK Bot
1ade5aa922 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 01:56:46 +00:00
Rob Hilgefort
b297f1ce8d
[Keymap] rjhilgefort's Ergodox Infinity (#11345)
* initial commit- copy of default

* beginnings of ergodox layout conversion

* from scratch 2020 RJH ergodox layout!

* remove extra line in keymap

* only shift to layers, led work

* Fleshed out readme

* tweak alt placement

* updated readme

* PR feedback, updated default layer

* Update keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-12 17:56:18 -08:00
QMK Bot
7cfcb0d271 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 01:53:50 +00:00
Dan Hertz
c81e07fef5
[Keymap] Add dhertz' kanu layout (#11346)
* Add dhertz' kanu layout

* Fix delete button

* Add weak user layer change
2021-01-12 17:53:15 -08:00
Nick Brassel
017aa5988a
ChibiOS conf migrations... take 7 (#11529)
* ChibiOS conf upgrade for alpine65

 alpine65 - 91e88b87653234a9023f4ad98913a6ea52c8b3fb

* ChibiOS conf upgrade for cannonkeys/onyx

 cannonkeys/onyx - 2adf507afd4e288761a675de9cfbb6e34c540e29

* ChibiOS conf upgrade for ck60i

 ck60i - 98be5d22a3cd1b38d92e080f32c4795260db181b

* ChibiOS conf upgrade for cutie_club/borsdorf

 cutie_club/borsdorf - 81734ebf770ab731ca8dcfac6fce5574e948890e
2021-01-13 00:19:56 +00:00
QMK Bot
42f404d854 Merge remote-tracking branch 'origin/master' into develop 2021-01-13 00:00:35 +00:00
Joel Challis
1eaad6dd65
Fix inverted indicator leds on kbdfans/kbd19x (#11532) 2021-01-12 23:58:01 +00:00
QMK Bot
f4b0cd3dfa Merge remote-tracking branch 'origin/master' into develop 2021-01-12 20:59:53 +00:00
Sascha Grunert
5e46f72f75
[Keymap] keymap/sascha: disable autoshift (#11525)
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2021-01-12 12:59:18 -08:00
QMK Bot
d96463ce12 Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:34:34 +00:00
Drashna Jaelre
16d43af493
[Keyboard] Fix printf calls in Moonlander matrix (#11511) 2021-01-12 12:33:55 +00:00
QMK Bot
9b9012767c Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:21:46 +00:00
James Young
68f321f24b
Acheron Lasgewloth: layout macro rework (#11523)
* Acheron Lasgewloth: layout macro rework

Arrange the layout macro to match the assembled board.

* rename layout macro

The layout supported is equivalent to 60% ANSI with split Backspace and split Right Shift, and supports every extant switch position.

Adds community layout support.

* add LAYOUT_60_ansi support

* add Configurator data

* convert tabs to spaces in lasgweloth.h
2021-01-12 12:21:13 +00:00
QMK Bot
1c0ccf9aaf Merge remote-tracking branch 'origin/master' into develop 2021-01-12 12:15:07 +00:00
Ryan
8729afece5
Telophase: add info.json (#11524) 2021-01-12 12:14:32 +00:00
QMK Bot
a2aed8ebd7 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 19:02:54 +00:00
Vlad K
5127ef1f02
[Keymap] vladkvit keymap for keebio/bfo9000 (#10825)
* layouts for bfo9000

* cleaning up layout

* moved to a better layout name

* Added readme

* Removed zip, updated license

* Removed layers.json

* Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c

removing trailing backslashes

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

* Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c

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

Co-authored-by: Vlad Kvitnevskiy <vladkvit@outlook.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-11 11:02:00 -08:00
Nick Brassel
11bd51441b Fixup line endings. 2021-01-11 20:26:28 +11:00
Ryan
415d683ea7
Remove unused action_get_macro() usages in user files (#11165) 2021-01-11 01:25:45 -08:00
QMK Bot
5ee3cb385f Merge remote-tracking branch 'origin/master' into develop 2021-01-11 09:23:16 +00:00
wangyifu
76e88e228b
[Keyboard] latin64ble Keyboard (#10884)
* Update rules.mk

* Update config.h

* Update keyboards/latinpad/config.h

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

* Create rules.mk

* Create config.h

* Create latin64ble.h

* Create latin64ble.c

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Create readme.md

* Update rules.mk

* Update rules.mk

* Update keymap.c

* Update keymap.c

* Update rules.mk

* Update readme.md

* Update keyboards/latin64ble/config.h

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

* Update keyboards/latin64ble/config.h

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

* Update keyboards/latin64ble/rules.mk

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

* Update config.h

* Update rules.mk

* Update config.h

* Update keymap.c

* Update rules.mk

* Update keymap.c

* Update keymap.c

* Update latin64ble.h

* Update rules.mk

* Update rules.mk

* Update keymap.c

* Update keymap.c

* Update keyboards/latin64ble/rules.mk

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

* Update keyboards/latin64ble/rules.mk

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

* Update keyboards/latin64ble/rules.mk

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

* Update readme.md

* Update readme.md

* Update keyboards/latin64ble/readme.md

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-11 01:22:43 -08:00
QMK Bot
120c87b630 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 09:21:49 +00:00
yonatanzunger
554b937d21
[Keymap] Redo the accent implementation in melody96:zunger. (#11000)
The previous implementation generated accents in NFKD -- e.g., i
followed by fn+e would generate í, which is actually an ordinary i
followed by U+0301 COMBINING ACUTE ACCENT. Unfortunately, it turns
out that a bunch of websites and apps (especially European ones
written in languages that use these a lot) were very poorly written,
and will misparse and/or crash if presented with Unicode NFKD. They
require and expect NFKC, with characters like í (U+00ED LATIN SMALL
I WITH ACUTE) that look visually identical -- and are in fact
normalization-equivalent -- but have to be encoded differently.

The new accent implementation handles this in a very flexible way.

Many new comments added as well, as it's also clear that this is going
to need a bit more expansion before it becomes a true polyglot keymap.

Co-authored-by: Yonatan  Zunger <zunger@desiderata.lan>
2021-01-11 01:21:44 -08:00
Vinam Arora
b113888ec5
[Keyboard] Add 0-Sixty (#11303)
* New keyboard: 0-Sixty

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-11 01:21:19 -08:00
Nick Brassel
378edd9491 Fixup line endings. 2021-01-11 20:20:51 +11:00
QMK Bot
b3f0e6a806 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 09:05:56 +00:00
ridingqwerty
f8cbad20ab
[Keyboard] Correct edc40.h and config.h (#11508) 2021-01-11 01:05:07 -08:00
QMK Bot
f452eeb0ba Merge remote-tracking branch 'origin/master' into develop 2021-01-11 08:55:41 +00:00
James Young
6b2f9e3015
[Keyboard] Basketweave: Configurator fix (#11506)
* rework layout macro

Rework the layout macro so it's arranged the way the hardware is.

* info.json: use debug linting

* info.json: rebuild to correct key sequence

* white-space formatting

Makes the keymap and layout macro a bit more representative of where everything is.
2021-01-11 00:55:06 -08:00
QMK Bot
3bc436988d Merge remote-tracking branch 'origin/master' into develop 2021-01-11 08:47:07 +00:00
Ryan
d8b9825a8b
Remove DESCRIPTION, 0-A (#11369) 2021-01-11 19:47:02 +11:00
QMK Bot
5193a8d569 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 08:30:18 +00:00
James Young
407e5be34d
[Keyboard] whale/sk/v3: Configurator fix (#11490)
* whale/sk/v3: info.json debug linting

* LAYOUT_all key sequence fix

* remove `key_count` key

* LAYOUT_right_half_only dead-space removal

Removes the dead space from the QMK Configurator rendering.
2021-01-11 00:29:44 -08:00
QMK Bot
4fdde32346 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 08:05:02 +00:00
Callum Hart
d877f40b70
[Keyboard] Add Borsdorf keyboard (#11474)
* Add Borsdorf

* Delete config.h

* Add basic VIA keymap

* Update default keymap

* Default now uses layout_all
* Default now has layer with reset key

* Fix missing comma in borsdorf keymap

* Update rules.mk to be less specific

* Update chibiOS files

* Update keymaps to swap GUI and Alt keys

* Delete unnecessary readme

* Update VIA keymap to match default

* Remove boilerplate from readme

* Udate Copyright message

* Remove unused key from LAYOUT_rshift

* Update borsdorf.c

Remove unnecessary boiler plate

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

* Add copyright message to VIA keymap

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

* Fix missing directory in readme

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

* Fix incorrect rules.mk

* Update BOOTMAGIC_ENABLE to the preferred lite

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

* Remove redundant description from config

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

* Update keyboards/cutie_club/borsdorf/keymaps/default/keymap.c

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

* Update keyboards/cutie_club/borsdorf/keymaps/via/keymap.c

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-11 00:04:28 -08:00
QMK Bot
49e673861d Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:56:22 +00:00
Ben
ebfe668fff
[Keyboard] Add Kimiko keyboard (#11458)
* add keycapsss/kimiko split keyboard

* add kimiko rgb matrix keymap (only master working)

* move rgb_matrix_driver definiton to rev1 folder

* add comments to rgb matrix code

* add power draw limitation for ios

* add SPLIT_TRANSPORT_MIRROR to kimiko

* Add oled code and font for kimiko

* Edit default keymap and add copyright entries

* Improve typo style

* Add info.json for Kimiko

* Add readme

* Remove split matrix code

* Add image and more feature informations

* Fix indention

* Add make command example

* Update keyboards/keycapsss/kimiko/readme.md

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

* Update keyboards/keycapsss/kimiko/rules.mk

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

* Update keyboards/keycapsss/kimiko/rules.mk

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

* Update keyboards/keycapsss/kimiko/rules.mk

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

* Update keyboards/keycapsss/kimiko/readme.md

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 23:55:42 -08:00
QMK Bot
cf95a07ae8 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:41:01 +00:00
Álvaro A. Volpato
e71f7a1c9f
[Keyboard] CK60i support (#11432)
* Initial CK60i support

* Update README, add HAL_PWM and remove AUDIO and BLUETOOTH from rules.mk

* VIA support

* Fix VIA_ENABLE to 'yes'

* Remove CONSOLE_ENABLE from rules.mk

* attribute weak for encoder callback

* Remove KC_NO definition from default keymap

Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-01-10 23:40:26 -08:00
QMK Bot
01a923f217 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:13:11 +00:00
Christian Eiden
2e0f4d7e2a
[Keymap] own Redox keymap (#11394)
Signed-off-by: Christian Eiden <christian@eiden.ch>
2021-01-10 23:12:39 -08:00
QMK Bot
35b8582e31 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:12:13 +00:00
Giorgi Chavchanidze
83176b748a
[Keymap] Georgian linear keymap for idobo (#11386)
* Georgian linear layout for idobo keyboard

* fixup! Keymap formatting

Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
2021-01-10 23:12:07 -08:00
QMK Bot
9b2a52ff20 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:11:51 +00:00
Rob Hilgefort
0728200e28
[Keymap] revamped rjhilgefort planck keymap (#11385) 2021-01-10 23:11:42 -08:00
Rob Hilgefort
8e70c4d943
[Keymap] rjhilgefort's Corne KBD (#11381)
* initial crkbd rjhilgefort keymap

* finished v1 of rjhilgefort's crkbd keymap

* Update keyboards/crkbd/keymaps/rjhilgefort/readme.md

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

* Update keyboards/crkbd/keymaps/rjhilgefort/readme.md

* Update keyboards/crkbd/keymaps/rjhilgefort/readme.md

* Update keyboards/crkbd/keymaps/rjhilgefort/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 23:11:17 -08:00
QMK Bot
7464c1d330 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 07:02:09 +00:00
misonoworks
4c48518a4e
[Keyboard] Add Karina keyboard (#11347)
* add karina keymap

* Update info.json

* Add files via upload

* Update readme.md

* Update info.json

* Update info.json

* Update keyboards/misonoworks/karina/rules.mk

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

* Update keyboards/misonoworks/karina/rules.mk

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

* Update keyboards/misonoworks/karina/config.h

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

Co-authored-by: autumnisacutie <63772942+autumnisacutie@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 23:01:35 -08:00
QMK Bot
e5b292edf2 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:55:56 +00:00
Daniel Rodríguez Rivero
135d28d2fb
[Keymap] Danielo515/redox_w (#11340)
* chore: pulled the latest from master

Bring my redox layout from my latest redox branch
Bring my latest user stuff from my redox branch

* Update users/danielo515/config.h

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

* chore: some more layouts

* feat: add gaming layer (has a bug)

* chore: more gaming layout

* chore: deactivate gaming layer when switching

* chore: simplify gaming toggle

* Update .vscode/settings.json

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-10 22:55:20 -08:00
QMK Bot
a7daa5dda4 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:40:58 +00:00
jackytrabbit
fd80b2581e
[Keyboard] Add the 'THE40' (#11317)
* Add support for keyboard 'THE40'

Add support for keyboard 'THE40'

* Update keyboards/lazydesigners/the40/the40.c

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

* Update keyboards/lazydesigners/the40/readme.md

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

* Update the40.h

Add layout option.

* Update info.json

Add layout option.

* Update keymap.c

Change for layout option.

* Update keyboards/lazydesigners/the40/readme.md

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

* Update keyboards/lazydesigners/the40/readme.md

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

* Update keyboards/lazydesigners/the40/readme.md

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

* Update keyboards/lazydesigners/the40/config.h

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-10 22:40:24 -08:00
QMK Bot
09243ae686 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:38:39 +00:00
Eshan
beace23bca
[Keymap] Adding my Planck Keymap (#11315)
* Adding keymap files

* Added compatible license header to config file

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 22:38:06 -08:00
QMK Bot
d758496ad1 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:27:21 +00:00
Moritz
abda419f5a
[Keyboard] Add isometria 75 keyboard (#11210)
* added isometria_75

* added missing license header

* added reset explanation

* Update keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c

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

* Update keyboards/ebastler/isometria_75/rev1/keymaps/via/keymap.c

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

* Update keyboards/ebastler/isometria_75/rev1/config.h

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

* Update keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c

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

* Update keyboards/ebastler/isometria_75/rev1/keymaps/default/keymap.c

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

* renamed uppercase readme

* Update keyboards/ebastler/isometria_75/rev1/info.json

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

* Update keyboards/ebastler/isometria_75/rev1/rules.mk

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

* Update keyboards/ebastler/isometria_75/rev1/rules.mk

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

* Update keyboards/ebastler/isometria_75/rev1/rev1.c

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

* changed configs to only necessary lines

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 22:26:34 -08:00
QMK Bot
3cdccc3351 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:23:15 +00:00
Carsten Rose
29fcd5418a
[Keyboard] Add support for idobao id80 iso layout (#11246)
* add support for idobao id80 iso layout

* This change is required as there is a logic bug on the board that C7
(capslock) is inverted thus lowercase is with light on. Mind the ! in
the write to the pin.

* Apply suggestions from code review

All fine for me, thanks for the additional information!

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

* move device information to separate config.h for id80 iso and ansi

* commit via keymap similar to default. There is a problem with mapping compiling vor via, resulting in KC_ENT residing on KC_PGDN. Switching off via support in rules.mk makes the keyboard behave fine

* change KC_BSLS to KC_NUHS as this is an iso board

Co-authored-by: Carsten <modebm@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-01-10 22:22:44 -08:00
QMK Bot
f668ef5896 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:22:03 +00:00
johannesk
3f6de1ef54
[Keyboard] wheatfield/split75 with ISO layout (#11271)
The pcb used for wheatfield/split75 supports ANSI and ISO layout. This
commit adds the ISO variant.

With suggestions from code review:
Co-authored-by: Drashna Jael're <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-01-10 22:21:27 -08:00
QMK Bot
7d9829af4c Merge remote-tracking branch 'origin/master' into develop 2021-01-11 06:18:36 +00:00
NightlyBoards
b1419742a5
[Keyboard] Add the [n]40-o (#11286)
* Create Alter folder

* Revert "Create Alter folder"

This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c.

* Added the n40_o folder

* Edited info.json, n40_o.h and rules.mk

* Edited readme as per comment
2021-01-10 22:18:28 -08:00
Andrew Kannan
65d8ac4759
[Keyboard] Add Onyx keyboard to QMK (#11292)
* Add Onyx keyboard to QMK

* Apply suggestions from code review

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 22:18:01 -08:00
QMK Bot
0ff2d76f10 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 05:56:14 +00:00
Ramon Imbao
8657f54f9e
[Keyboard] Add Herringbone Pro, re-organize herringbone folder (#11115)
* Add Herringbone Pro, reorganize herringbone folder

* Finish encoder functionality

* Change image in readme

* Fix info.json

* Flip encoder direction

* Update keyboards/ramonimbao/herringbone/pro/config.h

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

* Update keyboards/ramonimbao/herringbone/pro/rules.mk

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

* Update keyboards/ramonimbao/herringbone/pro/rules.mk

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

* Update keyboards/ramonimbao/herringbone/pro/readme.md

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

* Add OLED support, split space, default folder

* Fix LAYOUT_all in info.json

* Remove WPM feature

* Add readme to top level herringbone folder

* Re-add WPM because now the OLED won't turn back on lol

* Add missing timer_read32

* Add OLED wakeup on knob use

* Update keyboards/ramonimbao/herringbone/v1/rules.mk

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

* Update keyboards/ramonimbao/herringbone/v1/rules.mk

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

* Update keyboards/ramonimbao/herringbone/pro/rules.mk

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

* Update keyboards/ramonimbao/herringbone/pro/rules.mk

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

* Add small QoL improvments for tapping

* Update keyboards/ramonimbao/herringbone/readme.md

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

* Add bootloader instructions and improve LAYOUT_all a bit

* Update keyboards/ramonimbao/herringbone/pro/pro.h

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

* Update keyboards/ramonimbao/herringbone/pro/info.json

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

* Update keyboards/ramonimbao/herringbone/pro/info.json

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

* Update keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c

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

* Update keyboards/ramonimbao/herringbone/v1/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-01-10 21:55:32 -08:00
QMK Bot
da5ea61adf Merge remote-tracking branch 'origin/master' into develop 2021-01-11 05:49:52 +00:00
Roger
466424c3c2
[Keymap] Quefrency layout for rogthefrog (#11140)
* noop; indent and comment cleanup

* config for rogthefrog layout

* removed encoder function as there is no encoder on this pcb

* removed unnecessary declaration

* replaced individual constants with an enum for extensibility

* removed unused enum

* Added GPL license language

* added copyright for my changes, per GPL

* noop; removed unneeded line continuations; fixed indentation
2021-01-10 21:49:19 -08:00
QMK Bot
1e0866325c Merge remote-tracking branch 'origin/master' into develop 2021-01-11 05:42:25 +00:00
Álvaro A. Volpato
e688f2286f
Alpine65 (#11223)
* Initial ALPINE65 support

* Fix RGB LED number

Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-01-11 00:41:53 -05:00
Aplyard
a06dda15e4
[Keyboard] Added rev2 & move rev1+rev2 to parent folder (#10973)
* rev2 and move parent folder

Moved aplx6 to parent folder, renamed it to rev1 and added rev2

* Update keyboards/aplx/aplx6/rev1/config.h

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

* Update keyboards/aplx/aplx6/rev2/config.h

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

* Update keyboards/aplx/aplx6/rev2/rev2.c

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

* Update keyboards/aplx/aplx6/rev2/rules.mk

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

* license

* Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c

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

* Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c

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

* Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c

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

* Update keyboards/aplx/aplx6/rev2/keymaps/default/keymap.c

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

* Update keyboards/aplx/aplx6/rev2/rules.mk

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

* Update keyboards/aplx/aplx6/rev2/rules.mk

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

* Update keyboards/aplx/aplx6/rev2/readme.md

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

* layer definition

* parent folder rename after suggestion

* build instructions

* update Hardware Availability links

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-01-10 21:31:42 -08:00
QMK Bot
42f9d5c877 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 03:14:17 +00:00
Alexander Tulloh
ffd8ff642d
[Keyboard] Oddball keyboard and optical sensor update (#10450)
* Add oddballl v2

- add CPI options
- add scroll support
- add click-and-drag support
- PMW3360 implementation
- ADNS9800 improvements

* Set default make directory

* Update readme with PMW config

* Change bootloader

* Update unused pins on v2

* Remove diode switch

* Move bootloader selection to keyboard version level

* Change default keyboard folder to v1

* Move sensor selection to keymap

* Remove PK debounce

* Change to only send mouse report on change

* Change CPI function cpi type

* Remove EEPROM state check

* Update CPI to only change on key down

* Fix incorrect F8 in keymap

* Add v2.1 with more convenient controller pinout

* Add keyboard readmes

* Update keyboards/oddball/pmw/pmw3360_srom_0x04.h

Remove direct AVR reference

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

* Remove direct AVR reference

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

Co-authored-by: Alexander Tulloh <alex@riberry.io>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-10 19:13:47 -08:00
QMK Bot
64009220d3 Merge remote-tracking branch 'origin/master' into develop 2021-01-11 02:58:47 +00:00
scottywei
6edbd845eb
[Keyboard] Add BIOI Keyboards (#9602)
* Add BIOI Keyboards

Add keyboards from BIOI, including dual-mode G60, Morgan65, and S65

* Update keyboards/bioi/g60/config.h

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

* Update keyboards/bioi/g60/config.h

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

* Update keyboards/bioi/g60/g60.c

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

* Update keyboards/bioi/g60/config.h

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

* Apply suggestions from code review

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

* Rename rule.mk to rules.mk

* Rename rule.mk to rules.mk

* Rename rule.mk to rules.mk

* Update readme.md

* Apply suggestions from code review

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

* Update ble.h

* Update config.h

Change VenderID to 8101

* Update config.h

* Update config.h

* Update ble.c

* Update ble.h

* Add license headers

* Apply suggestions from code review

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

* Add license header in keymap files

* Fix year in  license header

* Update keyboards/bioi/s65/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-10 18:57:58 -08:00
QMK Bot
36a70e117a Merge remote-tracking branch 'origin/master' into develop 2021-01-10 23:00:48 +00:00
James Young
46b3245d66
freoduo: define RGBLight config at keyboard level (#11491)
Configurator compiles fail without the number of LEDs defined here. Included the rest to match the default keymap's settings.
2021-01-10 23:00:17 +00:00
Nick Brassel
e00bb81c49
ChibiOS conf migrations... take 6 (#11504)
* ChibiOS conf upgrade for cannonkeys/sagittarius

 cannonkeys/sagittarius - 953626d1b87574290016ed09caaf5e3fa7b73189

* ChibiOS conf upgrade for evolv

 evolv - c2f56a35ef1d11b002f9306ed2814ac0447e68c4
2021-01-10 22:59:04 +00:00
QMK Bot
c8320726bd Merge remote-tracking branch 'origin/master' into develop 2021-01-10 22:16:06 +00:00
Joel Challis
d58d7dd192
manually run formatting job (#11503) 2021-01-10 22:15:29 +00:00
Zach White
eaa9106ec7
Add support for specifying BOARD in info.json (#11492)
* add support for specifying BOARD in info.json

* move BOARD from rules.mk to info.json for clueboard

* fix keyboards that do not require board

* remove out of compliance values
2021-01-09 20:18:47 -08:00
QMK Bot
54a8262dfe Merge remote-tracking branch 'origin/master' into develop 2021-01-10 04:01:40 +00:00
Matthias Bertschy
acdcc62202
[Keymap] Add new atreus keymap to planck keyboard (#11420) 2021-01-09 20:01:09 -08:00
QMK Bot
90137bbaa0 Merge remote-tracking branch 'origin/master' into develop 2021-01-10 01:31:40 +00:00
Koichi Katano
6caef353a5
Update Bakeneko65 readme (#11485) 2021-01-10 12:31:06 +11:00
QMK Bot
c923426a7d Merge remote-tracking branch 'origin/master' into develop 2021-01-10 01:31:03 +00:00
Koichi Katano
c85e2a8822
Update Bakeneko60 readme (#11483) 2021-01-10 12:30:26 +11:00
Nick Brassel
75111e967f
Disable subsystems repo-wide. (#11449) 2021-01-10 09:52:49 +11:00
Nick Brassel
f7b0e803c2
ChibiOS conf migrations... take 5 (#11414)
* ChibiOS conf upgrade for handwired/sono1

 handwired/sono1 - 4453480576b0bd60f5962e5c3c287cf0f53f7197

* Fixup build error for mechlovin/tmkl.
2021-01-10 09:52:30 +11:00
QMK Bot
c550047ba6 Merge remote-tracking branch 'origin/master' into develop 2021-01-09 20:09:11 +00:00
James Young
3dc5e5af38
tunks/ergo33: info.json fixes (#11488)
* tunks/ergo33: info.json fixes

Fix layout macro reference and key sequence.

* fix make command in readme
2021-01-09 20:08:34 +00:00
QMK Bot
9ae6e298bb Merge remote-tracking branch 'origin/master' into develop 2021-01-09 06:46:48 +00:00
Monksoffunk
d54289db58
Add VIA keymap for Zinc (#9299)
* Add VIA keymap

* Update Document files

Update readme of VIA keymaps

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/rules.mk

* Update keyboards/zinc/keymaps/via/rules.mk

* Update keyboards/zinc/keymaps/via/rules.mk

* Update keyboards/zinc/keymaps/via/rules.mk

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Update keyboards/zinc/keymaps/via/keymap.c

* Add copyright license header
2021-01-08 22:46:15 -08:00
QMK Bot
c2ef0dac6b Merge remote-tracking branch 'origin/master' into develop 2021-01-08 22:20:08 +00:00
Erkki Halinen
06a6b23e60
Update available pohjolaworks/louhi layouts and RGB config(#11466) 2021-01-08 22:19:35 +00:00
QMK Bot
ae06235e46 Merge remote-tracking branch 'origin/master' into develop 2021-01-08 22:16:56 +00:00
Pascal Pfeil
1be7485fa4
VIA Support: LFKPad (#11461)
* VIA Support: LFKPad

* Condense two mostly redundant rules.mk files

* Set BOOTMAGIC_ENABLE to lite as advised by VIA tutorial
2021-01-08 22:16:21 +00:00
QMK Bot
2af7a724e1 Merge remote-tracking branch 'origin/master' into develop 2021-01-08 21:29:09 +00:00
kb-elmo
19e2bb272e
Added Odelia (#11362)
* add odelia keyboard

* Update readme.md

* Update info.json
2021-01-08 21:28:35 +00:00
Zach White
667161620a Merge remote-tracking branch 'origin/master' into develop 2021-01-08 11:21:27 -08:00
Zach White
959f566118 comment out a non-standard DIODE_DIRECTION 2021-01-08 08:40:23 -08:00
Zach White
7e78699e79 use a custom name for custom pins 2021-01-08 08:40:23 -08:00
Zach White
4394fc35ea change matrix/m20add to use non-standard names for non-standard pins 2021-01-07 21:21:12 -08:00
Zach White
2a67ff690e clean up generate-api errors 2021-01-07 21:21:12 -08:00
Zach White
0d3aca062e cleanup clueboard based on latest validation work 2021-01-07 21:21:12 -08:00
Joel Challis
b609a07b45
Implement matrix_io_delay abstraction for Drop boards (#11472) 2021-01-08 02:26:39 +00:00
Atsushi Morimoto
2574bc2791
[Keyboard] Add Sparrow62 (#11387)
* add sparrow62

* fix split hand pin

* fix default keymap back space

* add via firmware

* add 74th keymap
fix for coding style

* Update keyboards/sparrow62/readme.md

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

* Update keyboards/sparrow62/keymaps/74th/keymap.c

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

* Update keyboards/sparrow62/keymaps/74th/keymap.c

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

* fix typo

* remove macro for LOCK

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-07 18:12:50 -08:00
Ryan
985b8cab7c
[Keyboard] JM60 refactor (#11421) 2021-01-07 11:39:38 -08:00
QMK Bot
95cbcef34f Merge remote-tracking branch 'origin/master' into develop 2021-01-07 18:24:16 +00:00
Jane Bernhardt
581368596e name change 2021-01-07 13:23:31 -05:00
QMK Bot
6b8a85758e Merge remote-tracking branch 'origin/master' into develop 2021-01-06 18:05:13 +00:00
Xyverz
832a6e150a
[Keymap] Xyverz's crkbd keymap (#11299)
* Initial commit for my Corne keyboard layout.

* Updates to Corne, etc.

Finished working on primary layout for Corne keyboard.
Cleaned up some comments for my 4x12 Ortho layout.

* Changes for crkbd layout

* Fixed the config.h to reflect using ee_hands

* Added RGB configs to crkbd/corne layout

Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
2021-01-06 10:04:43 -08:00
QMK Bot
d35af9fbc1 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 18:03:43 +00:00
Jay Greco
8b735d35aa
[Keymap] Update NIBBLE ISO keymap (#11295) 2021-01-06 10:03:06 -08:00
QMK Bot
98b8fd6d21 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 18:00:44 +00:00
Craig Gardner
b7b82d509b
[Keyboard] add support for bigknob (#11291)
* add support for bigknob

Add support for bigknob macropad

* corrected files

* Apply suggestions from code review

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

* corrected tap dance

* Update config.h

* correct image link

* Apply suggestions from code review

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

* added GPL headers

* Update readme.md

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-06 10:00:05 -08:00
QMK Bot
0e2476554e Merge remote-tracking branch 'origin/master' into develop 2021-01-06 17:59:30 +00:00
Brandon Claveria
bf959d79dc
[Keyboard] add joypad keyboard (#11283)
* add joypad

* add joypad keymaps

* change pid

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update keyboards/handwired/swiftrax/joypad/joypad.h

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

* Update keyboards/handwired/swiftrax/joypad/keymaps/via/keymap.c

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

* Update keyboards/handwired/swiftrax/joypad/keymaps/default/keymap.c

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

* Apply suggestions from code review

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

Co-authored-by: Swiftrax <swiftrax@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-06 09:58:55 -08:00
QMK Bot
57b9b45242 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 17:53:41 +00:00
Erkki Halinen
bca88177d3
[Keyboard] Add Louhi keyboard (#11244)
* Add Louhi QMK config

* Modify info.json layout

* change compile and flash examples

* Tweak layout, change picture

* Change pictures to Imgur hosted

* Update keyboards/pohjolaworks/louhi/louhi.h

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

* Update keyboards/pohjolaworks/louhi/louhi.h

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

* Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c

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

* Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c

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

* Update keyboards/pohjolaworks/louhi/info.json

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

* Update keyboards/pohjolaworks/louhi/info.json

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

* Update keyboards/pohjolaworks/louhi/keymaps/default/keymap.c

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

* Update keyboards/pohjolaworks/louhi/readme.md

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

* Update keyboards/pohjolaworks/louhi/rules.mk

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

* Update keyboards/pohjolaworks/louhi/keymaps/default/readme.md

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

* Update keyboards/pohjolaworks/louhi/readme.md

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

Co-authored-by: Erkki Halinen <erkki-eemeli.halinen@cgi.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-06 09:53:04 -08:00
QMK Bot
93fe3b6c66 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 17:50:58 +00:00
Damien
515cea4b78
[Keymap] Dbroqua alps64 poker (#11254)
* [Apple M5120] First iteration

* Cleaned apple_m5120 files

* Changes requested by PR

* Update keyboards/apple_m5120/iso/rules.mk

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

* Update keyboards/apple_m5120/iso/keymaps/default/keymap.c

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

* Added dbroqua keymap for ALPS64

* Removed other keyboard

* Added volume keys

* Added licence

* Update keyboards/alps64/keymaps/dbroqua/keymap.c

Co-authored-by: dbroqua <dbroqua@mousur.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-06 09:50:50 -08:00
Barabas
748b3ac82a
[Keymap] Added my lily58 keymap (#11258)
* added my keymap

* Tidy up

Add readme, run clang-format, remove some comments

* Fixed some formatting issues

* Update after reading PR checklist

Add GPL header to keymap.c, remove backslash in LAYOUT macro

* Use integer constants for switch labels

* Remove unneeded code, remove F-keys from raise layer

* Use program memory for some text on OLED

* Fixed left over debug code

* tidy up config.h and rules.mk

Remove all unused defines from config.h, and remove options which are the same as the keyboard level make file. Enabled command to be able to toggle NKRO.
2021-01-06 09:50:11 -08:00
QMK Bot
fc892e8c03 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 17:41:05 +00:00
Taylore101
634eac82e8
[Keyboard] Adding "Bigmac" 5x17 handwired by Taylore101 (#11204)
* Adding bigmac handwired by taylore101

* Adding bigmac handwired by taylore101

* Updated Big Mac pin layout

* Updated files from kbfirmware to newer qmk. Thanks drashna

* Updated config file to have product and manufacturer info. Thanks again drashna

* Update readme.md

added missing picture of board layout

* Update keyboards/handwired/bigmac/readme.md

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

Co-authored-by: Taylor Graves <taylorgraves@BOS0005.local>
Co-authored-by: Taylor Graves <taylorgraves@BOS0005.lan>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-06 09:40:33 -08:00
QMK Bot
531d30575f Merge remote-tracking branch 'origin/master' into develop 2021-01-06 05:53:27 +00:00
KgOfHedgehogs
11599bea93
[Keymap] Add jian/keymaps/left_hand (#11196)
* Add jian/keymaps/left_hand

* Add jian/rev2/readme.md

* Remove mod tap on mirrored layer

* Add GPL2+ license header

* Add gb version to readme
2021-01-05 21:52:51 -08:00
QMK Bot
7389b10867 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 05:45:04 +00:00
mechlovin
115aa95788
[Keyboard] Add TMKL PCB (#11173)
* add

* update

* update indicator LED

* Update keyboards/mechlovin/tmkl/keymaps/default/keymap.c

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

* Update keyboards/mechlovin/tmkl/readme.md

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

Co-authored-by: vuhopkep <boy9x0@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-05 21:44:19 -08:00
QMK Bot
7165915708 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 04:24:06 +00:00
Andrew Kannan
495a61ad7a
[Keyboard] Sagittarius (#10896)
* Sagittarius keyboard

* Update Sagittarius keyboard

* fix

* remove info.json as it's very hard to make

* Add license and address PR comments

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Add info json, update keymap

* Fix info json

* Update keymap

* Update keyboards/cannonkeys/sagittarius/info.json

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

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-05 20:23:35 -08:00
QMK Bot
57b0f69ca3 Merge remote-tracking branch 'origin/master' into develop 2021-01-06 04:23:18 +00:00
Álvaro A. Volpato
dd356f90b0
[Keyboard] Evolv75 (#10947)
* Initial support for Evolv75

* Fix encoder directional and layer support

* Invert knob directions

* Remove info.json and updated README

* Update keyboards/evolv/evolv.c

Update encoder_update call

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

* Update keyboards/evolv/config.h

Remove description field from USB descriptors

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

* Remove KC_NO define from default keymap

* Update config.h

New USB descriptor ID numbers

* Update keyboards/evolv/rules.mk

Remove words from bluetooth and audio enable comments

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

* Update keyboards/evolv/rules.mk

Enable full bootmagic

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

* Add info.json for QMK Configurator

* Edit copyright info, add VIA initial support

* Fix KC_NO seven underscores issue in keymap definitions

* Update info.json

* Update info.json

* ANSI and ISO layouts, info.json file with both

* Reorganized layouts to match info.json order

Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-05 20:22:45 -08:00
Zach White
f9269035fe
Fix compiling treadstone32/rev1 (#11447)
* fix compiling treadstone32/rev1

* move most options back to top level rules.mk
2021-01-06 00:44:40 +00:00
QMK Bot
31ffc1eeb0 Merge remote-tracking branch 'origin/master' into develop 2021-01-05 22:51:55 +00:00
kb-elmo
6009e7d8b5
[Keyboard] add dz96 (#11252)
* add dz96

* Apply suggestions from code review

* Update keyboards/dztech/dz96/keymaps/iso/keymap.c

* add image to readme
2021-01-05 14:51:10 -08:00
Zach White
5846445f48 Fix compiling squiggle/rev1 2021-01-05 13:18:09 -08:00
QMK Bot
f30a49df6a Merge remote-tracking branch 'origin/master' into develop 2021-01-05 21:14:16 +00:00
Zach White
34513b4665 enable LTO to bring firmware size down 2021-01-05 13:13:47 -08:00
Zach White
cf2f13fc77 Merge remote-tracking branch 'origin/master' into develop 2021-01-05 11:04:56 -08:00
Drashna Jael're
3d1e7bd36f [Keyboard] Disable music mode on OctoPad to reduce size 2021-01-05 10:55:28 -08:00
Drashna Jaelre
375ef0b8c3
[Keyboard] Fix compiler errors for Kingly Key boards (#11100) 2021-01-05 15:14:10 +11:00
Joel Challis
f03b10b6c1
Migrate python tests away from onekey (#11367)
* Migrate python tests away from onekey

* Add stub files to stop lint complaints

* Make all the pytest keymaps compile
2021-01-05 00:52:31 +00:00
QMK Bot
d0aa9ff972 Merge remote-tracking branch 'origin/master' into develop 2021-01-05 00:37:55 +00:00
Drashna Jaelre
810eafad12
Fix Tap-Hold Configs (#11127)
* Add proper prototypes for Tap-Hold Per Key functions

* Fix handwired/tennie default keymap

* Remove unneeded references

* Fix tapping term per key check in space cadet

* Pre-emptive fix for tap dance

* Fix marksard/leftover30

* Replace hard coded tapping term with define
2021-01-04 16:37:20 -08:00
QMK Bot
fd7ab5a22b Merge remote-tracking branch 'origin/master' into develop 2021-01-05 00:27:52 +00:00
fauxpark
c38fe49242 Update MXSS custom rgblight and fix compilation error 2021-01-04 16:27:16 -08:00
QMK Bot
cd128bbadb Merge remote-tracking branch 'origin/master' into develop 2021-01-04 18:59:12 +00:00
YangPiCui
d1e10a067b
[Keyboard] Add handwired/evk (#11034)
* Add the Ergonomic Vertical Keyboards

* generic update

* Update readme.md

* Update readme.md

* Update readme.md

* Update info.json

* put into handwired

* Update readme.md

* Update readme.md

* i

* Change copy author from RedForty to Yang Cui

* add version 1.3

* rename keyboard version

* Update config.h

* j

* h

* fix bugs

* Update config.h

* Update config.h

* Update keymap.c

* update default keymap

* Update keymap.c

* Add handwired/evk

* Add handwired/evk

* Update v1_3.c

* Update keyboards/handwired/evk/v1_3/config.h

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

* Update keyboards/handwired/evk/v1_3/rules.mk

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

* Update keyboards/handwired/evk/v1_3/v1_3.c

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

* Update config.h

* Commit change requests from the pull request

* remove copy right

* Update v1_3.c

* Update v1_3.c

* Update keyboards/handwired/evk/v1_3/config.h

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

* Update keyboards/handwired/evk/v1_3/rules.mk

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

* Update keyboards/handwired/evk/v1_3/rules.mk

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

* Update keyboards/handwired/evk/v1_3/info.json

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

* Update keyboards/handwired/evk/info.json

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

* Update info.json

* change all names to YangPiCui

* Update keyboards/handwired/evk/v1_3/keymaps/default/keymap.c

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

* Update keyboards/handwired/evk/v1_3/readme.md

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

* Update keyboards/handwired/evk/v1_3/config.h

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

* Delete config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-04 10:58:36 -08:00
Zach White
5b2feecdf3 fix lizard_trick/tenkey_plusplus/info.json 2021-01-03 17:55:54 -08:00
Zach White
ac5a1ccffb fix clueboards 2021-01-03 17:55:54 -08:00
Nick Brassel
34446b79d7
Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with yes/no for enable flag. (#11426) 2021-01-04 08:45:43 +11:00
Nick Brassel
e8e090aced
Remove handwired/bluepill. (#11415) 2021-01-03 13:29:19 +11:00
Nick Brassel
7456e6c776
ChibiOS conf migrations... take 4 (#11413)
* ChibiOS conf upgrade for cannonkeys/tsukuyomi

 cannonkeys/tsukuyomi - 7beddc74b03d652481198843a178177de5da3ddb

* ChibiOS conf upgrade for misterknife/knife66_iso

 misterknife/knife66_iso - f2dd6e6c54258ae9d09a88215b36fba34947fc23

* ChibiOS conf upgrade for mode/eighty

 mode/eighty/m80h - 4bbbee01a89a5b4ab5f4de36e0dd2044cf54a698
 mode/eighty/m80s - 6de4a1affab4ed8f08423eb511393ed797e3ea77
2021-01-03 13:17:34 +11:00
Zach White
11bd98f684
Fix broken keyboards (#11412)
* Fix a couple errors

* add a dependency for the generated headers
2021-01-03 13:08:17 +11:00
QMK Bot
266343666f Merge remote-tracking branch 'origin/master' into develop 2021-01-02 08:46:59 +00:00
Felix Jen
2e9d091960
[Keyboard] Added LDK65 based off BKS65 (#11335) 2021-01-02 00:46:25 -08:00
QMK Bot
8e68003b28 Merge remote-tracking branch 'origin/master' into develop 2021-01-02 01:39:21 +00:00