summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-011-1/+1
|\
| * change BM68 RGB USB Device descriptor device name (#12418)peepeetee2021-03-311-1/+1
| | | | | | * change styling USB Device descriptor device name to reflect stylistic choices of the developer
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-315-1050/+2
|\|
| * Remove leftover old implementations of the lily58 split code. (#12442)Nick Brassel2021-04-015-1050/+2
| |
* | add kinesis/kint36 (#10171)Michael Stapelberg2021-03-3111-2/+287
| | | | | | | | | | 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).
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-301-1/+1
|\|
| * Format code according to conventions (#12437)github-actions[bot]2021-03-311-1/+1
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-301-1/+1
|\|
| * Allow for clang-format up to v20. (#12407)Nick Brassel2021-03-311-1/+1
| |
* | core: add pin_defs for MK66F18 (#12419)Michael Stapelberg2021-03-301-0/+81
| | | | | | This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-293-0/+113
|\|
| * Added the 64_ansi (GK64) layout to DZ60 (#12378)kb-elmo2021-03-283-0/+113
| | | | | | | | | | | | * add gk64 layout * Apply suggestions from code review
* | LED Matrix: Config functions (#12361)Ryan2021-03-283-94/+104
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-271-1/+1
|\|
| * add utf-8 encoding to the open() call (#12388)Zach White2021-03-271-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-272-9/+7
|\|
| * handwired/rs60: use LAYOUT_ortho_5x12 directly (#12397)James Young2021-03-272-9/+7
| | | | | | This commit renames the macro LAYOUT to LAYOUT_ortho_5x12, and removes the alias.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2611-0/+402
|\|
| * Pull Request for babyV keyboard (#12112)joedinkle2021-03-2611-0/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-261-2/+2
|\|
| * Minor typo in comments Colemak DM-MK -> DH-MK (#10721)Anthon van der Neut2021-03-261-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-261-0/+2
|\|
| * [docs] Add IO Warning to WSL section of Getting Started (#12384)Matt Snell2021-03-261-0/+2
| | | | | | | | | | | | | | | | | | * 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>
* | Format code according to conventions (#12381)github-actions[bot]2021-03-251-1/+3
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Fix connection issue in split keyboards when slave and OLED display are ↵Oleg Senchenko2021-03-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |