summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixup build errors on `develop` branch. (#12723)Nick Brassel2021-05-113-0/+6
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-114-0/+499
|\
| * peepeetee's custom keymap for bm68rgb (#12232)peepeetee2021-05-104-0/+499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add custom keymaps for BM68rgb * add user keymap for bm68rgb * fix grammar * add custom hub16 keymap * Apply suggestions from code review * fix errorenously included hub16 file * add GPL headers * revert defining dfa_state in keymap.h * Update keyboards/bm68rgb/keymaps/peepeetee/keymap.h * enable tap dance, add tap dance to left alt
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-108-2/+239
|\|
| * [Keyboard] VIA support for Preonic Rev3 (#11344)George Wietor2021-05-108-2/+239
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jack Humbert <jack.humb@gmail.com>
* | [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)Lukas Reineke2021-05-101-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-101-2/+4
|\|
| * Improve EEPROM defaults for Dynamic Keymaps (#12853)Drashna Jaelre2021-05-101-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-05-102-71/+124
|\| | | | | | | | | | | | | | | Conflicts: bin/qmk lib/python/qmk/cli/__init__.py Merge conflicts fixed by skullydazed.
| * Move the module checking and updating to lib/python (#12416)Zach White2021-05-102-68/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move the module checking and updating to lib/python * make flake8 happy * Update lib/python/qmk/cli/__init__.py Co-authored-by: Erovia <Erovia@users.noreply.github.com> * prompt the user to disable developer mode * pyformat * flake8 Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-106-79/+166
|\|
| * Improve our CI tests (#11476)Zach White2021-05-106-79/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add a test and dry-run to qmk generate-api * add a dry-run to qmk pyformat * Add a --dry-run to qmk cformat * reverse the order of nose2 and flake8 tests * run CI test against cformat and pyformat * fix programming errors * tweak job name * fix argument * refine the files we select * fix stack trace in --ci * make cformat exit clean * fix c file extensions * decouple CI from pyformat * remove --ci arg * make ci happy * use the environment var instead * change output to text * fix log message * replace tabs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-101-18/+86
|\|
| * Lagrange handwired Configurator bugfix (#12854)James Young2021-05-101-18/+86
| | | | | | | | | | * use human-friendly formatting * correct key object order
* | Fix another bin/qmk reference (#12856)Sergey Vlasov2021-05-101-1/+1
| |
* | Make Swap Hands use PROGMEM (#12284)Drashna Jaelre2021-05-0947-53/+53
| | | | | | | | | | | | This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-0/+13
|\|
| * Catch 'LAYOUTS = all' in lint (#12848)Joel Challis2021-05-091-0/+13
| | | | | | Co-authored-by: Zach White <skullydazed@drpepper.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-097-117/+188
|\|
| * KBDMini refactor (#12850)Ryan2021-05-107-117/+188
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * fix the makefile snippet so flake8 and yapf don't fight (#12849)Zach White2021-05-091-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * CLI: Use BASH if SHELL variable is not set (Windows) (#12847)Erovia2021-05-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-8/+11
|\|
| * [CI] Format code according to conventions (#12838)github-actions[bot]2021-05-102-8/+11
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Remove pointless SERIAL_LINK_ENABLE rules (#12846)Ryan2021-05-1016-16/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-093-1/+89
|\|
| * Add script to perform parallel builds. (#12497)Nick Brassel2021-05-093-1/+89
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-3/+3
|\|
| * Align qmk info ascii logic with milc logging (#11627)Joel Challis2021-05-091-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-092-12/+30
|\|
| * Allow MAKE environment override for 'qmk clean' (#12473)Joel Challis2021-05-092-12/+30
| |
* | New command: qmk console (#12828)Zach White2021-05-0812-22/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * pyformat * clean up and flesh out KNOWN_BOOTLOADERS Co-authored-by: zvecr <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-091-1/+1
|\|
| * haptic: correct size of reserved field in the haptic structure. This saves 1 ↵Purdea Andrei2021-05-081-1/+1
| | | | | | | | | | byte of wasted SRAM. (#12483) Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-098-0/+630
|\|
| * add ttys0's planck and preonic keymaps (#10560)Sean Johnson2021-05-088-0/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resynced with upstream, and adjusted keymap layout for planck * updated keyboard layout Signed-off-by: Sean Johnson <sean@ttys0.net> * swapped out bspc for del on symb layer Signed-off-by: Sean Johnson <sean@ttys0.net> * fixed typo with brightness media keys * turns out my brightness config was correct, it was macOS that had gone sideways * updated to bring in line with requirements for merging into upstream * removed redundant config from rules.mk moved media controls to FUNC layer for Planck layout * added GPL2+ compatible license header Signed-off-by: Sean Johnson <sean@skj.dev> * removed unused MIDI comment Signed-off-by: Sean Johnson <sean@skj.dev> * removed extraneous MIDI comments * removed extraneous comments
* | Resolve a number of warnings in `qmk generate-api` (#12833)Zach White2021-05-0831-44/+42
| |
* | fix some references to bin/qmk that slipped in (#12832)Zach White2021-05-083-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-0816-224/+604
|\|
| * Update sethBarberee Userspace (#12620)Seth Barberee2021-05-0816-224/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update for LTO and guard RGBLED_SPLIT * Revert "update for LTO and guard RGBLED_SPLIT" This reverts commit ce81177cbe330ae3e1e14c264dc0cb0946f08d70. * Revert "Revert "update for LTO and guard RGBLED_SPLIT"" This reverts commit 67da0ce9f38777064ad094c1ecba7ce17a40994f. * update iris keymap for keymap_kc removal and overhaul userspace * add licenses * fix tap_dance error when rgblight is disabled and update/clean iris/sinc maps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-082-38/+40
|\|
| * Hbbisenieks keymap update to remove kc_ keymaps (#12391)Hilary B. Brenum2021-05-082-38/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | * hbbisenieks keymap * change from kc_ keymap * Apply suggestions from code review Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Hilary Brenum <hilary.brenum@tanium.com> Co-authored-by: Zach White <skullydazed@drpepper.org> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
* | Added OLED fade out support (#12086)Barabas2021-05-083-2/+29
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-071-16/+4
|\|
| * Update FreeBSD install method (#12815)Mateusz Piotrowski2021-05-071-16/+4
| | | | | | | | | | | | | | | | The easiest way to install QMK CLI and all the necessary dependencies on FreeBSD is to use the packages from the official FreeBSD Ports Collection. This is possible since QMK CLI has been added to the Ports Collection: https://www.freshports.org/sysutils/py-qmk/
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-072-0/+51
|\|
| * [Keymap] My Arisu layout setup (#12647)stanrc852021-05-072-0/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-05-061-7/+7
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 01:48:04 +0000