summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2110-0/+536
|\
| * [Keyboard] add Lily58L keymap (#9870)Ben2020-12-2110-0/+536
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | ChibiOS conf migrations... take 3 (#11261)Nick Brassel2020-12-2115-6905/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SPI1 DMA stream definitions. * ChibiOS conf upgrade for acheron/lasgweloth acheron/lasgweloth - 3bedb0fe1f1b542b4d90daeaeab8905cd9ee992c * ChibiOS conf upgrade for box75 box75 - ff91bacf5cec0b42df02967eb0ecbf4bd1b56928 * ChibiOS conf upgrade for geekboards/macropad_v2 geekboards/macropad_v2 - 1c205720d47f7e636173064b1aef1637860a9134 * ChibiOS conf upgrade for iron180 iron180 - 867929d78361a50e34671e4e167cafd927d8982b * ChibiOS conf upgrade for technika technika - cb9295b90980eb8dfdc63d6031533edbb344c045
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-201-1/+1
|\|
| * [Keymap] fix keyboards/helix/rev2/keymaps/default/oled_display.c (#11228)Takeshi ISHII2020-12-201-1/+1
| | | | | | | | Fixed the OLED display on the right side as it was showing some garbage. 右側のOLEDディスプレイにゴミが表示されていたのを修正しました。
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-195-5/+56
|\|
| * VIA Support: MF68 (#11030)MechMerlin2020-12-195-5/+56
| | | | | | | | | | * add via support to mf68 pcb * add license header
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1917-0/+1842
|\|
| * [Keyboard] Add drashna's dactyl manuform 5x6 with trackball (#11062)Drashna Jaelre2020-12-1917-0/+1842
| | | | | | | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-187-0/+0
|\|
| * Add the ability to exclude keyboards from travis builds (#11178)Zach White2020-12-187-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-187-37/+31
|\|
| * Various compilation fixes for avr-gcc 10 (#9269)Joel Challis2020-12-187-37/+31
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2020-12-183-20/+20
|\|
| * Run cformat and dos2unix manually (#11235)Ryan2020-12-173-20/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1710-0/+411
|\|
| * [Keyboard] add MT64RGB (#10865)maikong2020-12-1710-0/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-172-0/+95
|\|
| * [Keymap] ISO layout for KBD67 rev 2.0 (#11136)hekekee2020-12-162-0/+95
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-179-0/+348
|\|
| * [Keyboard] add Labyrinth75 (#11135)Liviturtle2020-12-169-0/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-173-27/+29
|\|
| * [Keymap] Update based on massdrop/ctrl core changes n(#11134)r-pufky2020-12-163-27/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-171-1/+1
|\|
| * [Keyboard] Update config for 10 ble oled usbhub pad (#11066)haierwangwei20052020-12-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-178-0/+274
|\|
| * [Keyboard] Add POS78 keyboard (#11024)smssmssms2020-12-168-0/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1714-0/+525
|\|
| * [Keyboard] Add program_yoink (#10963)melonbred2020-12-1614-0/+525
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1711-0/+1661
|\|
| * [Keyboard] Box75 (#10949)Álvaro A. Volpato2020-12-1611-0/+1661
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-1711-0/+1681
|\|
| * [Keyboard] Iron180 (#10948)Álvaro A. Volpato2020-12-1611-0/+1681
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-179-0/+1620
|\|
| * [Keyboard] Technika (#10946)Álvaro A. Volpato2020-12-169-0/+1620
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-169-0/