summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-133-4/+7
|\
| * Add i2c 24LC64 eeprom (#11200)Xelus222020-12-143-4/+7
| | | | | | | | | | | | | | | | | | | | | | * add 24LC64 eeprom * docs update * Update docs/eeprom_driver.md Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-121-1/+1
|\|
| * Fix incorrect search order for `rgblight_breathe_table.h` that `rgblight.c` ↵Takeshi ISHII2020-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | includes. (#11192) When `rgblight.c` includes `rgblight_breathe_table.h`, the search order should be as follows. * `keyboards/KEYBOARD/keymaps/USER/rgblight_breathe_table.h` * `users/USER/rgblight_breathe_table.h` * `quantum/rgblight_breathe_table.h` However, the current implementation was wrong, so I fixed it.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-111-2/+2
|\|
| * Fixed french quotes on canadian multilingual (#11183)Hedgestock2020-12-111-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-118-11/+99
|\|
| * Nightingale Studios Hailey production fixes (#11180)Joel Challis2020-12-116-8/+96
| |
| * CI automated format fixes (#11179)Joel Challis2020-12-112-3/+3
| | | | | | | | | | * Format all C files for now, till diff logic works within CI * Fix recursion of dos2unix
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-111-2/+4
|\|
| * Add XD75am as supported in XD75 readme (#11170)David Heck2020-12-111-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1160-79/+99
|\|
| * Normalise include statements in core code (#11153)Ryan2020-12-1160-79/+99
| | | | | | | | | | * Normalise include statements in core code * Missed one
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-101-2/+2
|\|
| * Fix warning logic when running 'qmk format -a' (#11177)Joel Challis2020-12-101-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-105-6/+48
|\|
| * CI: Add workflow for codebase formatting (#7382)Joel Challis2020-12-105-6/+48
| | | | | | | | | | | | | | | | | | * Add workflow for codebase formatting * stash * review comments * Swap to a more complete push action
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-103-0/+50
|\|
| * add Via keymap for beatervan (#11159)ojthetiny2020-12-103-0/+50
| | | | | | | | | | * add via keymap for beatervan * fixed error in rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-103-0/+57
|\|
| * add VIA keymap for edc40 (#11160)ojthetiny2020-12-103-0/+57
| | | | | | | | | | * add via keymap for edc40 * fix error in keymap
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-101-12/+1
|\|
| * Use progmem.h for claw44 glcdfont (#11164)Ryan2020-12-101-12/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-091-2/+8
|\|
| * [Keyboard] Valor FRL TKL update - EEPROM change (#11163)Xelus222020-12-091-2/+8
| | | | | | | | | | | | | | * valor fix * change eeprom * fix up eeprom
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-094-4/+4
|\|
| * Fixup config template to match <> instead of "" for includes. (#11166)Nick Brassel2020-12-094-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-092-33/+50
|\|
| * Fix titan60 and h660 error_log complaints (#11124)Ryan2020-12-092-33/+50
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2020-12-0989-47/+4479
|\|
| * [Keymap] Fix rules.mk for nullbits nibble oled keymap (#11142)Jay Greco2020-12-081-1/+1
| |
| * [Keyboard] Geekboards Macropad V2 keyboard (#11045)Sergey Omelchenko2020-12-0815-0/+1810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit of Geekboards Macropad V2 keyboard * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Apply suggestions from code review: delete unnecessary files * Fixed typos * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Change RGB_MATRIX config syntax following recent core changes * Apply suggestions from drashna code review * Remove unnecessary file (it is now defined in the core) * Remove unnecessary code, due to PR 11084 approve Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Fixed taleguers75 info.json (#11121)Borja López Jiménez2020-12-081-10/+10
| |
| * Add missing hardware availability for Plank EZ (#11069)Charles A Moonen2020-12-081-1/+1
| | | | | | Add missing information needed to mirror the supported hardware in the previous line
| * [Keyboard] Big Dill Extended by MechWild (#11047)Kyle McCreery2020-12-0825-0/+774
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] New Keyboard - BDE Added the Big Dill Extended by MechWild * Corrected pinout for righty config Corrected the copied line from the lefty config that had not been updated prior to this commit. * Corrected the files that had been overwritten with old versions during testing. * Update keyboards/mechwild/bde/lefty/config.h * Made changes based on suggestions. Added GPL and split preference config.h lines into keymap level. * Apply suggestions from code review Readme cleanup * Update keyboards/mechwild/bde/lefty/keymaps/fancy/config.h * Update keyboards/mechwild/bde/lefty/keymaps/via/config.h * Apply suggestions from code review Corrects a stray style line in one of the readme files as well as correcting the name of the keymap layout from the inaccurate 3x14 name to just "layout"
| * add via layout for aek2 usb pcb (#11125)kb-elmo2020-12-083-0/+40
| |
| * [Keyboard] Add nt980 (#11092)Evy Dekkers2020-12-079-0/+739
| | | | | | | | | | * Add nt980 * update LED configuration
| * [Keyboard] New keyboard SLZ40 (#11088)sithlord1212020-12-078-0/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New SLZ40 keyboard new keyboard added * Update readme.md * Update info.json * Delete slz40_default.hex * Update keyboards/slz40/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/slz40/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update readme.md * Update readme.md Co-authored-by: Joel Challis <git@zvecr.com>
| * [Keyboard] Add Bastyl keyboard (#11085)Quentin2020-12-077-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add bastyl * no need to copy the folder anymore * clean up according to PR rules * remove via, fix disposition * add reset button on right half * Update readme.md * Update keyboards/hidtech/bastyl/bastyl.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Joel Challis <git@zvecr.com> * move json, remove via files * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * add GPL to c and h files * Update keyboards/hidtech/bastyl/info.json Change order to match layout macro Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * serial define can be ommited, is used by default Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add customMK Genesis Macro Pad (#11080)David Hoelscher2020-12-0713-0/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | * Adding customMK Genesis keyboard and keymap files * Updated readme.md fixed a typo * Fixed code for QMK PR * Updated syntax in config.h and changed dfu to flash in readme Co-authored-by: Ray <ray@custommk.com>
| * [Keymap] sneakbox keymap and userspace code (redo) (#10977)stanrc852020-12-074-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for LAYOUT_alice to sneakbox pcb * define variables for sneakbox led pins * set rules for sneakbox pcb * add rotary encoder to userspace * fix rotary function * add custom layer indicators for sneakbox * Revert "Add support for LAYOUT_alice to sneakbox pcb" This reverts commit 5ed94d8d897de6ef4f7a349368a6342cef5eff06. * add license header * Use KEYBOARD_sneakbox_aliceclone * cleaned up indicator code
| * Fix lineending in mt84 files (#11150)Erovia2020-12-072-35/+35
| |
* | ChibiOS conf migration: dekunukem/duckypad (#11123)Nick Brassel2020-12-083-1366/+83
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-079-0/+451
|\|
| * add mt84 keyboard (#10857)maikong2020-12-079-0/+451
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-0716-0/+591
|\|
| * Eek! keyboard firmware merge into QMK (#11020)James Smith2020-12-0716-0/+591
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-073-0/+58
|\|
| * Add VIA support for E88 (#11065)monjebf2020-12-073-0/+58
| | | | | | | | | | | | * Add VIA support for E88 * Update keyboards/e88/keymaps/via/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-064-0/+243
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:44:39 +0000