summaryrefslogtreecommitdiffstats
path: root/keyboards/bastardkb
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-11-15 08:52:19 +0000
committerQMK Bot <hello@qmk.fm>2022-11-15 08:52:19 +0000
commit4238d49efe7d1fc461864dd57bbdf22a157e7f59 (patch)
tree4d612e45b7ef7e99f261565856eecf365d10a17f /keyboards/bastardkb
parent1a3f2130d5feeeccada90ebb1d96cde5232459e0 (diff)
parent30b2dbe369b3a61d1d6681b0a689dbcdd41fc221 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb')
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h16
-rw-r--r--keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/readme.md (renamed from keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/README.md)0
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h70
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/config.h (renamed from keyboards/bastardkb/dilemma/splinky/splinky.c)22
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/config.h27
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h63
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/halconf.h24
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/mcuconf.h32
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk38
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h3
-rw-r--r--keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h5
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/config.h27
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/config.h27
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h63
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/halconf.h24
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/mcuconf.h32
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk38
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h16
-rw-r--r--keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/config.h2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h5
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/config.h27
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/config.h27
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h63
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/halconf.h24
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json6
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/mcuconf.h32
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk37
-rw-r--r--keyboards/bastardkb/charybdis/readme.md19
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/3x5_2.h37
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/config.h46
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h22
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/info.json4
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h23
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk34
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json46
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h (renamed from keyboards/bastardkb/dilemma/keymaps/bstiq/config.h)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/keymap.c (renamed from keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/readme.md (renamed from keyboards/bastardkb/dilemma/keymaps/bstiq/README.md)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c (renamed from keyboards/bastardkb/dilemma/keymaps/default/keymap.c)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h (renamed from keyboards/bastardkb/dilemma/keymaps/drashna/config.h)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c (renamed from keyboards/bastardkb/dilemma/keymaps/drashna/keymap.c)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk (renamed from keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h91
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c229
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/readme.md67
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/config.h (renamed from keyboards/bastardkb/dilemma/splinky/config.h)2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h (renamed from keyboards/bastardkb/dilemma/splinky/halconf.h)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/info.json3
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h (renamed from keyboards/bastardkb/dilemma/splinky/mcuconf.h)0
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk (renamed from keyboards/bastardkb/dilemma/rules.mk)13
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.c83
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.h39
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/config.h71
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/halconf.h23
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/info.json49
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h145
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c223
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/readme.md3
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c84
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/mcuconf.h26
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/readme.md5
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/rules.mk36
-rw-r--r--keyboards/bastardkb/dilemma/config.h1
-rw-r--r--keyboards/bastardkb/dilemma/dilemma.c18
-rw-r--r--keyboards/bastardkb/dilemma/dilemma.h27
-rw-r--r--keyboards/bastardkb/dilemma/elitec/info.json6
-rw-r--r--keyboards/bastardkb/dilemma/elitec/rules.mk5
-rw-r--r--keyboards/bastardkb/dilemma/info.json43
-rw-r--r--keyboards/bastardkb/dilemma/readme.md8
-rw-r--r--keyboards/bastardkb/dilemma/splinky/info.json6
-rw-r--r--keyboards/bastardkb/dilemma/splinky/rules.mk9
-rw-r--r--keyboards/bastardkb/scylla/blackpill/halconf.h4
-rw-r--r--keyboards/bastardkb/scylla/blackpill/mcuconf.h28
-rw-r--r--keyboards/bastardkb/scylla/readme.md23
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/config.h2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v2/config.h22
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v3/config.h22
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/config.h48
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/halconf.h23
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/info.json6
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h29
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/rules.mk32
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/halconf.h4
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/mcuconf.h28
-rw-r--r--keyboards/bastardkb/skeletyl/readme.md20
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/config.h2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/readme.md6
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v2/config.h22
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v2/rules.mk2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v3/config.h22
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky/v3/rules.mk2
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/config.h (renamed from keyboards/bastardkb/dilemma/elitec/config.h)25
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h23