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

10688 commits

Author SHA1 Message Date
paprikman 3cd77c53e2
[Keyboard] Add Albacore (#13200) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-12-06 21:17:00 -08:00
Andrew-Fahmy 23554726c8
[Keyboard] Update K type (#15405) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-12-06 20:58:02 -08:00
Ramon Imbao c0dcfcedf9
[Keyboard] Add Mona v32a (#15412) 2021-12-06 20:57:31 -08:00
yiancar 366d26a2ef
Add DFU Suffix for APM chips (#15414) 2021-12-06 09:38:11 -08:00
Christian Eiden 02618c6340
[Keymap] updates to own dactyl keymap (#14223) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-12-06 09:12:09 -08:00
Drashna Jaelre b868928f08
[Keyboard] Fix compilation issues for viktus smolka (#15410) 2021-12-06 16:46:48 +11:00
J.Flanagan c0bac688a3
[Keyboard] Add Viktus Smolka (#15346) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-12-05 20:47:57 -08:00
Drashna Jaelre 6d0a629204
[Keyboard] Fix bug in Moonlander functions (#15407) 2021-12-05 20:26:32 -08:00
SergioPoverony c54c0fdc2c
[Keyboard] Update BM68RGB Caps Lock Backlight status indication (#13497) 
Co-authored-by: Drashna Jael're <drashna@live.com>
 2021-12-05 17:25:41 -08:00
Vicktor Hutama 8c29902e51
[Keyboard] Updated pins configuration and keymaps for Vaengr (#15379) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2021-12-05 16:31:53 -08:00
Wolf Van Herreweghe 8da9998c9d
Update ReadMe for the Roopad (#15380) 2021-12-02 16:56:03 +00:00
Ryan a1183ebc8c
Remove pointless CUSTOM_MATRIX = no (#15383) 2021-12-02 14:31:36 +00:00
Joel Challis d2ccd62b57
Remove manual enable of LTO within keyboards (#15377) 2021-12-02 01:05:40 +00:00
Farhan Rob b6d9a8026b
[Keyboard] Han60 QMK / VIA Support (#15332) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-12-01 09:38:07 -08:00
Ryan c12b997679
Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
Álvaro A. Volpato bd2e02bdae
[Keyboard] Add support for Mode SixtyFive M65HA and M65HI (#14685) 2021-12-01 00:58:29 -08:00
James Young b98280bf5f
Rename Layout Macros for TKLs with F13 keys (#15361) 
* dyz/dyz_tkl: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso

* kopibeng/mnk88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso
- rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan

* mechlovin/infinity88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso

* mechlovin/infinity88: rename F13 layouts

- rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi
- rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan
- rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso
- rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan
 2021-11-30 12:15:15 -08:00
Drashna Jaelre d184a85e62
[Keyboard] Fix up Endgame34 (#15366) 2021-12-01 06:15:28 +11:00
Drashna Jaelre eeebb1dd3a
[Keyboard] Fix compilation issues for Ploopy Trackball classic (#15364) 2021-12-01 05:37:15 +11:00
Drashna Jaelre 6bd8ec5bb4
[Keyboard] Add missng define for 4x6 Tractyl Manuform (#15363) 2021-12-01 05:32:33 +11:00
Xelus22 421e69cae4
[Keyboard] kangaroo improvements (#15350) 2021-11-30 09:50:18 -08:00
Adam Lickel 3d469516cb
[Keymap] Keebio Sinc layout with macOS support (#15324) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-30 09:48:44 -08:00
Nick Brassel 81550527c4
Fixup paths for ramonimbao/wete/v2. (#15360) 2021-11-30 02:10:50 -08:00
Mats Nilsson 04cad4582e
Remove deprecated defines from my keymaps (#15353) 2021-11-30 16:45:08 +11:00
fenuks 507dd18f24
[Keyboard] Adapt downsteam Ghost Squid support to latest QMK (#14607) 
Co-authored-by: fenuks <fenuks>
 2021-11-29 08:41:21 -08:00
Minna 6716f1d2df
[Keymap] XD60 Finnish/Swedish layout (#15153) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-29 08:28:13 -08:00
ll3macorn 284e653eeb
[Keyboard] Add bongopad (#15212) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-29 08:27:45 -08:00
Wolf Van Herreweghe 569eee20b4
[Keyboard] Add RooPad (#15215) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
 2021-11-29 08:27:07 -08:00
Drashna Jaelre 62e01928cd
[Keyboard] Ploopy improvements (#15348) 2021-11-29 08:23:29 -08:00
Joel Challis db04899a4a
Remove unnecessary ENCODER_DIRECTION_FLIP at keyboard level (#15342) 2021-11-29 15:08:20 +00:00
tangowithfoxtrot 23d3ebd78a
[Keyboard] Minor typo and broken link fix (#14847) 2021-11-29 00:30:26 -08:00
Ramon Imbao e6e501aaa0
[Keyboard] Add Wete R2 (#14873) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-29 00:29:57 -08:00
Hai-Ninh Dang c4710fa74b
[Keyboard] Add Meow65 PCB (#14937) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-11-29 00:29:14 -08:00
takashicompany ea9fead229
Update VIA keymap for "EndZone34" (#15077) 2021-11-29 00:28:54 -08:00
moyi4681 9cc97302ab
[Keyboard] add odin keyboard (#15150) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-29 00:28:00 -08:00
Felix Jen 4c0ecd4910
[Keyboard] Add FJLabs 7V Hotswap PCBs (#15175) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-11-29 00:26:32 -08:00
Álvaro A. Volpato 1b6673de1f
[Keyboard] Add Noxary Valhalla support (#15197) 2021-11-29 00:25:53 -08:00
TW59420 32c5c97ee3
[Keyboard] Add mw65_black support (#15198) 2021-11-29 00:25:19 -08:00
Albert Y fd86f8c94d
[Keyboard] Add swap hands support and readme updates for Architeuthis Dux (#15227) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:24:43 -08:00
Albert Y d4b07be012
[Keyboard] Add swap hands support and readme update for Cradio (#15226) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:24:12 -08:00
Albert Y f9e21a654c
[Keyboard] Add swap hands support for 3w6 rev2 (#15230) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:23:09 -08:00
Sắn f6a5731300
[Keyboard] Fix layout + led state for Krush (#15231) 2021-11-29 00:22:31 -08:00
Dao Tak Isaac bcf2632a29
[Keyboard] Add define GPIO into Dosa40RGB (#15252) 
Co-authored-by: NOOB Maker <93704375+noobmakers@users.noreply.github.com>
 2021-11-29 00:21:29 -08:00
Albert Y b12acfb630
[Keyboard] Add mousekey support for Technik variants (#15258) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:20:56 -08:00
takashicompany 47764132f1
[Keyboard] Add "DogTag" (#15259) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-11-29 00:20:15 -08:00
Albert Y a7bc02bf69
[Keyboard] Sweep swap hand feature and pin documentation (#15264) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:19:00 -08:00
Albert Y 35a18a8bcd
[Keyboard] Code updates for macro3 (#15280) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:18:33 -08:00
Carlo Sala 690a879d77
feat: adding carlosala keymap (#15281) 2021-11-29 00:18:05 -08:00
studiokestra 047fe0a8f9
[Keyboard] Add Galatea TKL PCB. (#15290) 2021-11-29 00:17:26 -08:00
kb-elmo b90d94755c
[Keyboard] Add Vertex 40% (#15323) 2021-11-29 00:16:38 -08:00
Drashna Jaelre 5b5b36421a
[Keymap] Unicode and cursor sync - drashna keymap (#15328) 2021-11-28 23:41:59 -08:00
Joel Challis 4ee33f1ffd
Fix keyboard level use of OLED_DRIVER_ENABLE (#15343) 2021-11-28 21:00:02 +00:00
Conor Burns 097ae9d817
fixed oled in bongocat keymap and fixed encoder direction (#15232) 
* fixed oled in bongocat keymap (#13454) and fixed encoder direction for prod parts

* updated readme for launch later today
 2021-11-28 20:45:24 +00:00
Gastón Jorquera b29b482741
Add TRNS to LOWER layer (#15288) 
This commit makes the mode keys transparent in the LOWER layer instead
of disabled.

Before this commit, the following sequence of key presses `LGUI+LOWER+l`
would translate into `Cmd+right` in macOS and, therefore, move the
cursor to the end of line.

But, pressing `LOWER+LGUI+l` would completely ignore the `LGUI` and,
therefore, move the cursor one letter to the right.

With this change, pressing `LOWER+LGUI+l` produces the same result as
`LGUI+LOWER+l`.

This is also true for multiple other combinations, like
`RALT+SHIFT+LOWER+l`, `LOWER+RALT+SHIFT+l`, `SHIFT+LOWER+RALT+l`, etc.

Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
 2021-11-28 20:28:15 +00:00
Leon Omelan 35b6d1e992
[Keyboard] Add Nozbe Macropad (#14803) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-27 22:44:00 -08:00
Álvaro A. Volpato d4690d0c23
Meridian LED update (#15329) 
* Meridian first update

* Update README, adjust timing settings

* Update README
 2021-11-28 17:26:50 +11:00
ryjelsum 99c6829bf0
[Keyboard] Add 40percent.club's 'polypad' PCB (#15158) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-11-27 21:52:53 -08:00
Xelus22 eaf17b3260
[Bug] Xelus Keyboards 400kHz i2c fix (#15315) 
* 400khz fix

* fix valor rev2 timing

* keep consistent
 2021-11-28 12:12:04 +11:00
Dasky 1e48403538
fix typos (#15316) 2021-11-28 07:02:32 +11:00
Nick Brassel e156d5c13b
Fix build. (#15322) 2021-11-28 05:52:17 +11:00
Charly Delay 0e6548303d
[Keyboard] Fix call to pointing_device_handle_buttons (#15313) 2021-11-27 07:23:02 -08:00
Nick Brassel 08b7f8b30a
More headroom. (#15302) 2021-11-25 13:11:18 -08:00
Nick Brassel 27086ad80f
More headroom. (#15301) 2021-11-26 07:53:48 +11:00
Joel Challis 282e916d86
Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
QMK Bot 80f91f7b9a Merge remote-tracking branch 'origin/master' into develop 2021-11-24 05:37:27 +00:00
James Young 59e1513477
Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284) 
This reverts commit 26ae432190.

Requested by jurassic73.
 2021-11-23 21:36:41 -08:00
MechMerlin 796db50895
New Keyboard: TGR Jane CE (#14713) 
* move ce and v2ce into their own directories

* update copyright notices

* change LAYOUT macro names

* remove community layout support for the original layouts

* fix LAYOUT macro names

* change info.json for the common layouts

* fix tsangan LAYOUT

* fix layout all

* Update keyboards/tgr/jane/v2ce/keymaps/via/config.h

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

* Update keyboards/tgr/jane/v2ce/v2ce.c

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

* Update keyboards/tgr/jane/v2ce/config.h

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

* remove unneeded file

* one more time for good measure

* Update keyboards/tgr/jane/v2ce/rules.mk

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

* Update keyboards/tgr/jane/v2ce/rules.mk

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-11-24 16:32:46 +11:00
QMK Bot 57306b0f01 Merge remote-tracking branch 'origin/master' into develop 2021-11-23 19:26:33 +00:00
James Young afa2da01b4
Portal 66 Layout Macro Refactor (#15255) 
* soldered.h: use QMK 3-character notation

* soldered.h: add matrix diagram

* portal_66/soldered: rename LAYOUT_65_ansi_split_bs to LAYOUT_65_ansi_blocker_split_bs

* portal_66/soldered: rename LAYOUT_65_ansi to LAYOUT_65_ansi_blocker

* portal_66/soldered: rename LAYOUT_65_tsangan_split_bs to LAYOUT_65_ansi_blocker_tsangan_split_bs

* portal_66/soldered: rename LAYOUT_65_iso to LAYOUT_65_iso_blocker

* portal_66/soldered: add LAYOUT_65_iso_blocker_split_bs

* portal_66/soldered: add LAYOUT_65_iso_blocker_tsangan_split_bs

* portal_66/soldered: enable Community Layout support

* hotswap.h: use QMK 3-character notation

* hotswap.h: add matrix diagram

* portal_66/hotswap: rename LAYOUT to LAYOUT_65_ansi_blocker

* portal_66/hotswap: enable Community Layout support
 2021-11-23 11:25:55 -08:00
QMK Bot 5f7f791c6e Merge remote-tracking branch 'origin/master' into develop 2021-11-23 19:03:27 +00:00
James Young 8b05d30cd1
Pluckey: Fix QMK Configurator Implementation (#15254) 
* rename LAYOUT to LAYOUT_all

* pluckey.h: add matrix diagram

* pluckey.h: use XXX for KC_NO

* add LAYOUT_ergo macro with keymap

`info.json` had layout data for this macro, but the macro was not present in the source code.

* info.json: correct key sequence

Fixes incorrect key assignments in QMK Configurator.
 2021-11-23 11:02:38 -08:00
Drashna Jaelre 33d8af50c3
[Keyboard] Disable features on SplitKB boards to fit under size (#15262) 2021-11-22 17:22:49 -08:00
Drashna Jaelre 3f656d54d3
[Keyboard] Disable console on Keebio foldkb and iris rev3 (#15260) 2021-11-23 07:32:51 +11:00
Drashna Jaelre e8ce66a0d3
[Keymap] Disable console on Sofle default keymap (#15261) 2021-11-22 20:00:52 +00:00
Drashna Jaelre a726b87db5
[Keyboard] Enable LTO on viktus/sp_mini via keymap (#15263) 2021-11-22 19:59:47 +00:00
Zach White 08ce0142ba
Macros in JSON keymaps (#14374) 
* macros in json keymaps

* add advanced macro support to json

* add a note about escaping macro strings

* add simple examples

* format json

* add support for language specific keymap extras

* switch to dictionaries instead of inline text for macros

* use SS_TAP on the innermost tap keycode

* add the new macro format to the schema

* document the macro limit

* add the json keyword for syntax highlighting

* fix format that vscode screwed up

* Update feature_macros.md

* add tests for macros

* change ding to beep

* add json support for SENDSTRING_BELL

* update doc based on feedback from sigprof

* document host_layout

* remove unused var

* improve carriage return handling

* support tab characters as well

* Update docs/feature_macros.md

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

* escape backslash characters

* format

* flake8

* Update quantum/quantum_keycodes.h

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-22 11:11:35 -08:00
QMK Bot 8181b155db Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:39:00 +00:00
James Young e864786c0b
Ocean Wang Ergo: Fix QMK Configurator Implementation (#15249) 
* info.json: apply friendly formatting

* info.json: update labels; reposition keys

* wang_ergo.h: use XXX for KC_NO

* wang_ergo.h: add matrix diagram

* rename LAYOUT to LAYOUT_all

* move Backspace keycode to top row

Moves the matrix argument/keycode for Backspace to its proper position at the end of the top row.

* add LAYOUT_2x2u with keymap

* info.json: update maintainer field

Use the maintainer's GitHub username.
 2021-11-21 14:38:31 -08:00
QMK Bot 79af7046ca Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:30:04 +00:00
James Young d1cf21bede
Mokey Ginkgo65 Layout Macro Refactor (#15233) 
* rename LAYOUT to LAYOUT_65_ansi_blocker; enable Community Layout support

* refactor default keymaps

Updates grid alignment of keycodes, and adds a Function layer to the default keymap.

* refactor LAYOUT_iso into LAYOUT_65_iso_blocker_split_bs

Adds missing KC_NUBS position, and moves Enter keycode to home row (consistent with QMK Community Layout).

* remove LAYOUT_split_left_shift

With the changes to LAYOUT_65_iso_blocker_split_bs, LAYOUT_split_left_shift maps all the same positions, but in a different sequence, making it redundant.

* refactor LAYOUT_7u_space to LAYOUT_65_iso_blocker_tsangan_split_bs

Moves Enter keycode to home row.

* remove LAYOUT_split_space_1

LAYOUT_split_space_1 differs from LAYOUT_split_space_2 only in the sizes of the split spacebars, and I like the layout rendering of LAYOUT_split_space_2 better. :)

* refactor LAYOUT_split_space_2 into LAYOUT_all

ANSI Enter, split Backspace, split Left Shift, and Split Spacebar.

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_ansi_blocker_tsangan_split_bs

* add LAYOUT_65_iso_blocker

* ginkgo65.h: touch-up block diagrams

* info.json: use maintainer's GitHub username

* bugfix layout macros

Position k1D wasn't being assigned on the ISO layouts or LAYOUT_all.

* rules.mk: update Community Layout support
 2021-11-21 14:29:37 -08:00
QMK Bot 2bdae2356b Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:21:52 +00:00
James Young debb0ecb5d
MW65 RGB Layout Macro Refactor (#15246) 
* mw65_rgb.h: use QMK 3-character notation for matrix identifiers

* mw65_rgb.h: add matrix diagram

* info.json: apply friendly formatting

Update key labels for QMK CLI rendering.

* move rotary encoder keycodes to top row

* info.json: update maintainer field

Use the maintainer's GitHub username.
 2021-11-21 14:21:20 -08:00
QMK Bot 3242ac3092 Merge remote-tracking branch 'origin/master' into develop 2021-11-21 22:17:09 +00:00
James Young c491af01d5
MW75 Layout Macro Refactor (#15247) 
* mw75.h: use QMK 3-character matrix identifiers

* update stock keymaps

Use QMK-native keycode aliases, and update grid alignment of keycodes.

* mw75.h: add matrix diagram

* info.json: apply friendly formatting

* move rotary encoder keycodes to top row

* info.json: update maintainer field

Use the maintainer's GitHub username.
 2021-11-21 14:16:37 -08: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
QMK Bot fb953fb5c3 Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:48:28 +00:00
jels 60b032e3bf
[Keyboard] Added Jels88 (#15090) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-19 19:47:58 -08:00
QMK Bot d08a33a45b Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:44:47 +00:00
James Young f7b24e2965
Meletrix Zoom65 Refactor (#15222) 2021-11-19 19:44:23 -08:00
James Young 9ccd22e8de
Minimon Index Tab touch-up (#15224) 2021-11-19 19:44:10 -08:00
QMK Bot 123015952f Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:42:54 +00:00
James Young 5de50cf645
Undead60M touch-up (#15214) 2021-11-19 19:42:44 -08:00
James Young 0facda9ecb
Lime rev1: fix Configurator implementation (#15213) 2021-11-19 19:42:27 -08:00
QMK Bot 9670a85163 Merge remote-tracking branch 'origin/master' into develop 2021-11-20 03:40:32 +00:00
Drashna Jaelre 7343a2fc93
[Keyboard] Fix xox70 via layout (#15220) 2021-11-19 19:40:02 -08:00
Joel Challis 2728603fe6
Move tmk_core/common/<plat> (#13918) 2021-11-19 10:41:02 -08:00
QMK Bot 43b9e23bae Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:54:22 +00:00
James Young 0107d77c24
Handwired Split65: Fix QMK Configurator Implementation (#15209) 2021-11-19 09:53:42 -08:00
QMK Bot 1888661ed9 Merge remote-tracking branch 'origin/master' into develop 2021-11-19 17:53:12 +00:00