184c553cab
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:59:15 +00:00
6876263961
[Keyboard] KBD67 Hotswap VIA Support ( #12351 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:58:42 -07:00
fc8495a744
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:57:51 +00:00
4caeb64888
[Keyboard] Added wilba.tech WT70-JB ( #12347 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:57:18 -07:00
428e9e7886
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:48:53 +00:00
70540a1f74
[Keyboard] Added RAMA WORKS KARA ( #12346 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:48:26 -07:00
d475f04c78
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 03:44:40 +00:00
f0dc206784
[Keyboard] Update sixkeyboard VID/PID ( #12345 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 20:44:06 -07:00
39e1b5b962
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:04:56 +00:00
caca8949de
[Keymap] remove kc layout from levinson jyh keymap ( #12301 )
...
Co-authored-by: Jason Yamada-Hanff <jyamada-hanff@chromologic.com>
2021-04-02 19:04:28 -07:00
c375ae3ec7
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 02:03:00 +00:00
0232941b1d
[Keyboard] Added VIA support to dmqdesign/spin ( #12300 )
...
Co-authored-by: Kraus, Adam <adam.kraus@mines.sdsmt.edu>
2021-04-02 19:02:26 -07:00
f561b857f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:52:10 +00:00
63445be4e5
[Keyboard] Add FoldKB ( #12255 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 17:51:39 -07:00
8880e89bcd
Big quantum_keycodes cleanup ( #12249 )
2021-04-02 17:45:56 -07:00
4c981953ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 00:26:01 +00:00
619885b484
[Keyboard] Add Lumberjack keyboard ( #12124 )
2021-04-02 17:25:23 -07:00
41723340de
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:45:17 +00:00
6592f83589
[Keymap] for Ibm m122 ( #11704 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-02 14:44:46 -07:00
56560a859b
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:26:07 +00:00
43d74d7fa5
[Keyboard] Add CherryB Studio Keyboards ( #11475 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-04-02 14:25:44 -07:00
65fab0ef5b
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 21:24:42 +00:00
cd981ec56a
`qmk doctor`: Fix WSL /mnt check ( #12466 )
2021-04-02 22:24:09 +01:00
6e531d0ccc
Merge remote-tracking branch 'origin/master' into develop
2021-04-02 10:45:01 +00:00
12f308748f
qmk doctor: Display macOS and Windows versions, and add WSL warning for /mnt ( #12441 )
2021-04-02 21:44:27 +11:00
c1ea97e15d
Merge remote-tracking branch 'origin/master' into develop
2021-04-01 01:59:03 +00:00
ac0ba832c7
change BM68 RGB USB Device descriptor device name ( #12418 )
...
* change styling USB Device descriptor device name to reflect stylistic choices of the developer
2021-03-31 18:58:23 -07:00
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
QMK Bot
MechMerlin
Wilba
jrdsgl
Jason Yamada-Hanff
adamkraus6
Danny
Ryan
Paul James
dsanchezseco
Duong Anh
peepeetee
Nick Brassel
Michael Stapelberg
github-actions[bot]
kb-elmo
Zach White
James Young
joedinkle
Anthon van der Neut
Matt Snell
Oleg Senchenko