varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
23371 commits 2 branches 1545 tags 870 MiB
Commit graph

949 commits

Author SHA1 Message Date
fauxpark 61689ae609 Merge remote-tracking branch 'upstream/master' into develop 2022-08-20 10:55:40 +10:00
Ryan 201a914beb
Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) 2022-08-20 01:42:49 +01:00
QMK Bot 6a1a398627 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 19:40:49 +00:00
csc027 4267f0e0d4
csc027/keymap-updates (#17881) 
* Reverted to most usable configuration for RDP usage.

* Added some HSV color definitions without the value portion to allow using the existing value.

* Switched to using HSV and HS color definitions.

* Added media keys to the convenience layer.

* Updated make rules to enable media keys.

* Cleaned up planck make rules.
 2022-08-07 20:40:16 +01:00
Nick Brassel 154d35ac14
Remove UNUSED_PINS (#17931) 2022-08-06 23:23:35 +10:00
QMK Bot f326b0b40e Merge remote-tracking branch 'origin/master' into develop 2022-08-03 17:23:55 +00:00
Stephen J Bush df8a538489
Userspace: muppetjones (#1) (#13461) 
* Userspace: muppetjones (#1)

Add and update lily58 to work with userspace
Add and update kyria keymap to work with userspace
Add and update planck keymap with userspace
Add etchamouse code and docs to userpace
Add userspace
Update mouse encoder for smoother movement.
Encoder + mouse
Added casemodes by andrewjrae

* Rollback lily58 state reader and add missing GPL

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* fix lily58 keymap

* Updates to user and lily for muppetjones.

Updated parameters for etchamouse for smoother mouse movement. Updated lily keymap and userspace to actually work together.

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

* Updated keymaps and userspace

* Little more cleanup.

* Update keyboards/lily58/keymaps/muppetjones/rules.mk

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

* Rollback accidental libchibios update

* Apply suggestions from code review

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

* Update kyria keymap

* Move kyria keymap to splitkb/kyria

* Update planck keymap

* Remove all changes to keyboards/lily58/lib/layer_state_reader.c

* Update lily58 keymap

* Recommended change

* Update keymap readme

* Update kyria keymap and userspace

* Apply suggestions from code review

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

* Renamed users/muppetjones/README.md to lc

* Update keyboards/lily58/keymaps/muppetjones/config.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-08-03 18:23:17 +01:00
Joel Challis c3f1ba7dd1
Remove full bootmagic config (#17702) 2022-07-19 02:28:23 +01:00
QMK Bot 859c1a6fc9 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 07:18:04 +00:00
Jens-Petter Sandvik 4e5cc3c2ba
Planck swap hand matrix for rev6, fixing issue #17388 (#17389) 
* Add correct hand_swap_config matrix for planck_rev6 and planck_rev6_drop

* Make sure indentations are consistent

* Make the rev6 hand_swap_config matrix the default, also correct for ez.

* Move hand_swap_config matrix from planck.c to revision subdirectories
 2022-07-17 00:17:22 -07:00
Stefan Kerkmann 3f5dc47296
[Core] Use polled waiting on ChibiOS platforms that support it (#17607) 
* Use polled waiting on platforms that support it

Due to context switching overhead waiting a very short amount of time on
a sleeping thread is often not accurate and in fact not usable for timing
critical usage i.e. in a driver. Thus we use polled waiting for ranges
in the us range on platforms that support it instead. The fallback is
the thread sleeping mechanism.

This includes:

* ARM platforms with CYCCNT register (ARMv7, ARMv8) this is
  incremented at CPU clock frequency
* GD32VF103 RISC-V port with CSR_MCYCLE register this is incremented at
  CPU clock frequency
* RP2040 ARMv6 port which uses the integrated timer peripheral which is
  incremented with a fixed 1MHz frequency

* Use wait_us() instead of chSysPolledDelayX

...as it is powered by busy waiting now.

* Add chibios waiting methods test bench
 2022-07-11 15:17:05 +02:00
QMK Bot fa0aea2a5a Merge remote-tracking branch 'origin/master' into develop 2022-07-02 12:18:55 +00:00
David Kristoffersen a80943579c
[Keymap] Add prog_qgmlwb keymap (#16890) 2022-07-02 22:18:21 +10:00
Nick Brassel a9af4c928e Merge remote-tracking branch 'upstream/master' into develop 2022-07-02 21:13:06 +10:00
Batuhan Baserdem fd44341cbf
Userspace and keymap update for user bbaserdem. (#14484) 2022-07-02 21:09:04 +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
Jouke Witteveen 1706da9054
tap-dance: Restructure code and document in more detail (#16394) 2022-06-13 22:12:55 +02:00
QMK Bot ef8a30250b Merge remote-tracking branch 'origin/master' into develop 2022-06-10 03:41:14 +00:00
Zac Scott 93c3a959a7
[Keymap] Add planck/scottzach1 keymap (#17083) 2022-06-09 20:40:43 -07:00
QMK Bot bb324e5b3e Merge remote-tracking branch 'origin/master' into develop 2022-06-03 11:13:22 +00:00
Drashna Jaelre 706194b336
Add Encoder Map Swap Hands config for boards that support both features (#17294) 2022-06-03 12:12:15 +01:00
Nick Brassel 8545473307
Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07: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
Abhinav 67329cffb5
Add my planck layout (#13143) 
* Add my planck layout

* Add copyright

* Address requested changes

* Fix dipswitch return type
 2022-04-19 20:33:18 +10:00
Anton 53a88af036
[Keymap] corne and planck keyboards keymaps (#15570) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-03-25 17:37:05 -07:00
Tom Konidas a808c29726
[Keymap] Planck Keymap: tomkonidas (#15869) 2022-03-15 15:48:13 -07:00
Ryan 764dc18a81
Remove NO_ACTION_MACRO and NO_ACTION_FUNCTION from keyboard config.h (#16655) 2022-03-15 13:56:58 +00:00
QMK Bot 6339b6dab7 Merge remote-tracking branch 'origin/master' into develop 2022-02-10 01:04:13 +00:00
Aric Crosson Bouwers 9d74c95215
[Keymap] submitting ariccb planck keymap (#16177) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-09 17:03:43 -08:00
QMK Bot 008b5f52e5 Merge remote-tracking branch 'origin/master' into develop 2022-02-07 18:27:58 +00:00
Jimmy Sjölund 3ca19fa933
[Keymap] Updated Planck layout - jimmysjolund (#16245) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-07 10:24:20 -08:00
QMK Bot 10fa737ab8 Merge remote-tracking branch 'origin/master' into develop 2022-02-06 04:58:43 +00:00
Boris Churzin 88a22268eb
[Keyboard] oryx rules.mk rgblight (#16229) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
 2022-02-05 20:58:15 -08:00
QMK Bot 38de0681ff Merge remote-tracking branch 'origin/master' into develop 2022-01-29 18:28:12 +00:00
Alex Grover 3307a8e057
[Keymap] Add media keys to default UT47.2 keymap (#15893) 2022-01-29 10:27:29 -08:00
QMK Bot d0faaa9c7c Merge remote-tracking branch 'origin/master' into develop 2022-01-29 14:28:24 +00:00
Joel Challis cc6017517d
Planck/Preonic - Enable default encoder behaviour on configurator (#16104) 2022-01-29 14:28:13 +00:00
QMK Bot 88630d4913 Merge remote-tracking branch 'origin/master' into develop 2022-01-12 22:21:43 +00:00
Kevin Hartley b79e329ab8
[Keymap] Planck Keymap: Inkwell (#14311) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-01-12 14:20:54 -08:00
QMK Bot 79f2fca1f9 Merge remote-tracking branch 'origin/master' into develop 2022-01-11 00:58:16 +00:00
Alan Pocklington dce611bc9f
[Keymap] AJP10304 layout, add Colemak-DHm layer (#15582) 2022-01-10 16:57:41 -08:00
QMK Bot 6e8c3dfafc Merge remote-tracking branch 'origin/master' into develop 2022-01-07 05:25:57 +00:00
Mason 3076d3c4f4
[Keymap] Add masoncowen planck keymap (#14353) 
Co-authored-by: Drashna Jael're <drashna@live.com>
 2022-01-06 21:25:20 -08:00
QMK Bot c8af82432d Merge remote-tracking branch 'origin/master' into develop 2021-12-29 14:15:23 +00:00
Drashna Jaelre 906108fb48
[Keyboard] Update to ZSA Keyboards (#15644) 2021-12-29 06:14:48 -08:00
Ryan c12268807d
Migrate serial_uart usages to UART driver (#15479) 
* Migrate Thermal Printer feature to UART driver

* Migrate 40percentclub UT47 to UART driver

* Migrate Centromere to UART driver

* Migrate Chimera Ergo to UART driver

* Migrate Chimera Let's Split to UART driver

* Migrate Chimera Ortho to UART driver

* Migrate Chimera Ortho Plus to UART driver

* Migrate Comet46 to UART driver

* Migrate Palm USB converter to UART driver

* Migrate Sun USB converter to UART driver

* Migrate Dichotomy to UART driver

* Migrate Honeycomb to UART driver

* Migrate Mitosis to UART driver

* Migrate Redox W to UART driver

* Migrate Uni660 to UART driver

* Migrate Telophase to UART driver
 2021-12-15 11:00:39 +00:00
Ryan a8d440e4e0
Tidy up NKRO_ENABLE rules (#15382) 2021-12-09 16:05:44 +11:00
Ryan 7f90cb1781
Remove references to Makefile in keyboard-level rules.mk (#15427) 2021-12-07 23:40:26 +00:00
Ryan c12b997679
Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
Mats Nilsson 04cad4582e
Remove deprecated defines from my keymaps (#15353) 2021-11-30 16:45:08 +11:00
Joel Challis 282e916d86
Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
QMK Bot d11d2459ce Merge remote-tracking branch 'origin/master' into develop 2021-11-20 04:15:27 +00:00
ForeverAnApple eff9288759
[Keymap] Initial simple keymap for ForeverAnApple (#14654) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-19 20:14:54 -08:00
Drashna Jaelre 160b0558f5
Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
QMK Bot bc6d8d6966 Merge remote-tracking branch 'origin/master' into develop 2021-11-11 04:32:06 +00:00
Gustavs Gūtmanis 48eddeeea4
[Keymap] Adding keymap for BDN9 and Planck (#15067) 2021-11-10 20:31:39 -08:00
QMK Bot 8a659dc410 Merge remote-tracking branch 'origin/master' into develop 2021-11-05 08:57:06 +00:00
devilzmods 8f2ffea656
My Personal Keymaps for the Planck and melody96 (#12672) 
* my planck keymap

* my planck keymap

* minor changes

* Added personalized, VIA compatible keymap to the Melody96

* lighting layers added and keymap tweaked

* added basic descriptions

* added basic descriptions

* added basic descriptions

* added basic descriptions

* hopefully removed personal change to .gitignore

* restored .gitignore from my master

* restored .gitignore from my master

* requested changes and minor functionality tweaks

* Apply suggestions from code review

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

Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-05 19:56:38 +11:00
James Young 84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002) 
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
 2021-11-05 08:18:09 +11:00
Ryan 928d9f90ec
Remove complex fn_actions macros (#14662) 
* Remove complex `fn_actions` macros

* Remove additional `KC_FN*` instances
 2021-11-01 09:27:54 +11:00
QMK Bot 5851ac1934 Merge remote-tracking branch 'origin/master' into develop 2021-10-29 23:30:51 +00:00
Alan Pocklington 28120c1a63
[Keymap] ajp10304: add mouse scroll keys (#14953) 2021-10-29 16:30:23 -07:00
Drashna Jael're 6506e271a3
Merge remote-tracking branch 'origin/master' into develop 2021-10-26 17:59:20 -07:00
Přemysl Eric Janouch b29f005936
[Keymap] Add planck/pjanx and keebio/nyquist/pjanx keymaps (#13115) 2021-10-26 17:56:38 -07:00
QMK Bot 762f9e320f Merge remote-tracking branch 'origin/master' into develop 2021-10-12 01:04:30 +00:00
Jimmy Sjölund cecf5d52f9
[Keymap] Adding my personal Planck layout (#14564) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-11 18:04:24 -07:00
Ryan b487e10753
Clean up LED/RGB Matrix driver config (#14760) 2021-10-10 16:57:49 -07:00
James Young 922c8071e4
Merge remote-tracking branch 'upstream/master' into develop 2021-09-29 23:23:10 -07:00
Ryan 36bc3c867e
Remove redundant UNICODE_ENABLE = no in keyboard-level rules.mk (#14633) 2021-09-30 08:14:21 +10:00
QMK Bot be3d7063a0 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:37:46 +00:00
Drashna Jaelre 02ab7b1888
[Core] Fix "6kro enable" and clarify naming (#14563) 
* Fix USB_6KRO_ENABLE compilation errors

* Add info to docs

* Rename define to be more accurate

* Remove unused rule

* Refixe docs
 2021-09-29 11:37:11 -07:00
Drashna Jael're 675c5a5e12
Merge remote-tracking branch 'origin/master' into develop 2021-09-24 12:21:32 -07:00
Drashna Jaelre a68c4d8b81
[Keyboard] Update default keymaps for OLKB boards (#14565) 2021-09-23 20:08:23 +01:00
fauxpark 94572d74b5 Merge remote-tracking branch 'upstream/master' into develop 2021-09-21 20:19:07 +10:00
Ryan 6b74e48f81
Remove audio pin references in rules.mk (#14532) 2021-09-21 20:04:03 +10:00
fauxpark c38a730805 Merge remote-tracking branch 'upstream/master' into develop 2021-09-20 16:58:29 +10:00
Jakob Weickmann a068b14686
[Keymap] Added my own keymap for MIT Planck (#14481) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-19 11:53:47 -07:00
Jack Humbert fa5d21a58e
[Keyboard] Enables I2C for OLKB rev*_drop boards (#14514) 
Co-authored-by: daskygit <32983009+daskygit@users.noreply.github.com>
 2021-09-19 11:43:37 -07:00
Drashna Jaelre ef5c6ea096
[Keyboard] Use old custom matrix for Drop Planck+Preonic (#14488) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jack Humbert <jack.humb@gmail.com>
 2021-09-18 20:10:32 -07:00
Drashna Jael're c14abd8c14
Merge remote-tracking branch 'origin/master' into develop 2021-09-17 18:39:16 -07:00
Drashna Jaelre 0c1341daa8
[Keyboard] Move Planck EZ off 'Proton C' board (#14479) 2021-09-17 13:01:06 -07:00
QMK Bot bda8924795 Merge remote-tracking branch 'origin/master' into develop 2021-09-12 05:28:01 +00:00
Ryan 5af1799735
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379) 2021-09-12 15:27:29 +10:00
fauxpark 1895151a9c Merge remote-tracking branch 'upstream/master' into develop 2021-09-12 14:10:26 +10:00
Ryan 4791cfae1a
Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
fauxpark a7c972b329 Merge remote-tracking branch 'upstream/master' into develop 2021-09-10 17:36:17 +10:00
Ryan d5cb7de5e4
Change USBasp and bootloadHID bootloaders to lowercase (#14354) 2021-09-10 17:17:54 +10:00
QMK Bot e6ff638abf Merge remote-tracking branch 'origin/master' into develop 2021-09-10 03:36:14 +00:00
Ryan 7eea780a7d
Remove bootloader listings from rules.mk (#14330) 2021-09-10 13:35:46 +10:00
QMK Bot 147289e173 Merge remote-tracking branch 'origin/master' into develop 2021-09-05 20:37:03 +00:00
Ryan fe6d6cf76d
Remove empty override functions (#14312) 
* Remove empty override functions, 0-9

* Remove empty override functions, A-D

* Remove empty override functions, E-H

* Remove empty override functions, handwired

* Remove empty override functions, I-L

* Remove empty override functions, M-P

* Remove empty override functions, Q-T

* Remove empty override functions, U-Z
 2021-09-05 21:36:31 +01:00
Ryan 41c50bb653
Change keyboard level include guards to pragma once (#14248) 
* Change keyboard level include guards to `pragma once`

And clean up a lot of layout macros

* Oops

* Remove dangling endif
 2021-09-01 19:03:14 +10:00
Xelus22 4e1c5887c5
[Core] Refactor OLED to allow easy addition of other types (#13454) 
* add docs

* core changes

* update keyboards to new OLED

* updated users to new OLED

* update layouts to new OLED

* fixup docs

* drashna's suggestion

* fix up docs

* new keyboards with oled

* core split changes

* remaining keyboard files

* Fix The Helix keyboards oled options

* reflect develop

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
 2021-08-24 16:28:26 +10:00
James Young 4279b14adf
Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
 2021-08-19 11:32:23 -07:00
Alan Pocklington 3b4c35da6b
[Keymap] Quark AJP10304 layout (#13290) 2021-08-19 10:36:20 -07:00
James Young 4b453dca92
Remove MIDI Configuration boilerplate (#11151) 
* remove keyboard-level instances of `MIDI_ENABLE = no`

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e  '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} +
```

Co-Authored-By: Nick Brassel <nick@tzarc.org>

* fix case-sensitivity issues on MIDI_ENABLE

Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} +
```

* replace `# MIDI controls` with `# MIDI support`

Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} +
```

* align inline comments

Aligns the inline comments to the length used by the QMK AVR rules.mk template.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes           # MIDI support;g'  {} +
```

* remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} +
```

* remove MIDI configuration boilerplate from keyboard config.h files

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-08-16 06:51:13 +10:00
QMK Bot fcddaadc56 Merge remote-tracking branch 'origin/master' into develop 2021-08-13 19:29:21 +00:00
Joel Elkins 2aeacf9db7
[Keymap] Updates to jdelkins userspace and keymaps (#13216) 
- Remove disused dz60/jdelkins_ss keymap
- Manage configured features for firmware size
- Improve build configuration for the secrets feature
- Various keymap tweaks
- Clean up formatting in various places
 2021-08-13 12:28:37 -07:00
Drashna Jael're 8e8ec6338c
Merge remote-tracking branch 'origin/master' into develop 2021-08-12 09:18:18 -07:00