summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-167-0/+209
|\
| * New keyboard: wsk/alpha9 (#10430)ridingqwerty2020-12-167-0/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding alpha variants * adding cajal layouts * adding V2 PCB support adding additional layouts for new PCB version, and correecting incorrect image in info file * Cleanup master -- remove alpha9 * Cleanup master -- remove g4m3ralpha * Cleanup master -- remove cajal & sl40 * Master cleanup -- re-add sl40 * Master cleanup -- correct SL40 image * Add keyboard: wsk/alpha9 * Cleaned up default keymap * Removed misleading keymap README * Slight tweak to default keymap.c * Added license attribution to .{c,h} files * Update keyboards/wsk/alpha9/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wsk/alpha9/alpha9.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wsk/alpha9/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wsk/alpha9/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/wsk/alpha9/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/wsk/alpha9/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/wsk/alpha9/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wsk/alpha9/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/wsk/alpha9/alpha9.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/wsk/alpha9/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: worldspawn00 <mcmancuso@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-164-9/+14
|\|
| * Added Split Backspace Support for the Nemui (#11131)cBachoo2020-12-164-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added nemui layout * via support working * added license headers for c and h files * Update keyboards/nemui/keymaps/via/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nemui/nemui.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nemui/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nemui/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nemui/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * removed nemui.json as it was supposed to only be in via repo * Update keyboards/nemui/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/nemui/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/nemui/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/nemui/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/nemui/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * added split backspace support for the nemui * need to also update the qmk keymap * fixed info.json to have the new keys * vusb changes shouldn't have happened Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1681-291/+108
|\|
| * Normalise include statements in keyboard code (#11185)Ryan2020-12-1681-291/+108
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-166-506/+203
|\|
| * CLI-ify rgblight_breathing_table_calc.c (#11174)Ryan2020-12-166-506/+203
| | | | | | | | Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@drpepper.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-151-1/+1
|\|
| * gh60/satan: fix indicator LED define (#11216)Ryan2020-12-151-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1513-233/+414
|\|
| * [Keymap] Helix default keymap oled update (#11152)MakotoKurauchi2020-12-1513-233/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update keyboards/helix/rev2/local_features.mk - Improved parsing of the `HELIX =` option * add 'is_mac_mode()' into keyboards/helix/rev2/rev2.c * update helix/rev2/keymaps/default/keymap.c: use rgblight query functions * Makes the OLED driver used by the helix:default keymap switchable. * use TOP/drivers/oled/oled_driver.c `make helix:default` or `make OLED_SELECT=core helix:default` * use helix/local_drivers/ssd1306.c `make OLED_SELECT=local helix:default` * Separated the OLED related code from keymap.c and moved it to oled_display.c. * Change the 'led_test' keymap to follow the changes in the 'default' keymap. * update helix/rev2/keymaps/default/oled_display.c * add '#define OLED_UPDATE_INTERVAL 50' into keyboards/helix/rev2/config.h * Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks * add readme.md for helix/rev2 * Apply drashna's suggestions to rev2.c. * Apply drashna's suggestions to rev3_4rows.c, rev3_5rows.c. Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-149-0/+315
|\|
| * [Keyboard] rart/rart45 (#11096)labahuy2020-12-149-0/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create config.h * Create info.json * Create rart45.c * Create rart45.h * Create readme.md * Create rules.mk * Create keymap.c * Create keymap.c * Create rules.mk * Update config.h * Update rart45.c * Update rart45.h * Update rules.mk * Update readme.md * Update info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-141-3/+10
|\|
| * Selectively enable command and console for yanfali userspace (#11212)Yan-Fa Li2020-12-141-3/+10
| | | | | | | | | | | | | | | | | | | | * Remove command and console - these options prevent community layouts from being built on other keyboards. Selectively enable it on keyboards I own rather than on everything. * Update users/yanfali/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-131-1/+2
|\|
| * Another attempt to fix formatting workflow (#11187)Joel Challis2020-12-131-1/+2
| |
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 14:15:20 +0000