summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-20[Keymap] fix keyboards/helix/rev2/keymaps/default/oled_display.c (#11228)Takeshi ISHII
Fixed the OLED display on the right side as it was showing some garbage. 右側のOLEDディスプレイにゴミが表示されていたのを修正しました。
2020-12-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-19VIA Support: MF68 (#11030)MechMerlin
* add via support to mf68 pcb * add license header
2020-12-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-19Change keyboard json format to bring it inline with the current api (#11231)Zach White
2020-12-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-19[Keyboard] Add drashna's dactyl manuform 5x6 with trackball (#11062)Drashna Jaelre
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2020-12-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-18simplify qmk doctor to make room for #11208 (#11242)Zach White
2020-12-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-18Updated usage of qmk c2json (#11148)precondition
2020-12-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-18Add the ability to exclude keyboards from travis builds (#11178)Zach White
* add the ability to exclude keyboards from travis builds * add filtering to make all: * only skip keyboards during make all: * working implementation * forego a CI_KEYBOARDS variable * optimize the startup by only listing keyboards once * add sort -u to all list_keyboard invocations * move the if else if tree back to 1 level
2020-12-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-18Various compilation fixes for avr-gcc 10 (#9269)Joel Challis
2020-12-17Fix duplicate I2C_KEYMAP_START define (#11237)Ryan
2020-12-18Merge remote-tracking branch 'upstream/master' into developfauxpark
2020-12-17Run cformat and dos2unix manually (#11235)Ryan
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-17[Keyboard] add MT64RGB (#10865)maikong
* Create mt64 * Create mt84rgb * Delete mt64 * Add files via upload * Create MK84RGB * gx84 * add new keyboard * new keyboard * Delete MK84RGB * Delete config.h * Delete mt84.c * Delete mt84.h * Delete mt84rgb * Delete rules.mk * add info json * Add files via upload * Delete config.h * Delete rules.mk * Delete keymap.c * Delete keymap.c * Delete info.json * Delete mt64rgb.c * Delete mt64rgb.h * Delete rules.mk * add keyboard * Delete config.h * Delete info.json * Delete mt64rgb.c * Delete mt64rgb.h * Delete rules.mk * Delete rules.mk * Delete keymap.c * Delete keymap.c * Delete config.h * Delete mt84.c * Delete mt84.h * Delete rules.mk * Delete rules.mk * Delete keymap.c * Delete keymap.c * Delete info.json * Add files via upload * Delete keymap.c * Add files via upload * Delete keymap.c * Add files via upload * Delete rules.mk * Add files via upload * Delete config.h * Add files via upload * Update config.h * Update keymap.c * Update keymap.c * Update and rename keyboards/mt64rgb/keymaps/default/keymap.c to 键盘/mt64rgb/按键图/默认/keymap.c * Update mt64rgb.h * Update mt64rgb.c * Update and rename keyboards/mt64rgb/rules.mk to 键盘/mt64rgb/rules.mk * Update config.h * Update rules.mk * Update readme.md * Update keymap.c * Create rules.mk * Update keymap.c * Create keymap.c * Delete keymap.c * Update keymap.c * Update keymap.c * Update mt64rgb.h * Delete rules.mk * Update readme.md * Update rules.mk * Update readme.md * Update info.json * Update keymap.c * Update mt64rgb.c * Update config.h * Update keymap.c * Update readme.md * Update rules.mk * Update keymap.c * Update config.h * Update readme.md * Update rules.mk * Update readme.md * Update config.h
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keymap] ISO layout for KBD67 rev 2.0 (#11136)hekekee
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] add Labyrinth75 (#11135)Liviturtle
* added Labyrinth75 * changed to lowercase inline with the PR checklist * added a correctly formatted image to readme.md * fixed imgur link * fixed info.json * Update keyboards/labyrinth75/keymaps/default/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * Update keyboards/labyrinth75/labyrinth75.h Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> * remove superfluous backslashes * Update keyboards/labyrinth75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keymap] Update based on massdrop/ctrl core changes n(#11134)r-pufky
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Update config for 10 ble oled usbhub pad (#11066)haierwangwei2005
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Add POS78 keyboard (#11024)smssmssms
* Add pos78 keyboard * tidy up links * Added missing commas The missing commas were causing a compile error (Travis CI, #41934 failed). * Added trailing commas On lines 10-14, just missed last line (15). * Travis CI errors Trying to correct errors from Travis CI #41951 failed * Corrected(?) TG(_FN) from Travis CI failure * Revert readme.md to original format Fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> * Remove trailing \ from keymap.c Fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> * Change Vendor and Product ID How do I update the Product ID search tool if 0x7878 is used/good? * Add LAYOUT_ortho_6x13 Update keyboards/pos78/pos78.h Co-authored-by: Drashna Jaelre <drashna@live.com> * I bow to drashna's superior knowledge. Update keyboards/pos78/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * I bow to drashna's superior knowledge. Update keyboards/pos78/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * I bow to drashna's superior knowledge. Update keyboards/pos78/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Added pic * Add picture properly. Update keyboards/pos78/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Remove Bootmagic_enable (fauxpark) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Add program_yoink (#10963)melonbred
* Add new keyboard: program_yoink * Updated rules.mk * Updated split_space keymap Fixed split_space keymap and now builds with no errors. * Update keyboards/program_yoink/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/program_yoink.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/program_yoink.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/split_bar/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/split_bar/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/split_bar/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/program_yoink/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/program_yoink/readme.md per code review * Apply suggestions from code review * Update keyboards/program_yoink/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/program_yoink/config.h Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-16[Keyboard] Box75 (#10949)Álvaro A. Volpato
* Initial BOX75 PCB v1.0.6 PCB support * New prototype firmware * Correct column pin assignment * Update README * Update keyboards/box75/config.h Remove USB description Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/box75/rules.mk Remove comment lines from BLUETOOTH_ENABLE and AUDIO_ENABLE Co-authored-by: Ryan <fauxpark@gmail.com> * Add VIA support * Remove KC_NO define and use traditional one * Update keyboards/box75/keymaps/default/keymap.c Move KC_HOME location on keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/box75/box75.h Move HOME key location on keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Changed F13 to print screen in default VIA firmware Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com> 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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:47:21 +0000