summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-092-2/+3
|\
| * [Keyboard] add Haus PCB (#12434)mechlovin2022-01-082-2/+3
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-091-69/+69
|\|
| * Updated Info.json for westm/westmergo (#15530)WestM2022-01-081-69/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-0911-0/+775
|\|
| * [Keyboard] Add Hillside support (#15399)mmccoyd2022-01-0811-0/+775
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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 developQMK Bot2022-01-0910-0/+309
|\|
| * [keyboard] BumbleBee handwired (#14908)Brandon Claveria2022-01-0810-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-095-54/+133
|\|
| * kbdfans/kbd67/mkiirgb_iso: LAYOUT_65_iso_blocker conformance (#15794)James Young2022-01-085-54/+133
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-0815-0/+580
|\|
| * [Keyboard] Add Kudox Full (#15256)x12022-01-0815-0/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-088-24/+162
|\|
| * [Keyboard] Bathroom Epiphanies Frosty Flake rev 20130602 (#15365)Andrew Missel2022-01-088-24/+162
| | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-089-0/+231
|\|
| * [Keyboard] Glacier handwired (#14758)Brandon Claveria2022-01-089-0/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-0811-0/+465
|\|
| * [Keyboard] bstk100 handwired (#14158)FREEWING.JP2022-01-0811-0/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2022-01-089-0/+272
|\|
| * [Keyboard] KBDfans KBD67 Mk.II RGB ISO (#14830)moyi46812022-01-089-0/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-081-0/+4
|\|
| * [Keyboard] Add caps and scroll indicator LEDs to andromeda PCB (#15793)Andrew Kannan2022-01-081-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-081-0/+1
|\|
| * [Keyboard] Fix inverted ploopy trackball (#15790)dnaq2022-01-081-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-087-0/+148
|\|
| * Add a-ball handwired trackball based on ADSN9800 (#9015)Richard2022-01-077-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit of kball * Pretty much working * Rename to aball * Cleanup * Fix typo and make instructions * Refactor to use qmk spi * Suggestions from ZVECR * Update keyboards/handwired/aball/adns9800_srom_A6.h * Update keyboards/handwired/aball/adns.c * Update keyboards/handwired/aball/adns.c * Update keyboards/handwired/aball/adns.c * Added copyright and source attribution * Update keyboards/handwired/aball/rules.mk Include as quantum lib to help avoid timing issues with LTO * Only send report on change, adj sensitivity, fix src include * Fix issue causing constant reports and bad clamping * Streamline conversion to int, add required wait before burst read * Changes to track develop * Update rules with new feature descriptors, add info.json * Add stub layout * Rework / cleanup key matrix. Add missing CS pin define for new ADNS driver * Add stub keymap to enable compile
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-073-27/+93
|\|
| * JJ50 Touch-Up (#15762)James Young2022-01-073-27/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | * rules.mk: Build Options sorting and white space * use QMK 3-character notation * info.json: apply friendly formatting * info.json: use 3-character notation * move layout macro alias to info.json * number matrix identifiers by electrical position
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-071-262/+61
|\|
| * Dango40: Fix QMK Configurator Implementation (#15761)James Young2022-01-071-262/+61
| | | | | | | | | | | | | | * friendly-format info.json * correct info.json structure * info.json: update key labels
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-0711-0/+510
|\|
| * [Keyboard] Hard Light Mark 2 and keymaps (#13719)FateEverywhere2022-01-0711-0/+510
| | | | | | | | | | | | | | | | | | | | | | | | * Hard Light Mark 2 and keymaps This time with minor competence! * Update keyboards/edi/hardlight/mk2/rules.mk * Delete config.h * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-073-0/+47
|\|
| * [Keymap] Adding Frosty Flake VIA keymap (#13211)chance2022-01-073-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * updated my personal layouts * added Artix to install script * setting up for PR * added Artix to install script * Created frosty flake via keymap.c Created the default VIA keymap.c file for the Frosty Flake controller * Create rules.mk * add #define DYNAMIC_KEYMAP_LAYER_COUNT 3 * Update keymap.c * Delete keyboards/tada68/keymaps/trashcat directory * Create keymap.c * Create README.md * Create rules.mk * Delete keyboards/whitefox/keymaps/trashcat directory * Update qmk_install.sh * Rename README.md to readme.md * Update keymap.c * Update keymap.c * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-079-0/+277
|\|
| * [Keyboard] Add croxsplit44 handwired keyboard (#14227)Samuel Fischer2022-01-079-0/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Delete keyboards/croxsplit44 directory * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Apply suggestions from code review * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-073-0/+106
|\|
| * [Keymap] Add masoncowen planck keymap (#14353)Mason2022-01-063-0/+106
| | | | | | Co-authored-by: Drashna Jael're <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-0710-0/+249
|\|
| * [Keyboard] Adalyn keyboard (#14184)TJ2022-01-0610-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * first Adalyn commit * fixed json and removed via * fixed GPL headers and rules.mk * fix extra space after gpl add vial keymap * Removed VIAL and revised rules.mk * updating per request and completing readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-0710-0/+503
|\|
| * [Keyboard] Add Support for Wren Keyboard (#14570)Walter Hanley2022-01-0610-0/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |