summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Iron180 (#10948)Álvaro A. Volpato
* Initial CK60i support * Initial Iron180 support * Add PWM support * Feedback from PCB protos * Update README * Remove CK60i references * Remove KC_NO ____ definition and replaced with predefined * Remove description field in USD descriptors * Shorten bluetooth enable and audio output comments on rules.mk * Initial VIA support Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Technika (#10946)Álvaro A. Volpato
* Initial technika support * Updated README * Update keyboards/technika/config.h Remove DESCRIPTION from usb desciptor fields Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/technika/rules.mk Remove words from comments in rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Remove old KC_NO definitions and used default one * Use defines for num, caps and scroll lock LED pins * Fix underscore KC_NO substitution in keymap Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-17Add modifier state to the split keyboard transport (#10400)Casey Webster
* Add modifier state to the split transport This adds modifier state to the i2c and serial transport for split keyboards. The purpose of this is to allow e.g. displaying modifier state on the slave side of a split keyboard on an oled. This adds one byte to the data transferred between halves. This also fixes a missing ifdef guard for BLACKLIGHT_ENABLE. Break modifiers into real/weak/oneshot Fix incorrect slave serial mod setting Fix typo in serial weal mod setter Fix build errors for the I2C code that I introduced Code cleanup and formatting per project preferences Correctly get oneshot mods Fix missing braces Remove unneeded ifdef guard Make the added state transport optional Add documentation for the new define to enable this feature Fix stray grave mark * Fix error introduced in conflict resolution
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16Yet another stab at trying to get github actions to push (#11230)Joel Challis
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Add rart/rart4x4 with VIA support (#11095)Alabahuy
* Create config.h * Create info.json * Create rart4x4.c * Create rart4x4.h * Create readme.md * Create rules.mk * Create keymap.c * Create keymap.c * Rename keyboards/rart/rart4x4/default/keymap.c to keyboards/rart/rart4x4/keymaps/default/keymap.c * Rename keyboards/rart/rart4x4/via/keymap.c to keyboards/rart/rart4x4/keymaps/via/keymap.c * Create rules.mk * Update info.json * Update keymap.c * Update rart4x4.h * Update rules.mk
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16New keyboard: wsk/alpha9 (#10430)ridingqwerty
* 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>
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16Added Split Backspace Support for the Nemui (#11131)cBachoo
* 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>
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16Normalise include statements in keyboard code (#11185)Ryan
2020-12-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16CLI-ify rgblight_breathing_table_calc.c (#11174)Ryan
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@drpepper.org>
2020-12-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-15gh60/satan: fix indicator LED define (#11216)Ryan
2020-12-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-15[Keymap] Helix default keymap oled update (#11152)MakotoKurauchi
* 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>
2020-12-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-14[Keyboard] rart/rart45 (#11096)labahuy
* 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
2020-12-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-14Selectively enable command and console for yanfali userspace (#11212)Yan-Fa Li
* 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
2020-12-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-13Another attempt to fix formatting workflow (#11187)Joel Challis
2020-12-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-14Add i2c 24LC64 eeprom (#11200)Xelus22
* 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>
2020-12-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-13Fix incorrect search order for `rgblight_breathe_table.h` that `rgblight.c` ↵Takeshi ISHII
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.
2020-12-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-11Fixed french quotes on canadian multilingual (#11183)Hedgestock
2020-12-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-11Nightingale Studios Hailey production fixes (#11180)Joel Challis
2020-12-11CI automated format fixes (#11179)Joel Challis
* Format all C files for now, till diff logic works within CI * Fix recursion of dos2unix
2020-12-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-11Add XD75am as supported in XD75 readme (#11170)David Heck
2020-12-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-11Normalise include statements in core code (#11153)Ryan
* Normalise include statements in core code * Missed one
2020-12-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-10Fix warning logic when running 'qmk format -a' (#11177)Joel Challis
2020-12-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-10CI: Add workflow for codebase formatting (#7382)Joel Challis
* Add workflow for codebase formatting * stash * review comments * Swap to a more complete push action
2020-12-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-10add Via keymap for beatervan (#11159)ojthetiny
* add via keymap for beatervan * fixed error in rules.mk
2020-12-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-10add VIA keymap for edc40 (#11160)ojthetiny
* add via keymap for edc40 * fix error in keymap
2020-12-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-10Use progmem.h for claw44 glcdfont (#11164)Ryan