gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-23 20:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,753 Commits 62 Branches 1,610 Tags 1.3 GiB
891d18d356
Commit Graph

15753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
0a453194e8 Merge remote-tracking branch 'origin/master' into develop 2021-04-09 18:49:03 +00:00
mechlovin
f744e22b49
Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series (#11977) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: vuhopkep <boy9x0@gmail.com>
 2021-04-09 20:48:30 +02:00
QMK Bot
3190c2f98d Merge remote-tracking branch 'origin/master' into develop 2021-04-09 02:42:00 +00:00
peepeetee
1a913aa12e
Fix Breaking Change date (#12272) 2021-04-09 12:41:29 +10:00
QMK Bot
d4b3d00d88 Merge remote-tracking branch 'origin/master' into develop 2021-04-08 16:48:07 +00:00
Adrian
75f83210f4
Add new handwired keyboard (Ergocheap) (#11857) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-08 18:47:24 +02:00
QMK Bot
15674d0259 Merge remote-tracking branch 'origin/master' into develop 2021-04-08 04:16:47 +00:00
Ryan
2170b75b26
qmk chibios-confmigrate: Make -i and -r required (#12515) 2021-04-08 14:16:15 +10:00
QMK Bot
52e8875eba Merge remote-tracking branch 'origin/master' into develop 2021-04-07 13:58:12 +00:00
Kosuke Adachi
d1270c9d55
Update info.json to correctly. (#12507) 2021-04-07 09:57:36 -04:00
Ryan
40c314fe5c
LED Matrix: Implement CIE1931 curve (#12417) 2021-04-07 20:06:11 +10:00
QMK Bot
69bc465ace Merge remote-tracking branch 'origin/master' into develop 2021-04-07 10:04:21 +00:00
Ryan
546dfce209
Add info.json for CK60i (#12318) 2021-04-07 20:03:45 +10:00
Nick Brassel
96acb499d2
Fix up builds that are now too big for develop branch. (#12495) 2021-04-06 16:39:31 +10:00
Nick Brassel
64a0f5a659
Add support for producing UF2-format binaries. (#12435) 
* First stab at enabling builds of UF2-format binaries.

* Add description on producing a UF2 file.
 2021-04-06 16:39:15 +10:00
QMK Bot
3ce8c9fc8f Merge remote-tracking branch 'origin/master' into develop 2021-04-04 09:10:07 +00:00
SneakboxKB
e0614e4f52
Disarray ProductID change (#12440) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@gmail.com>
 2021-04-04 11:09:43 +02:00
QMK Bot
8428cedc83 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 19:43:05 +00:00
Takeshi ISHII
49dc332a04
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259) 
* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows

* Made the layout data easier to read.
  * helix/rev2/keymaps/five_rows/keymap.c
  * helix/rev3_5rows/keymaps/five_rows/keymap.c

* The following two were made the same.
  * keymaps/five_rows/config.h
  * keymaps/five_rows/oled_display.c

The binary of the compilation result has not changed.

* update keyboards/helix/rev2/keymaps/five_rows/rules.mk

KEYBOARD_LOCAL_FEATURES_MK was moved to the end.

* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h

The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
 2021-04-04 04:42:29 +09:00
QMK Bot
9bedc6300d Merge remote-tracking branch 'origin/master' into develop 2021-04-03 16:29:37 +00:00
Joel Challis
60e1910e5b
Add WSL specific logic for avrdude device detection (#12392) 2021-04-03 17:29:06 +01:00
QMK Bot
cc4066189a Merge remote-tracking branch 'origin/master' into develop 2021-04-03 16:16:12 +00:00
Excitable Snowball
4e2ab3a177
Remove wave from requirements-dev.txt (#12387) 
This resolves to <https://pypi.org/project/Wave/>, but the places where
the `wave` module is imported make it clear that the standard library
module <https://docs.python.org/3/library/wave.html> was intended.

Was originally added in #11820 and used in the following files:
* `util/sample_parser.py`
* `util/wavetable_parser.py`
 2021-04-03 09:15:39 -07:00
github-actions[bot]
733c861052
Format code according to conventions (#12467) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-04-03 08:35:26 -07:00
QMK Bot
dd7f18f65f Merge remote-tracking branch 'origin/master' into develop 2021-04-03 15:29:28 +00:00
Zach White
41f649c9a9 fix line endings 2021-04-03 08:27:46 -07:00
Steve Purcell
d91938c19d
[nix] Use niv and poetry2nix to more easily manage dependencies (#11181) 
* [nix] Update nixpkgs to avoid issues with Big Sur

The older nixpkgs snapshot did not contain nix changes to the
compiler/linker hooks that are necessary for compatibility with MacOS
Big Sur. The fix is simply to update to a newer snapshot.

* [nix] Add a poetry manifest and use poetry to build the Python env

* [nix] Use niv to manage upstream sources like nixpkgs

* [nix] Update to newer nixpkgs snapshot

* [nix] Bump python package versions
 2021-04-03 08:05:46 -07:00
TurtleHunter
a3cd1290be
3 new LED effect animations (#9827) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
 2021-04-03 16:41:54 +02:00
QMK Bot
e90ec6a474 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 13:51:51 +00:00
kb-elmo
7d33d1bace
Added Epoch80 (#12307) 2021-04-03 15:51:21 +02:00
fauxpark
638cc50727 Merge remote-tracking branch 'upstream/master' into develop 2021-04-03 20:15:54 +11:00
github-actions[bot]
4b9f5578a0
[CI] Format code according to conventions (#12468) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-04-03 20:13:45 +11:00
QMK Bot
1444ebb7f1 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 06:20:42 +00:00
James Young
59c8672f5c
kingly_keys/ave: move RGBLight config to keyboard level (#12457) 
QMK Configurator's API can't use the RGBLight configurator when it's defined at keymap level.
 2021-04-02 23:20:11 -07:00
QMK Bot
028a0dcd3d Merge remote-tracking branch 'origin/master' into develop 2021-04-03 05:12:49 +00:00
Michael Stapelberg
a7920acff5
keymaps: fix kinesis default keymap progrm/reset keycode (#12429) 
The right-most top-most key on the Kinesis Advantage keyboard is labeled
“Progrm” and was meant to enter the Teensy bootloader as per the comment.

However, the keycode was set to KC_1, which just produces a “1”.
It should be RESET instead.

This commit fixes KC_1 to RESET in all files where the fix is needed.
The other files have already been fixed independently.
 2021-04-02 22:12:24 -07:00
QMK Bot
655927ab15 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 05:06:28 +00:00
Robert Verst
79a87a9c2b
[Keymap] Fixing userspace rverst (#12422) 
Co-authored-by: Robert Verst <robert.verst@tobit.com>
 2021-04-02 22:06:02 -07:00
QMK Bot
051e23c782 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:45:06 +00:00
Dylan Khor
8d3581a49f
[Keymap] Remove kc keymap from khord chocopad keymap (#12409) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:44:37 -07:00
QMK Bot
887d0fca0e Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:21:01 +00:00
kaylanm
cd96377312
[Keyboard] Add GON NerD TKL VIA keymap (#12309) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:20:34 -07:00
QMK Bot
358b040157 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 04:18:44 +00:00
MCKeebs
8b98e67643
[Keyboard] Add pkb65 keyboard (#12230) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 21:18:15 -07:00
QMK Bot
184c553cab Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:59:15 +00:00
MechMerlin
6876263961
[Keyboard] KBD67 Hotswap VIA Support (#12351) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:58:42 -07:00
QMK Bot
fc8495a744 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:57:51 +00:00
Wilba
4caeb64888
[Keyboard] Added wilba.tech WT70-JB (#12347) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:57:18 -07:00
QMK Bot
428e9e7886 Merge remote-tracking branch 'origin/master' into develop 2021-04-03 03:48:53 +00:00
Wilba
70540a1f74
[Keyboard] Added RAMA WORKS KARA (#12346) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-04-02 20:48:26 -07:00