Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Updated Info.json for westm/westmergo (#15530)
* Added WestM keyboard
* Update keyboards/westm/westm68/config.h
* Update keyboards/westm/westm68/config.h
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Updated Ergo as well to match Drashna's recommended changes
* Added layers for VIA and updated keymaps
* Applied missing changes that were done on 68 but not Ergo
* Update keyboards/westm/westmergo/readme.md
* Update keyboards/westm/westmergo/readme.md
* Update keyboards/westm/westm68/readme.md
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westmergo/rules.mk
* Update keyboards/westm/westm68/rules.mk
* Update keyboards/westm/westmergo/rules.mk
* Update keyboards/westm/westm68/readme.md
* Updated README bootloader and keymaps
* Updated info.json
* Changed to proper layout (for real this time)
* Updated info.json
* Fixed Alice layout in info.json
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add Hillside support (#15399)
* [Keyboard] Add Hillside
* Remove no longer used define, rename README
* Rename to readme.md
* Readme: Improve clarity, fix grammar and typos
* Readme: Remove extra line pointing to QMK docs
* Readme: Join consecutive source lines in .md
* Readme: split lines, post spelling fix
* Keymap: fix key label in readme
Merge remote-tracking branch 'origin/master' into develop
[keyboard] BumbleBee handwired (#14908)
* add bumblebee
* change keymaps
* change PID
* update info.json
* Apply suggestions from code review
* Update keyboards/handwired/swiftrax/bumblebee/rules.mk
* update readme.md
* Update keyboards/handwired/swiftrax/bumblebee/info.json
* edit keymaps
* Update keyboards/handwired/swiftrax/bumblebee/rules.mk
* Update keyboards/handwired/swiftrax/bumblebee/bumblebee.h
* Update keyboards/handwired/swiftrax/bumblebee/info.json
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
Merge remote-tracking branch 'origin/master' into develop
kbdfans/kbd67/mkiirgb_iso: LAYOUT_65_iso_blocker conformance (#15794)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add Kudox Full (#15256)
* Add Kudox Full keyboard
* Add keyboards/kudox_full SPDX identifier
* Modify rule.mk of keyboards/kudox_full
* Remove html code from README of keyboards/kudox_full
* Modify readme of keyboards/kudox_full
* rev1.c includes rev1.h - kudox-full/rev1
* Move to <keyboard>.c oled_task_user and eeconfig_init_user
* Move post_config.h MOUSEKEY_*
* Change BOOTMAGIC_ENABLE no kudox_full
* Modify the obsoleted codes
* Modify eeconfig_init_kb from eeconfig_init_user
* Set none as default, but values
* Add about the bootloader on kudox_full/readme
* Modify the comments in keyboards/kudox_full/rules.mk
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Bathroom Epiphanies Frosty Flake rev 20130602 (#15365)
* add optional support for Frosty Flake rev 20130602
* update documentation with instructions on building for rev 20130602
* support revisions using subfolders instead of preprocessor directives
* rules.mk cleanup
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Glacier handwired (#14758)
* finish adding glacier
* change PID
* Update keyboards/handwired/swiftrax/glacier/info.json
* edit info.json
* Update keyboards/handwired/swiftrax/glacier/info.json
* Apply suggestions from code review
* Update keyboards/handwired/swiftrax/glacier/rules.mk
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] bstk100 handwired (#14158)
* General: Initial commit for bstk100
* bstk100 custom keyboard firmware
* fix Bootloader section
* fix "Pad 0" key twice
* delete via config
* fix readme.md key layout
* add via keymap
* fix readme.md info
* remove keymap.json
* Suggested change readme.md
* moved to handwired folder
* fix readme.md for handwired
* fix info.json
* Suggested change readme.md
* Update keyboards/handwired/bstk100/rules.mk
fix requested changes
* Update keyboards/handwired/bstk100/rules.mk
fix requested changes
* Update keyboards/handwired/bstk100/info.json
* Update keyboards/handwired/bstk100/rules.mk
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] KBDfans KBD67 Mk.II RGB ISO (#14830)
* add kbd67mkiirgb iso keyboard
add kbd67mkiirgb iso keyboard
* Update rules.mk
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
* Update readme.md
* Update readme.md
* Create info.json
* Update info.json
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
* Update keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk