gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-11 12:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,649 Commits 63 Branches 1,613 Tags 1.2 GiB
10bd5e304c
Commit Graph

22649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
302fa11d1f Merge remote-tracking branch 'origin/master' into develop 2022-07-23 20:23:43 +00:00
4pplet
f1ccd60458
[Keyboard] 4pplet Perk60 (#16853) 
* adding perk60 iso

adding perk60 iso

* Update info.json

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Delete chconf.h

* Update keyboards/4pplet/perk60_iso/rev_a/rules.mk

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.c

* Update rules.mk

* Update config.h

* removing a few RGB effects

* removing more effects

* Update keyboards/4pplet/perk60_iso/rev_a/config.h

* Update keyboards/4pplet/perk60_iso/keymaps/default/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/default/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/rev_a/rev_a.h

* Update keyboards/4pplet/perk60_iso/keymaps/via/keymap.c

* Update keyboards/4pplet/perk60_iso/info.json

* Update keyboards/4pplet/perk60_iso/rev_a/rules.mk
 2022-07-23 13:23:14 -07:00
QMK Bot
17111d7383 Merge remote-tracking branch 'origin/develop' into xap 2022-07-23 18:21:54 +00:00
JayceFayne
d02cefe613
implement tap_code16_delay (#17748) 2022-07-23 19:21:20 +01:00
QMK Bot
bfc8f5402d Merge remote-tracking branch 'origin/develop' into xap 2022-07-23 16:44:11 +00:00
jack
a6f3194397
Add ability to enter bootloader mode from QK_MAKE (#17745) 2022-07-23 17:43:32 +01:00
QMK Bot
c76869604a Merge remote-tracking branch 'origin/develop' into xap 2022-07-23 16:43:30 +00:00
QMK Bot
8254d73fd4 Merge remote-tracking branch 'origin/master' into develop 2022-07-23 16:42:55 +00:00
Niko Wenselowski
1f42a8ccdd
Fix test logic to check for both keymaps (#17761) 
Python will evaluate first the left and then the right side of the and operator.

The left side would previously return True based on the truthiness logic that treats any non-emptry string as true.

It would not check if the desired keymap exists.

If the left side is true it will evaluate the right side which will check for the existance of a specific keymap.

With this change the check for existance of two keymaps is implemented.
 2022-07-23 17:42:19 +01:00
QMK Bot
cd6cd58d1c Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 22:29:21 +00:00
jpe230
c586cfda48
(develop) Update bootmagic for Adafruit Macropad (#17755) 2022-07-22 23:28:51 +01:00
QMK Bot
a96308eadc Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 20:21:22 +00:00
QMK Bot
c39a902867 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 20:20:43 +00:00
Yuannan
2202efaf0c
Added autoclicker, better mouse, Vim like editing layer and more. (#15702) 
* Added autoclicker, better mouse, vim like FN layer and more.

* Updated docs to comply with guidelines

* Fixed Imgur links

* increased step sizes

* updated readme to reflect step size

* Added second delay array for autoclicker to compensate for RGB animation CPU loads

* better RGB effects and updated docs

* better README.md formatting

* added DEBONCE libinput workaround for Linux

* fixed formatting

* fixed typos and clarified

* fixed layer picture order

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/README.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Updated Docs and rules

* Updated with the new deferred exec API to ensure more consistant CPS

* renamed README.md to be lower case to comply with fauxpark's request

* Remapped alt to be left instead of right for compatibility reasons

* Update keyboards/dztech/dz65rgb/keymaps/yuannan/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-07-22 21:20:02 +01:00
QMK Bot
04f9e773fd Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 14:59:06 +00:00
QMK Bot
536511a32a Merge remote-tracking branch 'origin/master' into develop 2022-07-22 14:58:18 +00:00
mechlovin
8de0427fec
[Kay60] Change LED pin state and correct keycode. (#17746) 2022-07-22 15:57:03 +01:00
QMK Bot
852a69dd4d Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 13:24:10 +00:00
QMK Bot
0e81d63b64 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 13:23:36 +00:00
Aidan Gauland
de10784799
Fix compilation error in Ploopy Nano maddie keymap (#17733) 2022-07-22 14:22:56 +01:00
QMK Bot
62d5372824 Merge remote-tracking branch 'origin/develop' into xap 2022-07-22 03:43:43 +00:00
QMK Bot
f1671ec720 Merge remote-tracking branch 'origin/master' into develop 2022-07-22 03:43:08 +00:00
Sắn
b9c7d4c48d
[Keyboard] Add Krush65 Hotswap (#16692) 
* Add Krush65 Hotswap

* Led fix

* small fix

* a

* B

* move ec action to VIA keymaps

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update readme.md

* Update readme.md

* Update readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/rules.mk

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/readme.md

* Update keyboards/sawnsprojects/krush/krush65/hotswap/info.json

* Update keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.h
 2022-07-21 20:42:29 -07:00
QMK Bot
6a20e8a8d1 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 20:25:37 +00:00
QMK Bot
d681eac0ad Merge remote-tracking branch 'origin/master' into develop 2022-07-21 20:24:51 +00:00
Joel Challis
5a0e47db5e
Add reviewer/labels to dependabot PRs (#17743) 2022-07-21 21:24:07 +01:00
QMK Bot
07c431e190 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 19:55:36 +00:00
QMK Bot
bfed88dba2 Merge remote-tracking branch 'origin/master' into develop 2022-07-21 19:55:00 +00:00
dependabot[bot]
4ca99af8f5
Bump JamesIves/github-pages-deploy-action from 4.3.4 to 4.4.0 (#17742) 2022-07-21 20:54:27 +01:00
QMK Bot
e40a5999bf Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 17:17:24 +00:00
Drashna Jaelre
5f32690cba
Move Pointing Device Initialization (#17740) 
Move Pointing Device Initialization to after Split Post Initialization

If both pointing device and split is enabled, the pointing device init needs to be called after the split post init, otherwise the connection (serial/etc) isn't initialized yet, and any commands that need to send data over (such as calling the set cpi command) never get sent over.
 2022-07-21 10:16:44 -07:00
QMK Bot
4cc24bc05b Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 13:45:37 +00:00
jpe230
5c90732622
Adafruit Macropad: Add VIA keymap, fix default km (#17735) 2022-07-21 14:44:12 +01:00
QMK Bot
a377c20907 Merge remote-tracking branch 'origin/develop' into xap 2022-07-21 12:46:12 +00:00
QMK Bot
6081a8091d Merge remote-tracking branch 'origin/master' into develop 2022-07-21 12:45:28 +00:00
jonavin
7f0581cd35
Jonavin mercutio - reduce mem footprint (#17498) 
* Reduce mem footprint - remove sprintf

* remove stdio reference and use get_u8_str

Co-authored-by: Jonavin <=>
 2022-07-21 13:44:51 +01:00
QMK Bot
bb1bed38e7 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 23:54:28 +00:00
Albert Y
d510e80b89
Add Blok 2040 conversion (#17603) 2022-07-21 00:54:05 +01:00
Wilba
4efe6330c4
VIA Encoder Map Support (#17734) 2022-07-21 09:53:42 +10:00
QMK Bot
dbc77677d6 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 23:21:07 +00:00
QMK Bot
493d422406 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 23:20:34 +00:00
mechlovin
a6d70de96a
[Keyboardo] Update PID for mechlovin zed60 (#17728) 2022-07-20 16:19:51 -07:00
QMK Bot
2552b00adc Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 22:00:02 +00:00
mknj
9a31bbb3fa
fix syntax error (#17732) 2022-07-20 22:59:18 +01:00
QMK Bot
146d312cce Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 17:25:15 +00:00
Albert Y
05f30f0787
Use Pro Micro pinout for SDA/SCL (#17595) 2022-07-20 18:24:34 +01:00
QMK Bot
54414d5474 Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 17:00:52 +00:00
QMK Bot
ab45e3b993 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 17:00:18 +00:00
takashicompany
62e3f8b885
Add miniZone Keymap (#17552) 2022-07-20 17:59:40 +01:00
QMK Bot
d83e5bf9dd Merge remote-tracking branch 'origin/develop' into xap 2022-07-20 16:44:24 +00:00