summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2023-07-08 01:01:36 +1000
committerfauxpark <fauxpark@gmail.com>2023-07-08 01:01:36 +1000
commitea1a9c37ed76aac93205b1aec38b11a310a50591 (patch)
treea9b8c1255aded2d43bc90dc1fdadc739411d8cfb
parentb32392f7b20e98f9776ef3f7dd79b1c43bd41c9d (diff)
parent71f0fc59bef7a37b55c7e1c10b1b21b8a86475b7 (diff)
Merge remote-tracking branch 'upstream/master' into develop
-rw-r--r--keyboards/amjkeyboard/amj84/info.json362
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default/keymap.c4
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default_ansi_rwkl/keymap.c57
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default_iso_rwkl/keymap.c57
-rw-r--r--keyboards/amjkeyboard/amj84/matrix_diagram.md24
-rw-r--r--keyboards/bpiphany/pegasushoof/2013/info.json2
-rw-r--r--keyboards/bpiphany/pegasushoof/2015/info.json2
-rw-r--r--keyboards/cipulot/rf_r1_8_9xu/info.json1
-rw-r--r--keyboards/converter/usb_usb/info.json2
-rw-r--r--keyboards/custommk/evo70_r2/config.h90
-rw-r--r--keyboards/custommk/evo70_r2/halconf.h36
-rw-r--r--keyboards/custommk/evo70_r2/info.json152
-rw-r--r--keyboards/custommk/evo70_r2/keymaps/default/keymap.c33
-rw-r--r--keyboards/custommk/evo70_r2/keymaps/via/config.h13
-rw-r--r--keyboards/custommk/evo70_r2/keymaps/via/keymap.c33
-rw-r--r--keyboards/custommk/evo70_r2/keymaps/via/rules.mk2
-rw-r--r--keyboards/custommk/evo70_r2/matrix.c117
-rw-r--r--keyboards/custommk/evo70_r2/mcuconf.h58
-rw-r--r--keyboards/custommk/evo70_r2/readme.md21
-rw-r--r--keyboards/custommk/evo70_r2/rules.mk11
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/info.json76
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c45
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/scotto/config.h23
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/scotto/keymap.c174
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/scotto/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/readme.md27
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/rules.mk1
-rw-r--r--keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.c72
-rw-r--r--keyboards/jkeys_design/gentleman65/keymaps/briianpowell/features/custom_shift_keys.h99
-rw-r--r--keyboards/jkeys_design/gentleman65/keymaps/briianpowell/keymap.c11
-rw-r--r--keyboards/jkeys_design/gentleman65/keymaps/briianpowell/readme.md2
-rw-r--r--keyboards/jkeys_design/gentleman65/keymaps/briianpowell/rules.mk1
-rw-r--r--keyboards/jkeys_design/gentleman65/rules.mk2
-rw-r--r--keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h44
-rw-r--r--keyboards/keyboardio/atreus/keymaps/slotthe/config.h19
-rw-r--r--keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c328
-rw-r--r--keyboards/keyboardio/atreus/keymaps/slotthe/readme.md251
-rw-r--r--keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk9
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h3
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c135
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md14
-rw-r--r--keyboards/lily58/keymaps/pomodoro/config.h56
-rw-r--r--keyboards/lily58/keymaps/pomodoro/keymap.c154
-rw-r--r--keyboards/lily58/keymaps/pomodoro/pomodoro.c249
-rw-r--r--keyboards/lily58/keymaps/pomodoro/rules.mk23
-rw-r--r--keyboards/monsgeek/m6/config.h51
-rw-r--r--keyboards/monsgeek/m6/halconf.h23
-rw-r--r--keyboards/monsgeek/m6/info.json232
-rw-r--r--keyboards/monsgeek/m6/keymaps/default/keymap.c76
-rw-r--r--keyboards/monsgeek/m6/keymaps/via/keymap.c76
-rw-r--r--keyboards/monsgeek/m6/keymaps/via/rules.mk1
-rw-r--r--keyboards/monsgeek/m6/m6.c197
-rw-r--r--keyboards/monsgeek/m6/mcuconf.h24
-rw-r--r--keyboards/monsgeek/m6/readme.md19
-rw-r--r--keyboards/monsgeek/m6/rules.mk2
-rw-r--r--keyboards/stront/config.h95
-rw-r--r--keyboards/stront/display.c125
-rw-r--r--keyboards/stront/display.h20
-rw-r--r--keyboards/stront/halconf.h9
-rw-r--r--keyboards/stront/info.json147
-rw-r--r--keyboards/stront/keymaps/default/keymap.c107
-rw-r--r--keyboards/stront/keymaps/hid/config.h7
-rw-r--r--keyboards/stront/keymaps/hid/hid_display.c240
-rw-r--r--keyboards/stront/keymaps/hid/hid_display.h29
-rw-r--r--keyboards/stront/keymaps/hid/keymap.c187
-rw-r--r--keyboards/stront/keymaps/hid/lv_conf.h15
-rw-r--r--keyboards/stront/keymaps/hid/rules.mk5
-rw-r--r--keyboards/stront/keymaps/i2c/config.h8
-rw-r--r--keyboards/stront/keymaps/i2c/halconf.h8
-rw-r--r--keyboards/stront/keymaps/i2c/keymap.c107
-rw-r--r--keyboards/stront/keymaps/i2c/mcuconf.h9
-rw-r--r--keyboards/stront/keymaps/i2c/rules.mk1
-rw-r--r--keyboards/stront/keymaps/zzeneg/config.h30
-rw-r--r--keyboards/stront/keymaps/zzeneg/fonts/montserrat_20_en_ru.c782
-rw-r--r--keyboards/stront/keymaps/zzeneg/fonts/montserrat_48_digits.c189
-rw-r--r--keyboards/stront/keymaps/zzeneg/halconf.h8
-rw-r--r--keyboards/stront/keymaps/zzeneg/icons/flag_pl.c42
-rw-r--r--keyboards/stront/keymaps/zzeneg/icons/flag_ru.c42
-rw-r--r--keyboards/stront/keymaps/zzeneg/icons/flag_uk.c46
-rw-r--r--keyboards/stront/keymaps/zzeneg/keymap.c305
-rw-r--r--keyboards/stront/keymaps/zzeneg/lv_conf.h148
-rw-r--r--keyboards/stront/keymaps/zzeneg/mcuconf.h9
-rw-r--r--keyboards/stront/keymaps/zzeneg/rules.mk17
-rw-r--r--keyboards/stront/keymaps/zzeneg/zzeneg_display.c242
-rw-r--r--keyboards/stront/keymaps/zzeneg/zzeneg_display.h27
-rw-r--r--keyboards/stront/lv_conf.h18
-rw-r--r--keyboards/stront/lvgl_helpers.c113
-rw-r--r--keyboards/stront/lvgl_helpers.h13
-rw-r--r--keyboards/stront/mcuconf.h12
-rw-r--r--keyboards/stront/readme.md45
-rw-r--r--keyboards/stront/rules.mk12
-rw-r--r--keyboards/stront/stront.c61
-rw-r--r--keyboards/stront/stront.h6
-rw-r--r--keyboards/viktus/styrka_topre/ec.c191
-rw-r--r--keyboards/viktus/styrka_topre/ec.h31
-rw-r--r--keyboards/viktus/styrka_topre/info.json438
-rw-r--r--keyboards/viktus/styrka_topre/keymaps/default/keymap.c27
-rw-r--r--keyboards/viktus/styrka_topre/keymaps/via/keymap.c27
-rw-r--r--keyboards/viktus/styrka_topre/keymaps/via/rules.mk1
-rw-r--r--keyboards/viktus/styrka_topre/readme.md27
-rw-r--r--keyboards/viktus/styrka_topre/rules.mk3
-rw-r--r--keyboards/viktus/styrka_topre/styrka_topre.c49
-rw-r--r--keyboards/winry/winry25tc/info.json5
-rw-r--r--keyboards/winry/winry25tc/keymaps/lightsout/keymap.c136
-rw-r--r--keyboards/winry/winry25tc/keymaps/lightsout/readme.md3
-rw-r--r--layouts/community/ortho_4x10/scotto/keymap.c74
-rw-r--r--layouts/community/split_3x5_2/scotto/keymap.c78
-rw-r--r--layouts/community/split_3x5_3/scotto/keymap.c75
-rw-r--r--layouts/default/60_jis/default_60_jis/keymap.c27
-rw-r--r--layouts/default/60_jis/info.json80
-rw-r--r--layouts/default/60_jis/layout.json5
-rw-r--r--layouts/default/60_jis/readme.md3
-rw-r--r--layouts/default/64_ansi/default_64_ansi/keymap.c41
-rw-r--r--layouts/default/64_iso/default_64_iso/keymap.c41
-rw-r--r--layouts/default/fullsize_jis/default_fullsize_jis/keymap.c32
-rw-r--r--layouts/default/fullsize_jis/info.json125
-rw-r--r--layouts/default/fullsize_jis/layout.json6
-rw-r--r--layouts/default/fullsize_jis/readme.md3
-rw-r--r--layouts/default/readme.md69
-rw-r--r--layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymaps.c32
-rw-r--r--layouts/default/tkl_f13_jis/info.json108
-rw-r--r--layouts/default/tkl_f13_jis/layout.json6
-rw-r--r--layouts/default/tkl_f13_jis/readme.md3
-rw-r--r--layouts/default/tkl_jis/default_tkl_jis/keymap.c32
-rw-r--r--layouts/default/tkl_jis/info.json107
-rw-r--r--layouts/default/tkl_jis/layout.json6
-rw-r--r--layouts/default/tkl_jis/readme.md5
-rw-r--r--users/scotto/config.h25
-rw-r--r--users/scotto/readme.md17
-rw-r--r--users/scotto/rules.mk11
-rw-r--r--users/scotto/scotto.c15
-rw-r--r--users/scotto/scotto.h69
-rw-r--r--users/scotto/tap_dance.c154