g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,623 Commits
4 Branches
0 Tags
277 MiB
Commit Graph

402 Commits (03328ea7a88995138e0696304738d10942f55129)

Author SHA1 Message Date
Ryan 1978007fae
Tap Dance: remove `qk_` prefix (#19313) 2022-12-14 12:40:25 -08:00
QMK Bot 35477a38b1 Merge remote-tracking branch 'origin/master' into develop 2022-12-12 23:46:44 +00:00
dztech 15ef0a7e3c
[Keyboard] add d45 lite keyboard (#19288) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2022-12-12 15:46:09 -08:00
Wolf Van Herreweghe aa06a6e094
Minor lint fixes for various info.json (#19275) 2022-12-09 04:23:24 +00:00
dztech 4d1b1bc534
[Keyboard] add kbdpadmk3 (#18795) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-12-04 10:53:08 -08:00
dztech ee772ad165
[Keyboard] add odinmini keyboard (#19111) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-12-04 01:22:21 -08:00
micros24 6af12001eb
[Keymap] KBDFans Tiger80 Keymap (#19148) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Jasper Jan O. Solee <jjosolee@mymail.mapua.edu.ph>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-12-03 23:16:34 -08:00
Ryan e12ca14af8
Change `RGB_MATRIX_STARTUP_*` defines to `RGB_MATRIX_DEFAULT_*` (#19079) 2022-11-27 04:18:24 +11:00
Joel Challis 3b11e98215
Update use of legacy keycodes (#19120) 2022-11-22 22:07:47 +11:00
Joel Challis fe577daf96
Remove .noci functionality (#19122) 2022-11-21 02:03:38 +00:00
Lex Brugman 66e4add972
[Keyboard] Add support for KBDfans Odin V2 (#18910) 2022-11-20 00:28:35 -08:00
Ryan 20ed138236
LED config fixes (#18973) 2022-11-11 12:15:19 +11:00
Nick Brassel 219afaba42
Reworked backlight keycodes. (#18961) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-11-06 08:11:59 +11:00
Ryan fe18df9d41
Normalise Dynamic Macro keycodes (#18939) 
* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1`

* `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2`

* `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1`

* `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2`

* `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP`

* Update docs
 2022-11-03 23:01:06 +00:00
Ryan 5974d989fe
Normalise Unicode keycodes (#18898) 
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
 2022-10-31 21:15:12 +00:00
Ryan 7407347be1
Remove rgblight_list.h (#18878) 
* Remove rgblight_list defines with no usage

* Remove rgblight_setrgb_*[_at] defines

* Remove rgblight_sethsv_* defines

* Remove rgblight_sethsv_noeeprom_* defines

* Delete rgblight_list.h and remove all references
 2022-10-27 23:50:14 +01:00
Ryan 002b58f0e4
Normalise Space Cadet keycodes (#18864) 2022-10-27 11:19:16 +01:00
Ryan 74484e21af
Deprecate `VLK_TOG` for `VK_TOGG` (#18807) 2022-10-22 21:45:20 +01:00
Ryan 1cb1a5a374
Remove legacy Grave Escape keycodes (#18787) 2022-10-20 18:04:11 -07:00
Ryan c347e732be
Remove legacy EEPROM clear keycodes (#18782) 
* `EEP_RST` -> `EE_CLR`, default-ish keymaps

* `EEP_RST` -> `EE_CLR`, user keymaps

* `EEP_RST` -> `EE_CLR`, community layouts

* `EEP_RST` -> `EE_CLR`, userspace

* `EEP_RST` -> `EE_CLR`, docs & core
 2022-10-20 12:20:07 +01:00
Ryan 18dc851e37
Remove legacy Debug keycode (#18769) 
* `DEBUG` -> `DB_TOGG`, default-ish keymaps

* `DEBUG` -> `DB_TOGG`, user keymaps

* `DEBUG` -> `DB_TOGG`, community layouts

* `DEBUG` -> `DB_TOGG`, userspace

* `DEBUG` -> `DB_TOGG`, docs & core
 2022-10-19 11:33:05 +01:00
Joshua Diamond 80fdbfce5f
A little personal cleanup after #18726 and #18729 (#18734) 
* A little cleanup after #18726

* Re-instate RGBLIGHT_EFFECT_STATIC_GRADIENT

* Extend to spin
 2022-10-19 00:28:19 +01:00
Ryan bad8c5992b
Remove legacy sendstring keycodes (#18749) 2022-10-17 13:45:23 +01:00
Ryan 74223c34a9
Remove legacy keycodes, part 6 (#18740) 
* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`
 2022-10-16 14:14:40 +01:00
Ryan 5e4b076af3
Remove legacy keycodes, part 5 (#18710) 
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
 2022-10-15 22:29:43 +01:00
Drashna Jaelre 55b9a4d06e
Remove RGBLIGHT_ANIMATION and clean up effect defines for G-K (#18726) 2022-10-15 09:55:27 -07:00
Ryan 5629ba1807
Remove legacy keycodes, part 4 (#18683) 
* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
 2022-10-13 18:28:14 +01:00
Ryan e96d829724
Remove legacy keycodes, part 3 (#18669) 
* `KC__VOLDOWN` -> `KC_VOLD`

* `KC__VOLUP` -> `KC_VOLU`

* `KC__MUTE` -> `KC_MUTE`

* `KC_POWER` -> `KC_PWR`
 2022-10-11 14:21:47 +01:00
Ryan c6f1b594a2
Remove legacy keycodes, part 2 (#18660) 
* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`
 2022-10-10 20:06:26 +01:00
Ryan 4b2d71de52
Remove legacy international keycodes (#18588) 2022-10-09 14:51:09 +11:00
Drashna Jaelre 64b1ed4550
Fix Per Key LED Indicator Callbacks (#18450) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-10-04 15:24:22 -07:00
Johannes Löthberg d412dc61ee
Remove remaining use of terminal keys and related comment labels (#18402) 2022-09-29 20:42:42 -07:00
Ryan ea2819b2c2
Change `{LED,RGB}_DISABLE_TIMEOUT` to `{LED,RGB}_MATRIX_TIMEOUT` (#18415) 2022-09-26 14:40:15 +10:00
Ryan 36c410592d
Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) 2022-09-23 22:46:23 +10:00
QMK Bot f0940a6fe4 Merge remote-tracking branch 'origin/master' into develop 2022-09-18 06:02:20 +00:00
Less/Rikki 3444dd5e2d
[keyboard] kbdfans/kbd75rgb info.json fix (#18391) 2022-09-18 16:01:46 +10:00
Ryan 8833b28361
Remove `UNICODE_KEY_OSX` and `UC_OSX` (#18290) 2022-09-06 18:07:08 +01:00
Ryan d983251c10
Switch over MANUFACTURER and PRODUCT to string literals (#18183) 2022-08-28 09:59:40 -07:00
Joel Challis bbc3bc55f2
RESET -> QK_BOOT user keymaps (#17940) 2022-08-21 23:55:30 +01:00
Drashna Jael're 8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop 2022-08-20 10:22:48 -07:00
Joel Challis d2accb48e7
RESET -> QK_BOOT keyboard readme (#18110) 2022-08-20 11:34:17 +01:00
fauxpark 61689ae609 Merge remote-tracking branch 'upstream/master' into develop 2022-08-20 10:55:40 +10:00
Ryan 835c971f78
Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) 2022-08-20 10:39:35 +10:00
QMK Bot 1882cdbf7b Merge remote-tracking branch 'origin/master' into develop 2022-08-11 01:48:48 +00:00
James Young 9ccbdad816
KBDfans KBD67 rev2: rename LAYOUT_65_ansi_split_bs_2_right_mods macro (#17972) 2022-08-10 18:48:12 -07:00
QMK Bot 93914142a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 01:24:34 +00:00
Joel Challis c6ad38e79f
RESET -> QK_BOOT default keymaps (#17939) 2022-08-07 02:23:58 +01:00
Nick Brassel 154d35ac14
Remove `UNUSED_PINS` (#17931) 2022-08-06 23:23:35 +10:00
Stefan Kerkmann f27b617f36
[Core] Process all changed keys in one scan loop, deprecate `QMK_KEYS_PER_SCAN` (#15292) 2022-08-06 20:51:13 +10:00
QMK Bot bce4fb4574 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 07:04:43 +00:00
Ryan 1b92c204c1
Move keyboard USB IDs and strings to data driven: K (#17846) 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-08-03 17:03:47 +10:00
QMK Bot a97c61074e Merge remote-tracking branch 'origin/master' into develop 2022-07-30 02:47:09 +00:00
James Young d2aa8e6bb8
KBDfans Bounce Pad: Correct QMK Configurator Implementation (#17845) 2022-07-29 19:46:32 -07:00
QMK Bot 3f1b61ba55 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 21:03:24 +00:00
James Young 7f2ddf1711
kbdfans/bounce/75: correct typos of keyboard name (#17841) 2022-07-29 22:02:45 +01:00
QMK Bot 1050cf2453 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 12:19:39 +00:00
James Young 1ded7ad460
KBDfans Bounce75 Touch-Up (#17834) 
* kbdfans/bounce/75/hotswap: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 13 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 14 and 8.

* kbdfans/bounce/75/soldered: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 14 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 15 and 8.

* kbdfans/bounce/75/soldered: fix layer index in keymaps

Layer indexes were 0,1,2,1 instead of 0,1,2,3.
 2022-07-29 13:18:28 +01:00
QMK Bot e8b14a52de Merge remote-tracking branch 'origin/master' into develop 2022-07-19 02:09:38 +00:00
James Young 7aea67980b
Update noroadsleft userspace and keymaps (2022-07-18) (#17714) 
* kbdfans/kbd75/rev1:noroadsleft - remove LAYOUT_75_ansi_wkl definition

* coseyfannitutti/discipline:noroadsleft - change KC_GESC to KC_ESC

* update Quantum keycode instances in noroadsleft keymaps

- `RESET` -> `QK_BOOT`
- `EEP_RST` -> `EE_CLR`
- `DEBUG` -> `DB_TOGG`

* create and add G_PWD macro
 2022-07-18 19:09:05 -07:00
QMK Bot f9724dfa67 Merge remote-tracking branch 'origin/master' into develop 2022-07-13 04:37:54 +00:00
James Young e68de95214
KBDfans KBD67 rev2 Layout Patch (#17649) 2022-07-12 21:37:23 -07:00
QMK Bot 5925ea3478 Merge remote-tracking branch 'origin/master' into develop 2022-07-11 12:55:42 +00:00
Naphtaline c8f969a3ce
[Keyboard] kbdfans kbd67 rev 2 : add new LAYOUT_65_iso_split_bs (#16922) 
* [Layout/Keymap] kbdfans kbd67 rev2 : add new LAYOUT_65_iso_split_bs and naphaline keymap as a working example

* Update keyboards/kbdfans/kbd67/rev2/keymaps/naphtaline/keymap.c

I do trust the reviewer, here goes the change :)

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove QMK custom keycodes 1/2

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Remove QMK custom keycodes 2/2

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-07-11 05:55:01 -07:00
QMK Bot 6154c184a8 Merge remote-tracking branch 'origin/master' into develop 2022-07-03 04:11:21 +00:00
jack 665feccca1
Fixup bounce/75 (#17548) 2022-07-03 14:10:51 +10:00
QMK Bot 2d5047a79c Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:43:38 +00:00
moyi4681 4ba5102a50
add bounce keyboard (#17030) 2022-07-03 00:43:07 +01:00
QMK Bot c679decb2b Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:45:40 +00:00
spx01 2f11509465
spx01 keymap for the kbd67mkiirgb (#17012) 2022-07-02 21:44:58 +10:00
QMK Bot 93e657fa99 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 10:55:05 +00:00
moyi4681 578a3e3505
add baguette66 keyboard (#16429) 
* add baguette66 keyboard

* Update keyboards/kbdfans/baguette66/soldered/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/kbdfans/baguette66/rgb/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-07-02 20:54:22 +10:00
Drashna Jaelre 0da6562c4d
Make default layer size 16-bit (#15286) 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-06-19 07:37:51 +10:00
QMK Bot 36c8462f0a Merge remote-tracking branch 'origin/master' into develop 2022-05-19 20:26:30 +00:00
James Young c4c67f2eb2
KBDfans Tiger80 Community Layout Support and Keymap Touch-Up (#17149) 
* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_tkl_f13_ansi_tsangan

* enable Community Layout support

* refactor keymaps to use grid alignment
 2022-05-19 13:25:56 -07:00
QMK Bot b4d65aac7f Merge remote-tracking branch 'origin/master' into develop 2022-05-19 17:55:45 +00:00
James Young 394f147897
KBDfans Phase One Layout Macro Additions and Configurator Data (#17148) 
* phaseone.h: add matrix diagram

* add QMK Configurator data

* add LAYOUT_65_ansi_blocker_split_bs macro

* add LAYOUT_65_ansi_wkl_split_bs macro

* add LAYOUT_65_iso_blocker macro

* add LAYOUT_65_iso_blocker_split_bs macro

* add LAYOUT_65_iso_wkl macro

* add LAYOUT_65_iso_wkl_split_bs macro

* rename LAYOUT_65_ansi_wkl to LAYOUT_65_ansi_blocker_tsangan_wkl

Differentiates the layout supported here from QMK's `65_ansi_blocker_tsangan` Community Layout, which is equivalent to this but with a 1u GUI key between Left Ctrl and Left Alt.

* rename new layout macros for codebase consistency

- `LAYOUT_65_ansi_wkl_split_bs` -> `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs`
- `LAYOUT_65_iso_wkl` -> `LAYOUT_65_iso_blocker_tsangan_wkl`
- `LAYOUT_65_iso_wkl_split_bs` -> `LAYOUT_65_iso_blocker_tsangan_wkl_split_bs`

* add reference keymaps

Add keymaps which demonstrate the layout macro implementations.
 2022-05-19 10:54:57 -07:00
QMK Bot d47c4ed4d0 Merge remote-tracking branch 'origin/master' into develop 2022-05-16 11:47:33 +00:00
moyi4681 6a94a9547d
fix tiger80 matrix error (#17107) 2022-05-16 12:46:37 +01:00
Joel Challis 85289e34ae
Various fixes for g_led_config lint warnings (#17104) 2022-05-16 09:40:56 +10:00
Joel Challis b7771ec25b
RESET -> QK_BOOT default keymaps (#17037) 2022-05-15 20:26:27 +01:00
Ryan 4a8bd7b9a5
Rename keymap_extras headers for consistency (#16939) 2022-05-15 21:27:01 +10:00
James Young 8e9a81a860
KBDfans KBD75 Refactor - 2022 Edition (#17052) 
* add license headers

* tidy-up revision rules.mk files

- convert tabs to spaces
- align inline comments
- update rule ordering

* touch-up readme.md

* touch-up rev1/rev1.h

- convert tabs to spaces
- convert to QMK 3-character notation for matrix positions

* rev1/rev1.h: add matrix diagram

* touch-up rev2/rev2.h

- convert tabs to spaces
- convert to QMK 3-character notation for matrix positions

* rev2/rev2.h: add matrix diagrams

* rev1/info.json: apply friendly formatting

* rev2/info.json: apply friendly formatting

* refactor layout macros

- switch `LAYOUT_ansi_1u` with `LAYOUT_75_ansi`
  - makes `LAYOUT_75_ansi` the canonical macro name, with `LAYOUT_ansi_1u` as an alias for backwards compatibility
  - move `LAYOUT_ansi_1u` alias to `info.json` files from revision headers
- remove `LAYOUT_iso_1u` (was unused)
- rename `LAYOUT_ansi` to `LAYOUT_75_ansi_rwkl`
- rename `LAYOUT_iso` to `LAYOUT_75_iso_rwkl`

* refactor default keymap

- use four-space indent
- update grid alignment

* refactor iso keymap

- refactor to use `LAYOUT_75_iso` macro
  - change from Split to 2u Backspace
  - change from Split to Standard Spacebar
  - change `KC_BSLS` keycode to `KC_NUHS`, and place on home row
- use four-space indent
- update grid alignment

* refactor via keymap

- use four-space indent
- update grid alignment

* touch-up readme.md again

Fix a broken link.

* update section comments in revision header files

* add Full Winkeyless layouts

- add `LAYOUT_75_ansi_wkl` and `LAYOUT_75_iso_wkl` layout macros
 2022-05-11 12:51:39 -07:00
jonavin c03e18f728
Jonavin-kb67-Reduce mem usage (#16991) 
Co-authored-by: Jonavin <=>
 2022-05-03 11:22:10 +01:00
moyi4681 3b6e48b012
[Keyboard] Add Phase One keyboard (#16430) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-04-16 11:28:16 -07:00
moyi4681 8430774430
[Keyboard] add tiger80 keyboard (#16742) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-04-13 07:24:56 -07:00
mudhead e9ad400b83
[Keyboard] KBD67 rev1 Caps Lock LED Fix (#16790) 2022-04-13 07:18:21 -07:00
Droxx 669ad3c805
Droxx keymap (#16607) 
* add droxx kaymap

* add droxx keymap

* fixed config.h

* fixed rules.mk

* fixed rules.mk

* updated readme.md

* Update config.h

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

* Update readme.md

* Update keymap.c
 2022-03-20 17:24:09 +00:00
Ryan 764dc18a81
Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h (#16655) 2022-03-15 13:56:58 +00:00
Ryan 6a6a333c75
Disable RGB matrix pixel animations for some boards (#16643) 
* idobao/id87/v2: disable RGB matrix pixel animations

* Same for two more boards
 2022-03-14 13:58:05 +00:00
jack 708b3f9192
[Keyboard] Size reduction for kbdfans/kbd67/mkiirgb_iso (#16601) 2022-03-09 19:46:30 -08:00
QMK Bot 7650e68798 Merge remote-tracking branch 'origin/master' into develop 2022-02-09 05:42:39 +00:00
Vino Rodrigues bf4ce41696
[Keyboard] refine LED Matrix LED positions on KBD67 Lite (#15769) 2022-02-08 21:42:01 -08:00
QMK Bot 9e65b23adc Merge remote-tracking branch 'origin/master' into develop 2022-02-06 04:53:35 +00:00
James Young ac6283e836
KBDfans KBD19x: add LAYOUT_iso (#16240) 2022-02-05 20:53:07 -08:00
peepeetee 1477440ba0
[Keyboard] move niu_mini to /kbdfans (#16112) 2022-01-31 18:12:39 -08:00
Felipe Bastos 2100a7ca7b
Move kbdpad_mk2 to kbdpad/mk2, add numpad layout to mk2.h (#15892) 2022-01-29 10:28:00 -08:00
moyi4681 8a3dfe2246
[Keyboard] fix odin rgb light error (#15914) 2022-01-17 11:00:48 -08:00
James Young 06b329cdb9
kbdfans/kbd67/mkiirgb/v4: remove duplicate definitions from config.h (#15858) 2022-01-12 18:13:35 -08:00
Albert Y 3d63c814d3
Correct matrix effect name (#15816) 2022-01-11 09:57:25 -08:00
Drashna Jaelre bda520198e
[Keyboard] Fix KBD67 mark 2 v4 (#15835) 2022-01-11 09:42:58 -08:00