david
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,046 Commits
1 Branch
0 Tags
232 MiB
miryoku-merge-master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1581ea48dc'
${ noResults }
Commit Graph

15046 Commits (1581ea48dcd48d0d3f42cc09b388c468aedec45d)
 

Author SHA1 Message Date
Zach White 1581ea48dc
Fix develop (#12039) 
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to
 5 years ago
QMK Bot 23ed6c4ec0 Merge remote-tracking branch 'origin/master' into develop 5 years ago
YangPiCui 804d5c1c5d
[Keyboard] Evk v1.3 add a key (#11880) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 5 years ago
QMK Bot 2485bbe784 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Danny 6a94e25f6d
[Keyboard] Add VIA support to SX60 and update default keymap (#11908) 5 years ago
github-actions[bot] d99e330548
Format code according to conventions (#12024) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 5 years ago
Nick Brassel abe189377c
[BUG] Massdrop develop rgb fix (#12022) 
* Allow for disabling RGB_MATRIX on Massdrop boards.

* Fixup init sequence.

* Make some functions static as they've got very generic names.
 5 years ago
QMK Bot 4dc8a2dd6f Merge remote-tracking branch 'origin/master' into develop 5 years ago
Drashna Jaelre d4be96e9dd
[Keyboard] Fixup issues with Titan65 (#12002) 
* [Keyboard] Titan64 - Fix RGB Matrix config

* Fix up keymaps
 5 years ago
fauxpark 23fd1aee00 Merge remote-tracking branch 'upstream/master' into develop 5 years ago
Ryan 39694d5eb0
V-USB suspend refactor (#11891) 5 years ago
Zach White 23ef327e11 make LAYOUT parsing more robust 5 years ago
Nick Brassel ba0b965c42
ChibiOS conf upgrade for daji/seis_cinco (#12001) 
daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625
 5 years ago
QMK Bot 285d0c3d7d Merge remote-tracking branch 'origin/master' into develop 5 years ago
npspears 46f4422a87
[Keyboard] Atlas alps/mx PCB addition (#11884) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 5 years ago
QMK Bot bee1b553cd Merge remote-tracking branch 'origin/master' into develop 5 years ago
Rys Sommefeldt 215caad320
[Keyboard] CapsUnlocked CU80 v2 (#11736) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
 5 years ago
Drashna Jael're 146b042514
Merge remote-tracking branch 'origin/master' into develop 5 years ago
Drashna Jaelre 0b69e4df81
[Keymap] Drashna Updates - Split+OLED edition (#11968) 5 years ago
QMK Bot 2abfa624c9 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Ikta 11146ecd08
pill60 fix info.json to be used in configurator (#11979) 5 years ago
James Young 76e67a97f4
Bugfix for Jacky Studio keyboards (#11981) 
PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.
 5 years ago
QMK Bot 6bbec56d09 Merge remote-tracking branch 'origin/master' into develop 5 years ago
SneakboxKB c868f93755
[Keyboard] Disarray (#11583) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
 5 years ago
QMK Bot eb7edaf4dc Merge remote-tracking branch 'origin/master' into develop 5 years ago
Alex Paulescu 150ab564a3
[Keyboard] Add Manibus keyboard and layout from Blank Tehnologii (#11832) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 5 years ago
QMK Bot eb0fffbd78 Merge remote-tracking branch 'origin/master' into develop 5 years ago
James 37e14fd02b
[Keyboard] Tokyo Keyboard alix40 initial commit (#11918) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>
 5 years ago
QMK Bot a9fbefcd87 Merge remote-tracking branch 'origin/master' into develop 5 years ago
toraifu 36999494d6
[Keyboard] Add Daji Seis Cinco (#11955) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 5 years ago
QMK Bot 00d70925df Merge remote-tracking branch 'origin/master' into develop 5 years ago
QMK Bot 998c4c93a2 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Rys Sommefeldt d1a92aa52a
[Keyboard] Graystudio COD67 VIA support (#11961) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 5 years ago
Joshua Diamond 5660d80bb0
[Keyboard] reduce confusion for kbdfans/kbd75 rounds/revisions (#11972) 5 years ago
Ryan 316dcf4960
Clean up some user keymaps specifying MCU (#11966) 5 years ago
QMK Bot c1e6febef7 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Maxime Coirault e1e66c78bf
[Keymap] Add via support to Durgod K320 (#11960) 
Co-authored-by: Maxime Coirault <maxime.coirault@zerokeyboard.com>
 5 years ago
QMK Bot 329d5583e0 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Ross Montsinger b69614b98b
[Keyboard] Rebound: change vendor and product ID for VIA (#11965) 5 years ago
QMK Bot 29c19b6f40 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Ikta 311bff3d56
[Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919) 5 years ago
QMK Bot 14f0f8ce65 Merge remote-tracking branch 'origin/master' into develop 5 years ago
IFo Hancroft a3934664dd
[Keymap] Adding my v60 Type R keymap (#11911) 5 years ago
QMK Bot 3b4b3c827c Merge remote-tracking branch 'origin/master' into develop 5 years ago
IFo Hancroft 46a22c9e70
[Keymap] My Prime_E Keymap (#11899) 5 years ago
QMK Bot 1216e807c0 Merge remote-tracking branch 'origin/master' into develop 5 years ago
IFo Hancroft bb9316a2f9
[Keymap] My Idobo Keymap (#11897) 5 years ago
IFo Hancroft 516afb0343
[Keymap] My ErgoDash Keymap (#11895) 5 years ago
QMK Bot 8463553d71 Merge remote-tracking branch 'origin/master' into develop 5 years ago
Jonathan Law 8760ff523d
[Keymap] Bongo Cat + WPM Counter OLED keymap (#11871) 5 years ago