summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0110-0/+426
|\|
| * [Keyboard] Pteron36, open source 3x5_3 supporting layout (#13313)Harshit Goel2021-07-0110-0/+426
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-013-0/+206
|\|
| * [Keymap] Create bingocaller keymap for DZ60RGB-ANSI (#13311)Jesper Nellemann Jakobsen2021-07-013-0/+206
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Drashna's split updates (#13350)Drashna Jaelre2021-07-0154-1829/+1899
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0110-0/+400
|\|
| * [Keyboard] Added flygone60 rev3 (#13280)Shandon Anderson2021-07-0110-0/+400
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-015-7/+11
|\|
| * [Keyboard] mb44 - Update info.json and encoder (#13244)melonbred2021-07-015-7/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0157-1027/+1027
|\|
| * Cleanup junk chars, part 4 (#13345)Ryan2021-07-0157-1027/+1027
| |
* | Remove `API_SYSEX_ENABLE`s from rules.mk (#13389)Ryan2021-06-3066-71/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-0111-22/+22
|\|
| * [Update] Change Original TAGs of Japanese translations (#13396)Takeshi ISHII2021-07-0111-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated docs/ja/how_a_matrix_works.md original tag. * Updated docs/ja/api_overview.md original tag. * Updated docs/ja/contributing.md original tag * Updated docs/ja/coding_conventions_c.md original tag * Updated docs/ja/reference_configurator_support.md original tag * Updated docs/ja/reference_glossary.md original tag * Updated docs/ja/api_docs.md original tag * Updated docs/ja/feature_stenography.md original tag * Updated docs/ja/documentation_templates.md original tag * Updated docs/ja/faq_keymap.md original tag * Updated docs/ja/understanding_qmk.md original tag
* | Adds support for STM32L412xB, STM32L422xB. (#13383)Nick Brassel2021-06-3011-3/+467
| | | | | | | | | | | | | | * Adds support for STM32L412xB, STM32L422xB. * Add to list of supported MCUs. * Disable SPI1 by default.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-294-54/+117
|\|
| * Ergocheap handwired Layout Macro refactor (#13348)James Young2021-06-294-54/+117
| | | | | | | | | | | | | | * physically arrange layout macro Arranges the layout macro and keycodes to resemble the assembled keyboard. * update info.json data
* | add kinT kinesis keyboard controller (kint41 variant) (#13333)Michael Stapelberg2021-06-308-0/+322
| | | | | | fixes https://github.com/kinx-project/kint/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-291-1/+1
|\|
| * Update lazydesigners/the40/the40.h (#13354)jackytrabbit2021-06-301-1/+1
| | | | | | Fix error in the40.h
* | Relocate RGB/HSV color defs to a more fitting place (#13377)Ryan2021-06-294-87/+101
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-293-5/+8
|\|
| * Jabberwocky quick fixes (#13369)nopunin10did2021-06-293-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleaning up * deleting to undelete * Stub out defaults * Jabberwocky firmware WIP * Stubbing out keymap spacing * Default keymap and layout updates * start stubbing out JSON for configurator * more WIP * Update jabberwocky.h * Add Readme * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Fix layout capitalization * Updates to personal and default keymaps * Add instructions for jumping the bootloader * Update keyboards/nopunin10did/jabberwocky/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Add easier ctrl-alt-del to my keymap * Undo changes from other master * Add back DYNAMIC_KEYMAP_LAYER_COUNT constant * Fix readme markup to use list items * Give my layout VIA compatibility Co-authored-by: Rossman360 <rmontsinger@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 Bot2021-06-296-0/+304
|\|
| * [Keyboard] Add Quefrency Rev. 4 (#13368)Danny2021-06-286-0/+304
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-294-4/+8
|\|
| * [Keyboard] fix encoder void to bool (#13334)Xelus222021-06-284-4/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-293-28/+28
|\|
| * Swiftrax Nodu handwired: layout macro sequence fix (#13329)James Young2021-06-283-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-291-1/+1
|\|
| * [Bug] Missing empty line at the end of file (#13374)Xelus222021-06-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-284-47/+133
|\|
| * FJLabs BKS65 Solder Layout Macro Refactor (#13347)James Young2021-06-284-47/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * grid align layout macro and keymaps * physically arrange layout macro, phase 1 * physically arrange layout macro, phase 2 * replace KC_PAUSE with KC_PAUS Makes the grid alignment nice. :) * rename LAYOUT_65_ansi to LAYOUT_all The included layout macro isn't actually correct for QMK's 65% ANSI community layout. * add an actual LAYOUT_65_ansi This is a semi-educated guess as to this macro; it may be wrong.
* | Move RGBLight code into its own folder (#13312)Ryan2021-06-289-23/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-271-0/+1
|\|
| * Doctor: print CLI version (#13356)Ryan2021-06-271-0/+1
| |
* | Fix building layouts from JSON (#13310)Joakim Tufvegren2021-06-271-2/+3
| | | | | | Broken by #12632.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-269-152/+415
|\|
| * Exent cleanup (#13353)Ryan2021-06-279-152/+415
| |
* | CLI: Add subcommand to generate version.h (#13151)Ryan2021-06-275-45/+79
| |
* | Error log cleanup (#13349)Zach White2021-06-2634-171/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * error log cleanup: 40percentclub/25 40percentclub/25: Claims to support a community layout that does not exist: ortho_5x5 * error log cleanup: 40percentclub/4x4 ☒ 40percentclub/4x4: Claims to support a community layout that does not exist: ortho_4x8 ☒ 40percentclub/4x4: Claims to support a community layout that does not exist: ortho_4x16 * error log cleanup: 40percentclub/5x5 ☒ 40percentclub/5x5: Claims to support a community layout that does not exist: ortho_5x5 * error log cleanup: 40percentclub/nori ☒ 40percentclub/nori: Claims to support a community layout that does not exist: ortho_4x8 * error log cleanup: barracuda ☒ barracuda: Claims to support a community layout that does not exist: ortho_3x11 * error log cleanup: bpiphany/frosty_flake ☒ keyboards/bpiphany/frosty_flake/frosty_flake.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available! * error log cleanup: bpiphany/pegasushoof/2013 ☒ keyboards/bpiphany/pegasushoof/2013/2013.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available! * error cleanup: bpiphany/pegasushoof/2015 ☒ keyboards/bpiphany/pegasushoof/2015/2015.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available! ☒ keyboards/bpiphany/pegasushoof/2015/2015.h: LAYOUT_tkl_iso: Nested layout macro detected. Matrix data not available! * error log cleanup: 40percentclub ☒ 40percentclub/25: Claims to support a community layout that does not exist: ortho_5x10 ☒ 40percentclub/5x5: Claims to support a community layout that does not exist: ortho_5x10 * error cleanup: converter/usb_usb ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available! ☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available! * error cleanup: ergo42 ☒ ergo42/rev1: Claims to support a community layout that does not exist: ortho_4x14 * error cleanup: handwired/412_64 ☒ handwired/412_64: Claims to support a community layout that does not exist: ortho_4x16 * error log cleanup: handwired/tritium_numpad ☒ handwired/tritium_numpad: Claims to support a community layout that does not exist: nontra_6x4 * error log cleanup: handwired/xealous/rev1 ☒ handwired/xealous/rev1: Claims to support a community layout that does not exist: split60 * error log cleanup: kbdfans/kbd67/rev2 ⚠ kbdfans/kbd67/rev2: info.json uses alias name LAYOUT_65_ansi_blocker_splitbs instead of LAYOUT_65_ansi_blocker_split_bs * error cleanup: keebio/nyquist ☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available! ☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available! ☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available! * error cleanup: kindakeyboards/conone65 ☒ kindakeyboards/conone65: Claims to support a community layout that does not exist: 65_iso_split_bs * error cleanup: latinpadble ☒ latinpadble: Claims to support a community layout that does not exist: pad * error cleanup: masterworks/classy_tkl/rev_a ☒ masterworks/classy_tkl/rev_a: Claims to support a community layout that does not exist: tkl_ansi_wkl * error cleanup: meira ⚠ meira/featherble: info.json uses alias name LAYOUT_ortho_4x12 instead of LAYOUT ⚠ meira/promicro: info.json uses alias name LAYOUT_ortho_4x12 instead of LAYOUT * error cleanup: nopunin10did/jabberwocky ⚠ nopunin10did/jabberwocky: MANUFACTURER in config.h is overwriting manufacturer in info.json * error cleanup: ok60 ☒ ok60: Claims to support a community layout that does not exist: 60_ansi_split_bksp_rshift * error cleanup: ok60 ☒ ok60: Claims to support a community layout that does not exist: 60_ansi_split_bksp_rshift * error cleanup: planck ☒ keyboards/planck/ez/ez.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available! ☒ keyboards/planck/ez/ez.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available! ⚠ planck/thk: DEBOUNCE in config.h is overwriting debounce in info.json ⚠ planck/thk: DEVICE_VER in config.h is overwriting usb.device_ver in info.json ⚠ planck/thk: DIODE_DIRECTION in config.h is overwriting diode_direction in info.json ⚠ planck/thk: MANUFACTURER in config.h is overwriting manufacturer in info.json ⚠ planck/thk: PRODUCT_ID in config.h is overwriting usb.pid in info.json ⚠ planck/thk: VENDOR_ID in config.h is overwriting usb.vid in info.json ⚠ planck/thk: QMK_ESC_OUTPUT in config.h is overwriting qmk_lufa_bootloader.esc_output in info.json ⚠ planck/thk: QMK_ESC_INPUT in config.h is overwriting qmk_lufa_bootloader.esc_input in info.json ⚠ planck/thk: QMK_LED in config.h is overwriting qmk_lufa_bootloader.led in info.json ⚠ planck/thk: QMK_SPEAKER in config.h is overwriting qmk_lufa_bootloader.speaker in info.json ⚠ planck/thk: Matrix pins are specified in both info.json and config.h, the config.h values win. ⚠ planck/thk: LAYOUTS in rules.mk is overwriting community_layouts in info.json ⚠ planck/thk: Feature mousekey is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature extrakey is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature console is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature command is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature sleep_led is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature nkro is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature backlight is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature bluetooth is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature audio is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature encoder is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature dip_switch is specified in both info.json and rules.mk, the rules.mk value wins. ⚠ planck/thk: Feature bootmagic_lite is specified in both info.json and rules.mk, the rules.mk value wins. * error cleanup: primekb/prime_m ☒ primekb/prime_m: Claims to support a community layout that does not exist: ortho_5x6 * error cleanup: rgbkb/sol/rev2 ⚠ rgbkb/sol/rev2: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: '(BACKLIGHT_LEDS + FULLHAND_LEDS)' * error log cleanup: shk9 ☒ shk9: Claims to support a community layout that does not exist: ortho_3x3 * error log cleanup: sowbug ⚠ sowbug/68keys: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: 'DRIVER_LED_TOTAL' ⚠ sowbug/ansi_tkl: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: '(DRIVER_LED_TOTAL)' * error log cleanup: torn ☒ torn: Claims to support a community layout that does not exist: split_3x6_4 * error cleanup: ymdk/np24/u4rgb6 ☒ ymdk/np24/u4rgb6: Claims to support a community layout that does not exist: ortho_4x6 * error cleanup: masterworks/classy_tkl/rev_a ☒ masterworks/classy_tkl/rev_a: Claims to support a community layout that does not exist: tkl_iso_wkl
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-262-2/+4
|\|
| * Allow configuration of USB_VBUS_PIN on chibios (#13342)Joel Challis2021-06-262-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-261-1/+4
|\|
| * do not automatically format json (#13320)Zach White2021-06-251-1/+4
| |
* | Fix CRC for AVR and enable again. (#13253)Dasky2021-06-251-1/+2
| |
* | Keyboards/RGBKB/Mün (#13239)XScorpion22021-06-2527-0/+2049
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2611-0/+248
|\|
| * [Keyboard] Add NK1 (#13212)yiancar2021-06-2511-0/+248
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-264-341/+123
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 12:18:05 +0000