3d957a33fa
Merge remote-tracking branch 'origin/master' into develop
2021-03-26 12:37:54 +00:00
f028dbf179
Minor typo in comments Colemak DM-MK -> DH-MK ( #10721 )
2021-03-26 23:37:17 +11:00
56dee4acc6
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:40:23 +00:00
34205f5bb5
Add new Keyboard: SENDYYeah Bevi ( #12011 )
...
* Add bevi Keyboard
* Update readme
* Change image embed
* Update instructions to compile
* beVi initial
* Enable NKRO
* Update README
* Revert Lily58 rules.mk
* Revert h87a info.json
* Add URL and maintainer in info.json
* Update year
* Add layer 1
* Tidying up
* Fix keymap
* Add one line at end of file
* Replicate default keymap to via
* Update keyboards/sendyyeah/bevi/bevi.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove comment on layout macro definition
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25 23:39:35 +11:00
d0d77e8c60
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:39:14 +00:00
3143846ba4
keyboards/xd60/readme.md: link to schematic on EasyEDA ( #12018 )
2021-03-25 23:38:54 +11:00
9f1608a6a2
Add unison v04 keyboard ( #11982 )
...
* Update: JonesのMIDIキーマップをベースに初期作成。AudioとMIDIの同時使用はファームウェアサイズ的に厳しい。
* Update: Unison用のIDへ変更
* Update: Audioはデフォとせず、OLEDをデフォとした。
* Update: v03基板から実際に動くものとなったため、v01からv03に変更。基本的な設定を完了。
* Update: 基本的なキーマップを作成
* Update: キーマップ、ロータリーエンコーダの感度を調整。
* TEST: BOOTMAGIC = lite でどうなるのかテスト
* Update: Jones ---> Unison
* TEST: BOOTMAGIC = lite で、TABキーでBootloaerに入る設定
* Update: インデント
* Update: QMKの一般的な表記に合わせ、 k(col)(row) から k(row)(col) へ変更。
* Update: 自前のカスタムマトリクスを使用せず、COL2ROW方式で総当たりマトリクスを動作させるテストを開始。
特に問題なく動作している。
* TEST: BOOTMAGICテスト用コード追加
* Update: 主に中央部分のキーマップ変更
* TEST: COL2ROWで、COLのピンの順番を変えてキーを読むテスト
* Update: QMKの仕様上、MacではKC_PSCRがFキーとして判定されるため、スクリーンショット用マクロを用意した。
* TEST: COL2ROWで、ROWとCOLのピン定義をずらした状態で、BOOTMAGIC = lite の（0,0)キーに引っかからない。
* Update: ロータリーエンコーダにマウスホイールを割り当て
* Update: 自明のコメントを削除
* Update: NKRO指定時は、NKRO動作を強制。
* Update: MIDIなしのとき、AUDIOのフル機能がファームウェアサイズ内に収まることをチェック。
* Update: Bootmagicテスト完了のため、無効化。
* TEST: LED動作チェック。
* Update: キーマップを、LOWER, RAISEを中心に大幅変更。
数字を左手レイヤーキーではなく、右手レイヤーキーにしたことで、CMD+Qによる誤爆アプリ終了を避ける狙いもある。
* Update: 未使用のNumレイヤとTapDanceを削除。
* Update: MIDI関連の設定を多数追加。
* New: Add Sequencer keymap
* enumの開始を明記
* TAP_DANCEを無効化
* シーケンサーで、トラック単位の有効・無効の切り替えを追加。※動作せず
* デバッグ用設定をテスト
* Change custom keycode name for classification.
* Add LED update on sequencer step.
* change LED adjusting value.
* TEST: SQ_T related things.
* DEBUG
* Increase track 6 ---> 8. Add track indicator.
* Add sequencer step viewer.
* Move Bootmagic lite position to keyboard's config.
* Revert matrix as phisically connected.
* Change default RGB lighting animation.
* Remove MIDI options from keyboard's config.
* change version
* Remove unused.
* Delete unused. Round-Robin matrix woks with COL2ROW.
* Delete unused. Round-Robin matrix woks with COL2ROW.
* Formatting.
* Formatting.
* Remove unused.
* No enum.
* LED setting for Sequencer layer.
* Add TODO flag
* Remove unused.
* change LCTL
* Update Rotary Encoder setting.
* revert to default
* Add TODO flag.
* Update to latest information.
* Update to latest information.
* Add v04
* Move keymaps directory to just under keyboard directory.
* Add music layout.
* Update to Unison layout.
* Add default keymap.
* Update readme description.
* Commenting.
* Exclude non-PR files.
* Change keymap name more general.
* Remove unused
* Commenting.
* Remove unused.
* Commenting.
* Change Macro name for consistency.
* Add tempo definition.
* Change transparent to noop for better musical play.
* Add Rotary Encoder push functions for Sequencer.
* FIX printscreen to work _WIN layer.
* Fix style name.
* Change keymap style from PC to Music.
* Adjust LED number and index to v04 PCB.
* Commenting.
* Add #ifdef block to LED config related.
* Change Sequencer display function from Rotary Encoder right-3 to right-4.
* Change default animations.
* Set LED effect range. Add LED reset on layer change.
* Remove unused.
* Commenting.
* Commenting.
* Use function to change Sequencer track indicator.
* Use function to change Sequencer track indicator.
* Remove unused
* Add PC-style keymap.
* Adjust keymap.
* Add micro volume control for Mac.
* Adjust keymap.
* Adjust cursor block.
* Adjust grave and tild in layer.
* Change magic-key position to Left-Bottom where both Music-style and Terminal-style have a key.
* Change LED settings for front-side 9 LEDs.
* Change keymap name.
* Update supported functions.
* Adjust indicator dimmer.
* Remove unused.
* Add underglow support.
* Add rotary encoder keymap at Adjust layer for test hardware function.
* Disable rotary encoders.
* Change description.
* Add support for underglow.
Disable knight animation to prevent unnatural feeling when underglow not installed.
* Commenting.
* Formatting.
* Turn on default layer indicator.
* remove duplication
* Change VID for via.
* Initial commit for VIA.
* Add layout option.
* restore AUDIO enabled.
* Removed a JSON file for VIA app, not for QMK.
* Remove non-related files for PR.
* Add keymap for music layout.
* Add photo links.
* Commenting.
* Apply PR checklist.
* Change unused function to "no".
* Add keymap image and change keymap as image shows.
* Change bootloader entering key to widely known "Left-Top".
* Turn off ENCODER by default.
* Add VIA keymap.
* Change VID unique.
https://github.com/qmk/qmk_firmware/pull/11982#discussion_r582276979
* Add config option to prepare future release, #11820 .
https://github.com/qmk/qmk_firmware/pull/11820
* Remove old defines for Audio.
Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
2021-03-25 23:38:31 +11:00
2df1b124a7
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:11:36 +00:00
666623d39a
ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs ( #11994 )
...
* added adns5050 sensor code, as well as implementations for the Ploopy Mini and the Ploopy Nano
* fixed spurious scrolling issue
* recommended fixes for pr linting and cleanup
2021-03-25 23:10:55 +11:00
f2729e8974
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:08:38 +00:00
0eabb01e27
Minor improvements to BM68RGB ( #12156 )
...
* Minor improvements to BM68RGB
* Add grave esc and LTO support
* Move comments to end of line
* Document the use of qmk script for compiling and flashing
* Revert arrow key flags back to mod
* Update keyboards/bm68rgb/bm68rgb.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/bm68rgb/bm68rgb.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Remove grave escape
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update tab spacing
Co-authored-by: Ryan <fauxpark@gmail.com>
* Reverted make default
Co-authored-by: Ryan <fauxpark@gmail.com>
* Reverted make flash
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: filterpaper <filterpaper@localhost>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 23:08:04 +11:00
aa85b5ee1e
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:05:42 +00:00
a5ecd4eb87
Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same ( #12203 )
...
* Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same
* Use NO_PIN instead of duplicate pin
2021-03-25 23:05:05 +11:00
fd24546787
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:04:35 +00:00
f3f444c1df
Add Nix Studio OXALYS80 Keyboard ( #12118 )
...
* Initial commit of OXALYS80 firmware
* Remove comments
* Add new return in info.json
* Fix pin output init for scroll lock indicator
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/oxalys80.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Delete keymaps config.h
* Update keyboards/nix_studio/oxalys80/config.h
Co-authored-by: Sendy Aditya Suryana <sendy.suryana@go-jek.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25 23:04:02 +11:00
9294c5aa0a
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:03:24 +00:00
81c51ec51c
[Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c ( #12188 )
...
* update keyboards/helix/pico/keymaps/mtei/keymap.c
Stopped using the LAYOUT_kc macro. (this is response to #12160 )
There is no change in the generated binary.
* small update pico/keymaps/mtei/keymap.c
2021-03-25 23:02:54 +11:00
712c9fc848
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:02:24 +00:00
b5a12fa6d3
[Keymap] ANAVI Macro Pad 2 add git keymap ( #12212 )
...
This keymap for ANAVI Macro Pad 2 contains popular git commands
typed out and executed with a single key:
- left key: git commit -s
- right key: git push
Signed-off-by: Leon Anavi <leon@anavi.org>
2021-03-25 23:01:45 +11:00
96a6214316
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:01:35 +00:00
29c82cfb33
Add RGB Matrix suspend wake functions to BM40 ( #12246 )
...
* Add suspend wake functions for RGB Matrix
* Add suspension RGB functions to Planck/rev6 and Preonic/rev3
* Add suspend wake to Mark 65
* Revert changes to planck and preonic
* Remove changes to The Mark65
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25 23:01:03 +11:00
d2b405066d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:55:36 +00:00
2cd684f8e0
add massdrop/alt/hlmtre keymap, add .exe to gitignore ( #12191 )
...
* add massdrop/alt/hlmtre keymap, add .exe to gitignore
* changes request in PR (license header and fix gitignore)
Co-authored-by: Matt Weller <matthew.weller@nvih.org>
2021-03-25 22:55:01 +11:00
ea1ed13bc8
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:53:33 +00:00
c4d05010cb
Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md ( #12221 )
...
* Daisy first commit buggy
* buggy still underglow crash
* Daisy V1
* ReadMe Updates
2021-03-25 22:53:30 +11:00
6276f54752
Add suspend wake functions for The Mark:65's RGB Matrix ( #12245 )
...
* Add suspend wake functions for RGB Matrix
* Add USB suspend definition to config.h
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-25 22:52:53 +11:00
c3483458fe
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:51:33 +00:00
572395ac20
TKC GodSpeed75: add RGB LED support ( #12278 )
...
* GodSpeed75: add RGB support
* GodSpeed75: minor updates
* GodSpeed75: minor updates
* GodSpeed75: restore chconf.h
* GodSpeed75: restore chconf.h
* GodSpeed75: restore chconf.h
2021-03-25 22:51:02 +11:00
ba5aacbb95
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:50:49 +00:00
95c74ae4ae
add via support for bm68rgb ( #12275 )
...
* add via support for bm68rgb
* add newline to keymap.c
2021-03-25 22:50:17 +11:00
a2165b38a0
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:49:40 +00:00
3fc710e0b1
Add XT65 keyboard ( #11998 )
...
* Add XT65 keyboard
* Create readme.md
* Updated readme.md and rules.mk
* Updated config.h and readme.md
* Update imgur link
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kopibeng/xt65/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/kopibeng/xt65/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:49:37 +11:00
dd0a35273c
added twelvekey ( #12281 )
...
* added twelvekey
* rename layout
2021-03-25 22:48:59 +11:00
e86b7d0c13
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:47:36 +00:00
cf7404630e
ISO Layouts fix ( #12319 )
2021-03-25 22:47:03 +11:00
a3760c0891
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:39:24 +00:00
1d706bd77c
handwired/bolek: correct key object order ( #12356 )
2021-03-25 22:38:52 +11:00
87f6df0655
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:57 +00:00
a74846a0db
Added wilba.tech WT60-H2 ( #12348 )
...
* Added wilba.tech WT60-H2
* fix typo
* Fix error in keymap
2021-03-25 22:36:52 +11:00
25b7a5d531
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:36:29 +00:00
038d9118b6
Added wilba.tech WT65-G2 ( #12360 )
2021-03-25 22:36:24 +11:00
be771e5fd2
Added wilba.tech WT60-H3 ( #12354 )
...
* Added wilba.tech WT60-H2
* fix typo
2021-03-25 22:35:54 +11:00
c7436e667d
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:49 +00:00
1fbee7c316
(Re)Fixing K-type RGB lighting ( #12084 )
...
* initial rgb driver fix
* added underglow LEDs and fixed typo in RGB locations
* removed test code
* added my key maps
* updated rgb keymap to work with changes
* refactored my code to make it more maintainable and updated keymaps.
* added GPL licence
* Turned off matrix scan rate debug info
* added checks if RGB matrix is enabled to fix errors when building keymaps without RGB matrix enabled
* Apply suggestions from code review by fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
* Renamed led driver file to be less ambiguous
* Renamed is31fl3733 driver files to is31fl3733-dual
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 22:35:18 +11:00
183dde75de
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 11:35:06 +00:00
8b39ae13c7
add equator ( #12369 )
...
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
921f1ba4cf
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 07:06:41 +00:00
c59fb1b477
feat(keymaps): Changes to crkbd/keymaps/armand1m layout and README.md update ( #12252 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-25 18:06:30 +11:00
e7cb7bc737
Roses Lite layout macro touch-up ( #12357 )
2021-03-25 18:05:59 +11:00
1bb04ea598
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 05:29:33 +00:00
QMK Bot
Anthon van der Neut
Sendy Aditya Suryana
Liyang HU
Takeshi Nishio
ploopyco
Albert Y
Naoto Takai
Takeshi ISHII
Leon Anavi
Matt W
Blake
TerryMathews
peepeetee
kopibeng
kb-elmo
Matteo Montemarani
James Young
Wilba
Andrew-Fahmy
Brandon Claveria
Armando Magalhães