6221c86186
Merge remote-tracking branch 'origin/master' into develop
2022-06-05 19:06:37 +00:00
4c48760558
Apply EXPECT_REPORT and EXPECT_EMPTY_REPORT ( #17311 )
...
...convenience macros to test cases that where missed during #17284
2022-06-05 20:06:05 +01:00
d6402fe9fb
Merge remote-tracking branch 'origin/master' into develop
2022-06-05 11:15:11 +02:00
95d20e6d8b
Fix and add unit tests for Caps Word to work with Unicode Map, Auto Shift, Retro Shift. ( #17284 )
...
* Fix Caps Word and Unicode Map
* Tests for Caps Word + Auto Shift and Unicode Map.
* Fix formatting
* Add additional keyboard report expectation macros
This commit defines five test utilities, EXPECT_REPORT, EXPECT_UNICODE,
EXPECT_EMPTY_REPORT, EXPECT_ANY_REPORT and EXPECT_NO_REPORT for use with
TestDriver.
EXPECT_REPORT sets a gmock expectation that a given keyboard report will
be sent. For instance,
EXPECT_REPORT(driver, (KC_LSFT, KC_A));
is shorthand for
EXPECT_CALL(driver,
send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A)));
EXPECT_UNICODE sets a gmock expectation that a given Unicode code point
will be sent using UC_LNX input mode. For instance for U+2013,
EXPECT_UNICODE(driver, 0x2013);
expects the sequence of keys:
"Ctrl+Shift+U, 2, 0, 1, 3, space".
EXPECT_EMPTY_REPORT sets a gmock expectation that a given keyboard
report will be sent. For instance
EXPECT_EMPTY_REPORT(driver);
expects a single report without keypresses or modifiers.
EXPECT_ANY_REPORT sets a gmock expectation that a arbitrary keyboard
report will be sent, without matching its contents. For instance
EXPECT_ANY_REPORT(driver).Times(1);
expects a single arbitrary keyboard report will be sent.
EXPECT_NO_REPORT sets a gmock expectation that no keyboard report will
be sent at all.
* Add tap_key() and tap_keys() to TestFixture.
This commit adds a `tap_key(key)` method to TestFixture that taps a
given KeymapKey, optionally with a specified delay between press and
release.
Similarly, the method `tap_keys(key_a, key_b, key_c)` taps a sequence of
KeymapKeys.
* Use EXPECT_REPORT, tap_keys, etc. in most tests.
This commit uses EXPECT_REPORT, EXPECT_UNICODE, EXPECT_EMPTY_REPORT,
EXPECT_NO_REPORT, tap_key() and tap_keys() test utilities from the
previous two commits in most tests. Particularly the EXPECT_REPORT
macro is frequently useful and makes a nice reduction in boilerplate
needed to express many tests.
Co-authored-by: David Kosorin <david@kosorin.net>
2022-06-05 09:14:02 +02:00
08c556b78b
Add keymap wrappers for introspection into the keymap. ( #17229 )
...
* Introspection handlers for keymaps.
* Renaming.
2022-06-05 10:26:02 +10:00
af84772a5f
initial 24lc32a ( #16990 )
2022-06-04 01:53:24 +01:00
b1a3f806f5
Merge remote-tracking branch 'origin/master' into develop
2022-06-04 00:45:35 +00:00
787165718d
Disable features known to cause BIOS/suspend issues ( #17270 )
2022-06-04 01:44:53 +01:00
bb324e5b3e
Merge remote-tracking branch 'origin/master' into develop
2022-06-03 11:13:22 +00:00
706194b336
Add Encoder Map Swap Hands config for boards that support both features ( #17294 )
2022-06-03 12:12:15 +01:00
267f392237
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 18:30:44 +00:00
5bcfc273ce
Fix lint errors ( #17293 )
2022-06-02 19:30:07 +01:00
b94baa8bc3
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 17:20:59 +00:00
71b928fbec
[Keyboard] Organized versions of mikeneko65 ( #16985 )
...
Co-authored-by: takishim <tadashi@kishimo.to>
2022-06-02 10:20:02 -07:00
86e93d7654
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:51:28 +00:00
9a587275cf
keyboards: fix malformed info.json files ( #17292 )
2022-06-02 17:50:08 +01:00
344b8410f7
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:38:09 +00:00
7c3cb99164
[Keymap] Fix maddie layout for ploopy/trackball_nano ( #17213 )
2022-06-02 09:37:28 -07:00
8bb2c66c88
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 16:18:53 +00:00
7ff666340c
[Keyboard] Acheron Shark alpha Encoder support ( #17266 )
2022-06-02 09:17:47 -07:00
73bd3dff8c
Merge remote-tracking branch 'origin/master' into develop
2022-06-02 13:03:13 +00:00
f330ef12b6
Add wavtype/p01_ultra ( #16513 )
...
* new fork (manta and foundation)
added foundation and manta firmware
* removed manta
* VIA compliant changes
added readme, info.json edits
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/foundation/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* removed via.json and updated readme
* Update keyboards/wavtype/foundation/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/foundation/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keymap.c
* added p01 ultra
* updated diode direction
proto used opposite diode direction
* removed foundation
* Update keyboards/wavtype/p01_ultra/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/wavtype/p01_ultra/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/wavtype/p01_ultra/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/p01_ultra/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/wavtype/p01_ultra/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-02 14:02:36 +01:00
af02baae78
Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL ( #17272 )
...
* Switch SPLIT_USB_DETECT loop to uint16_t
* Add assertion
2022-06-01 00:10:05 +01:00
f9e97fd3c3
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 21:38:36 +00:00
5b16671d7a
move RESET to QK_BOOT ( #17278 )
...
* move RESET to QK_BOOT
* fix tapping_term
2022-05-31 22:37:28 +01:00
38839a9105
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 11:32:26 +00:00
8153b55e07
Add trailing parens to `get_oneshot_mods` in feature_advanced_keycodes.md ( #17211 )
2022-05-31 21:31:47 +10:00
6fdce80822
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 08:22:54 +00:00
d5ed3ae967
[Keyboard] fix dz64rgb rgb sleep ( #17209 )
2022-05-31 01:22:07 -07:00
bbab8eb993
Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY ( #17178 )
2022-05-30 23:20:10 -07:00
ecce9900c9
Improve PS/2 mouse performance ( #17111 )
2022-05-30 23:15:17 -07:00
d44a950c10
Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK ( #17099 )
2022-05-30 22:55:33 -07:00
8545473307
Removes terminal from QMK. ( #17258 )
2022-05-30 22:38:08 -07:00
9e2fe4eff6
Make SPI Mode configurable and change default mode to 3 ( #17263 )
2022-05-31 15:28:55 +10:00
e869d089b7
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 05:03:28 +00:00
cda343acbe
[Keymap] Drashna update for post Q2 merge ( #17241 )
2022-05-30 22:02:55 -07:00
f663f84413
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 04:47:02 +00:00
b554e4b612
Change AW20216 SPI Mode from 0 to 3, to fix RGB LEDs on GMMK Pro ( #17262 )
2022-05-31 14:46:21 +10:00
044486500c
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 04:09:14 +00:00
650be92cf9
Nix shell updates ( #17243 )
2022-05-31 14:08:23 +10:00
a099579aa0
Merge remote-tracking branch 'origin/master' into develop
2022-05-31 02:09:37 +00:00
0e11b511e4
Convert ergodone to use core mcp23018 driver ( #17005 )
2022-05-31 03:08:56 +01:00
67e80780bb
Merge remote-tracking branch 'origin/master' into develop
2022-05-30 22:44:05 +00:00
2879573688
Fix various lint errors ( #17255 )
...
* Fix various lint errors
* reduce complexity
2022-05-30 23:43:36 +01:00
6e4e50d5aa
Merge remote-tracking branch 'origin/master' into develop
2022-05-30 22:06:28 +00:00
25ec68c408
Fix docs typo ( #17254 )
2022-05-30 23:05:57 +01:00
2de70e6f2d
Add uf2-split-* make targets. ( #17257 )
2022-05-31 08:04:50 +10:00
31fb141528
Merge remote-tracking branch 'origin/master' into develop
2022-05-30 21:46:00 +00:00
3826fca637
[Keyboard] Add str.merro60 pcb ( #17097 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local>
Co-authored-by: chalex <chlxbsmt@gmail.com>
2022-05-30 14:45:27 -07:00
6b640db4bb
Merge remote-tracking branch 'origin/master' into develop
2022-05-30 18:29:09 +00:00
QMK Bot
Stefan Kerkmann
Pascal Getreuer
Nick Brassel
Xelus22
eason
Drashna Jaelre
Joel Challis
takishim
Ryan Skidmore
Aidan Gauland
Václav Kučera
wavtype
Dasky
Carlo Sala
Forrest Cahoon
moyi4681
Thomas Preisner
Andrew Dunai
precondition
trwnh
Sergey Vlasov
chalex