summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-1/+1
|\|
| * Fix issues when manually shifting characters and Auto Shift (#12083)Drashna Jaelre2021-03-251-1/+1
| | | | | | 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-259-0/+332
|\|
| * Add new Keyboard: SENDYYeah Bevi (#12011)Sendy Aditya Suryana2021-03-259-0/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2516-0/+606
|\|
| * Add unison v04 keyboard (#11982)Takeshi Nishio2021-03-2516-0/+606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | keyboards/xd60/readme.md: link to schematic on EasyEDA (#12018)Liyang HU2021-03-251-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-9/+8
|\|
| * Format code according to conventions (#12380)github-actions[bot]2021-03-251-9/+8
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-2/+10
|\|
| * fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and ↵purple-rw2021-03-251-2/+10
| | | | | | | | | | TAPPING_TERM_PER_KEY are defined (#12125) Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2532-1/+1465
|\|
| * Fix Kinetic speed condition (#12139)즈눅2021-03-251-1/+1
| |
| * ADNS-5050 / Ploopy Nano / Ploopy Mini Trackballs (#11994)ploopyco2021-03-2531-0/+1464
| | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-254-54/+17
|\|
| * Minor improvements to BM68RGB (#12156)Albert Y2021-03-254-54/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-253-20/+2
|\|
| * Removed unused RGBLED_TIMER_TOP and F_CPU macros from quantum/rgblight.[ch] ↵Takeshi ISHII2021-03-252-19/+0
| | | | | | | | (#12233)
| * Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same (#12203)Naoto Takai2021-03-251-1/+2
| | | | | | | | | | * Make the size of MATRIX_ROW_PINS and MATRIX_ROW_PINS_RIGHT the same * Use NO_PIN instead of duplicate pin
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2511-0/+1673
|\|
| * Add Nix Studio OXALYS80 Keyboard (#12118)Sendy Aditya Suryana2021-03-2511-0/+1673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-105/+136
|\|
| * [Keymap] Update keyboards/helix/pico/keymaps/mtei/keymap.c (#12188)Takeshi ISHII2021-03-251-105/+136
| | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+48
|\|
| * [Keymap] ANAVI Macro Pad 2 add git keymap (#12212)Leon Anavi2021-03-251-0/+48
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-252-0/+14
|\|
| * Add RGB Matrix suspend wake functions to BM40 (#12246)Albert Y2021-03-252-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-0/+131
|\|
| * add massdrop/alt/hlmtre keymap, add .exe to gitignore (#12191)Matt W2021-03-251-0/+131
| | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2510-2/+297
|\|
| * Add Daisy, a macropad with dual rotary encoders + update Scarlet readme.md ↵Blake2021-03-258-2/+285
| | | | | | | | | | | | | | | | | | | | | | (#12221) * Daisy first commit buggy * buggy still underglow crash * Daisy V1 * ReadMe Updates
| * Add suspend wake functions for The Mark:65's RGB Matrix (#12245)Albert Y2021-03-252-0/+12
| | | | | | | | | | | | | | * Add suspend wake functions for RGB Matrix * Add USB suspend definition to config.h Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-251-10/+13
|\|
| * Fix handling multiples of the same MIDI note (fixes bug brought up in issue ↵jakobkg2021-03-251-10/+13
| | | | | | | | | | | | | | #10199) (#11639) * Fix handling multiples of the same MIDI note * Extend MIDI note status to fix note releases
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-255-13/+6
|\|
| * TKC GodSpeed75: add RGB LED support (#12278)TerryMathews2021-03-255-13/+6
| | | | | | | | | | | | | | | | | | | | | | | |<