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
23,388 Commits 63 Branches 1,613 Tags 1.2 GiB
b1f814a2b9
Commit Graph

23388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot
b1f814a2b9 Merge remote-tracking branch 'origin/develop' into xap 2022-08-31 14:17:56 +00:00
Ryan
bb6f028833
Move bootloader.mk to platforms (#18228) 2022-08-31 07:17:24 -07:00
QMK Bot
6e2c02f3db Merge remote-tracking branch 'origin/develop' into xap 2022-08-31 07:17:11 +00:00
Marek Kraus
0237ff0c62
[Core] Rework PS/2 driver selection (#17892) 
* [Core] Rework PS/2 driver selection

Enabling and selecting PS/2 driver was using old approach,
so it was reworked to current approach, inspired by Serial
and WS2812 driver selections.

* [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection

* [Docs] Update PS/2 documentation to use new PS/2 driver selection

* Fix indentation

* [Core] Add PS2 to data driver

* Fix oversight in property name

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

* Add PS/2 pins to data driven mappings

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-08-31 09:16:07 +02:00
QMK Bot
c87899aa27 Merge remote-tracking branch 'origin/develop' into xap 2022-08-31 05:21:13 +00:00
QMK Bot
ba7030d216 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 05:20:33 +00:00
Ryan
6f804f76b4
qmk lint: fix TypeError (#18226) 2022-08-31 15:20:00 +10:00
QMK Bot
1b46e264f8 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 18:30:31 +00:00
QMK Bot
c249afefc6 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 18:29:41 +00:00
Andrew Kannan
bc538e3776
[Keyboard] CannonKeys Malicious Ergo (#17076) 
* Add Malicious Ergo keyboard to QMK

* Update layout

* update info.json

* update info.json again

* Update info.json again

* i h8 info.json

* its default not all

* Update keyboards/cannonkeys/malicious_ergo/config.h

* Add bootloader instructions and license header

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/rules.mk

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Remove rotation from info.json

* Remove labels

* Update keyboards/cannonkeys/malicious_ergo/readme.md

* Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h

* Revise info.json again

* whitespace fix

* Apply suggestions from code review

Move pid/vid into info json
Fix rounding errors in info json

Thanks to fauxpark and noroadsleft!
 2022-08-30 11:29:05 -07:00
zvecr
198e761173 Remove 3.10+ type union 2022-08-30 18:48:37 +01:00
QMK Bot
e144225847 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 09:51:24 +00:00
QMK Bot
757a03cf1a Merge remote-tracking branch 'origin/master' into develop 2022-08-30 09:50:48 +00:00
yiancar
a9e726501d
[Keyboard] Add NK65B (#18211) 
Co-authored-by: yiancar <yiancar@gmail.com>
 2022-08-30 02:50:43 -07:00
yiancar
907d7bfc54
[Keyboard] Add NK87B (#18210) 
Co-authored-by: yiancar <yiancar@gmail.com>
 2022-08-30 02:50:00 -07:00
QMK Bot
4cee24a15c Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 08:41:43 +00:00
QMK Bot
ef4f73ff00 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:41:07 +00:00
Drashna Jaelre
092dd58e34
[Keyboard] Fix layout macro for Cannonkeys Atlas keyboard (#18216) 2022-08-30 01:40:35 -07:00
QMK Bot
057c86d268 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 08:36:54 +00:00
QMK Bot
ae81e998ad Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:36:21 +00:00
jack
df4b01b433
fix boardsource/lulu (#18217) 2022-08-30 09:34:39 +01:00
QMK Bot
ea36c25732 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 08:20:35 +00:00
Jeff Epler
9632360caa
Use a macro to compute the size of arrays at compile time (#18044) 
* Add ARRAY_SIZE and CEILING utility macros

* Apply a coccinelle patch to use ARRAY_SIZE

* fix up some straggling items

* Fix 'make test:secure'

* Enhance ARRAY_SIZE macro to reject acting on pointers

The previous definition would not produce a diagnostic for
```
int *p;
size_t num_elem = ARRAY_SIZE(p)
```
but the new one will.

* explicitly get definition of ARRAY_SIZE

* Convert to ARRAY_SIZE when const is involved

The following spatch finds additional instances where the array is
const and the division is by the size of the type, not the size of
the first element:
```
@ rule5a using "empty.iso" @
type T;
const T[] E;
@@

- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)

@ rule6a using "empty.iso" @
type T;
const T[] E;
@@

- sizeof(E)/sizeof(T)
+ ARRAY_SIZE(E)
```

* New instances of ARRAY_SIZE added since initial spatch run

* Use `ARRAY_SIZE` in docs (found by grep)

* Manually use ARRAY_SIZE

hs_set is expected to be the same size as uint16_t, though it's made
of two 8-bit integers

* Just like char, sizeof(uint8_t) is guaranteed to be 1

This is at least true on any plausible system where qmk is actually used.

Per my understanding it's universally true, assuming that uint8_t exists:
https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1

* Run qmk-format on core C files touched in this branch

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
 2022-08-30 10:20:04 +02:00
QMK Bot
5f1f00298b Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 08:04:51 +00:00
QMK Bot
2c5aa98143 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 08:04:19 +00:00
precondition
6f2c173743
Expand on the differences between Caps Word and Caps Lock (#18139) 
* Expand on the differences between Caps Word and Caps Lock

* Add the equiv default KC_ next to intl alias

* It's configurable so it's not a problem
 2022-08-30 10:03:25 +02:00
QMK Bot
c06778e432 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 07:21:20 +00:00
QMK Bot
8067c3bff5 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 07:20:44 +00:00
jack
035e7fdb8b
Add boardsource/lulu RP2040 support (#18200) 
by waffle87
 2022-08-30 08:20:05 +01:00
QMK Bot
ab1ecfbbd2 Merge remote-tracking branch 'origin/develop' into xap 2022-08-30 03:04:29 +00:00
QMK Bot
4a7a4b2b94 Merge remote-tracking branch 'origin/master' into develop 2022-08-30 03:03:51 +00:00
Xelus22
f3d52d8fe8
[Keyboard] Kangaroo Rev2 (#18199) 2022-08-29 20:03:30 -07:00
Less/Rikki
7eb71f72a7
[Keyboard] jacky_studio/piggy60 refactor (#18197) 2022-08-29 20:03:16 -07:00
QMK Bot
986b77bff6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 19:20:28 +00:00
QMK Bot
1a33b5a479 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 19:19:56 +00:00
3araht
f04336ff46
Redefinition of MIN is avoided in midi.c (#18203) 2022-08-29 12:18:53 -07:00
QMK Bot
8fcba695ad Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 18:26:36 +00:00
QMK Bot
774aa2499d Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:26:02 +00:00
Felix Jen
de1d6b6f15
[Keyboard] Add sinanju WK (#17736) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-29 11:25:20 -07:00
QMK Bot
e8d5c59e31 Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 18:23:46 +00:00
QMK Bot
bf77307ffb Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:23:39 +00:00
Felix Jen
a6b47de732
[Keyboard] Add Peaker keyboard (#17920) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-29 11:23:23 -07:00
Felix Jen
ccb244d5ed
[Keyboard] Add Trailblazer Avalon (#17568) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-29 11:22:54 -07:00
QMK Bot
f87f802d6c Merge remote-tracking branch 'origin/master' into develop 2022-08-29 18:22:52 +00:00
Christian Solje
22136f8135
[Keymap] Add csolje 42 keymap for the cantor (#18125) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Christian Solje <csolje@gn.com>
 2022-08-29 11:22:01 -07:00
QMK Bot
7f943376c5 Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 18:05:48 +00:00
Ryan
ef775d0fc8
Fix incorrect bluetooth.driver rules.mk mapping (#18205) 2022-08-29 19:05:05 +01:00
QMK Bot
5defb67dbb Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 17:17:52 +00:00
Stefan Kerkmann
e99ec28f5f
[Core] Introduce pointing device specific debug messages (#17663) 2022-08-29 19:16:49 +02:00
QMK Bot
44b30e559d Merge remote-tracking branch 'origin/develop' into xap 2022-08-29 04:53:38 +00:00