da51302345
Merge remote-tracking branch 'origin/master' into develop
2021-03-31 13:09:34 +00:00
c5ddada32e
Remove leftover old implementations of the lily58 split code. ( #12442 )
2021-04-01 00:09:01 +11:00
9d3b11d485
add kinesis/kint36 ( #10171 )
...
This moves the config_common.h into the files that include ../config.h,
so that the kint36/config.h does not include it (which would cause
compilation errors).
2021-03-31 10:41:41 +11:00
a8889718aa
Merge remote-tracking branch 'origin/master' into develop
2021-03-30 23:17:00 +00:00
8a950a7116
Format code according to conventions ( #12437 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-31 10:16:14 +11:00
1704eb16cd
Merge remote-tracking branch 'origin/master' into develop
2021-03-30 22:34:06 +00:00
64551a8386
Allow for clang-format up to v20. ( #12407 )
2021-03-31 09:33:26 +11:00
e95a4f4f52
core: add pin_defs for MK66F18 ( #12419 )
...
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
2021-03-30 21:11:40 +11:00
c738d60cef
Merge remote-tracking branch 'origin/master' into develop
2021-03-29 03:46:52 +00:00
ae59a51193
Added the 64_ansi (GK64) layout to DZ60 ( #12378 )
...
* add gk64 layout
* Apply suggestions from code review
2021-03-28 20:46:17 -07:00
2ae38e9c43
LED Matrix: Config functions ( #12361 )
2021-03-28 17:59:44 +11:00
0d1162f180
Merge remote-tracking branch 'origin/master' into develop
2021-03-27 15:56:21 +00:00
5dc7951dc0
add utf-8 encoding to the open() call ( #12388 )
2021-03-27 08:55:47 -07:00
ea472b46c9
Merge remote-tracking branch 'origin/master' into develop
2021-03-27 08:04:42 +00:00
a866fbf381
handwired/rs60: use LAYOUT_ortho_5x12 directly ( #12397 )
...
This commit renames the macro LAYOUT to LAYOUT_ortho_5x12, and removes the alias.
2021-03-27 19:03:42 +11:00
76f8e84edd
Merge remote-tracking branch 'origin/master' into develop
2021-03-26 17:58:46 +00:00
8af7200085
Pull Request for babyV keyboard ( #12112 )
...
* Add files via upload
* Add files via upload
* 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
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Create CaseFiles
* Delete CaseFiles
* Create Readme.md
* Add files via upload
* Add files via upload
* Add files via upload
* Create Readme.md
* Create Readme.md
* Create Readme.md
* Delete S50-Top.dxf
* Delete S50-Top.svg
* Add files via upload
* Update Readme.md
* Update Readme.md
* Update Readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Updating encoder code.
* Update encoder code.
* Case files and encoder update.
* Update encoder code.
* Updates to encoder code.
* Syntax fixes.
* Create readme.md
* Add files via upload
* Create readme.md
* Add files via upload
* Removed case files from s50 branch
* Format changes.
* Add case files to Master branch
* Syntax fixes
* Recommended code changes for pull request into QMK.
* Recommended change for pull request.
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Delete config.h
* Add config.h and rules.mk files to the joedinkle layout for autoshift.
* Delete S50-Top-New.dxf
* Delete S50-Top-New.svg
* New case files
Revision to S50 top file.
* Added 3D printed case STL and DXF files.
* Create readme.md
* Update readme.md
* Added babyV firmware
* Update readme.md
* QMK PR preperations.
* Delete config.h
* Delete keymap.c
* Delete readme.md
* Delete rules.mk
* Delete config.h
* Delete keymap.c
* Delete readme.md
* Changes for QMK formatting.
* Removed excess files
Removed case files and schematics from the joedinkle branch. The joedinkle branch is primarily for QMK PRs. These files will remain in the master branch of this fork.
* Add SPRH keyboard
* Formatting and cleanup.
* Edits to default Layout
* Readme Update
* Formatting changes.
* Deleted obsolete code.
* Formatting changes and file removal for QMK PR
* Deleted S50
S50 is a completed keyboard and is located in the Master Branch. S50 removed from the in progress branch.
* Delete Read Me
* Replaced S50 files accidentally deleted in merge.
* Added split layout for SPRH
* Added Files for Blvd PCB
* Add PCB files for Blvd
* Added compressed kicad projects
* Removed obsolete PCB files
* Added PCB files
* Added personal babyV keymap.
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* babyV-added info.json and updated default keymap
* Added case files for babyV
* Update readme.md
* Update readme.md
* Update readme.md
* Updated default keymap.
* Cleaned up keymap folder.
* Added info.json for babyV
* babyV updates
* PR preps
* PR preps
* Update .gitignore
* Delete Backlight.png
* Delete MCU.png
* Delete Matrix.png
* Delete readme.md
* Rename Readme.md to readme.md
* Requested PR changes.
* Update rules.mk
* Update rules.mk
* readme and rules.mk updates
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/babyv/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/eyeohdesigns/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update readme.md
* Update keyboards/eyeohdesigns/babyv/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-26 13:58:13 -04:00
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
0eb36b5e9a
Merge remote-tracking branch 'origin/master' into develop
2021-03-26 02:22:03 +00:00
aa2b4a688b
[docs] Add IO Warning to WSL section of Getting Started ( #12384 )
...
* Add IO Warning to WSL section of Getting Started
* FauxPark suggestion (thanks!)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-26 13:21:21 +11:00
67252c246c
Format code according to conventions ( #12381 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-25 23:44:37 +11:00
b05565f368
Fix connection issue in split keyboards when slave and OLED display are connected via I2C, fix #9335 ( #11487 )
...
* In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335
* Revert "In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335"
This reverts commit 3ee639e1f35fb0fe257fc3ba1095124e039af7d7.
* In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335
* Update drivers/oled/oled_driver.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: osenchenko <osechenko@chiefmate.io>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-25 23:42:25 +11:00
e2b652d95f
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:41:48 +00:00
57475caab0
Fix issues when manually shifting characters and Auto Shift ( #12083 )
...
Specifically, when using the Auto-Shift feature, if you hold and roll shift, it would not actually shift the character that you hit after the shift
2021-03-25 23:41:19 +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
25f1a3d759
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:20:42 +00:00
0a056cfd81
Format code according to conventions ( #12380 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-25 23:18:59 +11:00
5a0be4c6d8
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:14:17 +00:00
5c1442766c
fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined ( #12125 )
...
Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>
2021-03-25 23:13:41 +11:00
2df1b124a7
Merge remote-tracking branch 'origin/master' into develop
2021-03-25 12:11:36 +00:00
816f2f9cc2
Fix Kinetic speed condition ( #12139 )
2021-03-25 23:11:16 +11: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
b664db3cf3
Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgblight.[ch] ( #12233 )
2021-03-25 23:05:38 +11: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
QMK Bot
Nick Brassel
Michael Stapelberg
github-actions[bot]
kb-elmo
Ryan
Zach White
James Young
joedinkle
Anthon van der Neut
Matt Snell
Oleg Senchenko
Drashna Jaelre
Sendy Aditya Suryana
Liyang HU
Takeshi Nishio
purple-rw
즈눅
ploopyco
Albert Y
Takeshi ISHII
Naoto Takai
Leon Anavi