summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)Drashna Jaelre2021-04-299-53/+62
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-1/+1
|\
| * Fix up bad keycode in #12405. (#12722)Nick Brassel2021-04-281-1/+1
| |
* | Fix bad PR merge for #6580. (#12721)Nick Brassel2021-04-281-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-281-0/+2
|\|
| * add default folder to standard (#12712)Xelus222021-04-281-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-0/+3
|\|
| * YMDK Wings: Update config.h (#12718)alittlepeace2021-04-271-0/+3
| | | | | | Adds Caps Lock LED indicator configuration.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-271-1/+11
|\|
| * Add flashing instructions to GMMK Pro readme (#12719)James Young2021-04-271-1/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-274-0/+133
|\|
| * GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)W. Ducky2021-04-274-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WholesomeDucky keymap for GMMK Pro * Finalized keymap & added 1000hz polling for GMMK Pro * Corrected for RAlt and Fn being swapped * Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout. * Removed an old comment from personal keymap for GMMK Pro * added VIA support * Defined bootmagic row and column for GMMK Pro Esc key * Update keyboards/gmmk/pro/config.h * Update keyboards/gmmk/pro/keymaps/via/keymap.c * Update keyboards/gmmk/pro/keymaps/via/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2711-0/+965
|\|
| * Add Draculad keyboard (#12604)Mango The Fourth2021-04-2711-0/+965
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: mangoiv <mangoiv@outlook.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-272-3/+20
|\|
| * GMMK Pro: add RESET binding, fix layout macro bug (#12684)Ryan Mitchell2021-04-272-3/+20
| | | | | | | | | | * add RESET binding, fix layout mod key bug (fixes #12683) * remove underscore #define and use core's instead
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2712-439/+296
|\|
| * Update noroadsleft userspace and keymaps (2021-04-26) (#12711)James Young2021-04-2612-439/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update noroadsleft userspace and keymaps (2021-04-26) - add Discipline keymap - move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace - re-add some custom keycode handling I accidentally deleted - update VRSN keycode - update KC60 and userspace readmes * remove Git readme from kc60 keymap * update kc60:noroadsleft readme Concatenates this readme into one file, and updates the image links.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-261-0/+1
|\|
| * Add python-version to gitignore (#12678)Andrew Kannan2021-04-261-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-261-0/+3
|\|
| * [Keyboard] fix planck light via endpoints (#12701)Xelus222021-04-261-0/+3
| |
* | Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)JTM2021-04-2624-27/+393
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com>
* | Add STM32L433 and L443 support (#12063)Xelus222021-04-269-2/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers Co-authored-by: Nick Brassel <nick@tzarc.org> * Include L443 in compatible microcontrollers Co-authored-by: Nick Brassel <nick@tzarc.org> * Update config bootloader jump description Co-authored-by: Nick Brassel <nick@tzarc.org> * Update ChibiOS define reasoning Co-authored-by: Nick Brassel <nick@tzarc.org> * Update quantum/mcu_selection.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * fix git conflict Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-264-0/+58
|\|
| * fix configs (#12631)Xelus222021-04-264-0/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-0/+1
|\|
| * [Config] Add VSCode workspace files to .gitignore (#12469)Luis Moreno2021-04-261-0/+1
| |
* | Format code according to conventions (#12687)github-actions[bot]2021-04-250-0/+0
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Format code according to conventions (#12682)github-actions[bot]2021-04-251-1/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Add support for MCU = STM32F446 (#12619)Purdea Andrei2021-04-259-2/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-2510-0/+288
|\|
| * [Keyboard] Ninjin (#12496)Xelus222021-04-2510-0/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ninjin init * put in gpl thing * underglow * update to latest chibios * fix gpl headers * remove other files * fix header * Update keyboards/xelus/ninjin/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/mcuconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/xelus/ninjin/halconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | eeprom driver: Refactor where eeprom driver initialisation (and EEPROM ↵Purdea Andrei2021-04-252-13/+12
| | | | | | | | emulation initialisation) occurs to make it non-target-specific. (#12671)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-253-0/+266
|\|
| * peepeetee's *very janky* hub16 keymap (#12506)peepeetee2021-04-253-0/+266
| | | | | | | | | | | | | | | | | | * peepeetee's bodged hub16 keymap * add layer 3 lighting * actually adds layer 3 lighting * fixes layer 0; behavior is that layor 0 is unaltered from base pattern, while other states have distinct solid colors
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-4/+4
|\|
| * Update checking board master function (#12493)calebchongc2021-04-251-4/+4
| | | | | | changed is_master to is_keyboard_master()
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-0/+4
|\|
| * Do not leak weak mods from tap dance to the interrupting keypress (#12471)Sergey Vlasov2021-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Tap dance callbacks may register weak mods; one case when it happens is when a tap dance registers a key with modifiers. When the tap dance is interrupted by pressing another key, these weak mods could affect the interrupting key (normally any stale weak mods are cleared at the start of action_exec() when handling a keypress event, but the tap dance interrupt check code is called later, and the weak mods left by that code were not cleared). Add another clear_weak_mods() call to preprocess_tap_dance() to make sure that the interrupting keypress is not affected by unrelated weak mods from the previous tap dance. Fixes #12445.
* | Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) ↵Nick Brassel2021-04-2514-3/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-2/+2
|\|
| * Format code according to conventions (#12681)github-actions[bot]2021-04-251-2/+2
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-253-21/+33
|\|
| * Fix how USB queue overflow is handled in chibios. (#12576)Purdea Andrei2021-04-253-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix how USB queue overflow is handled in chibios. This commit reverts PR 12472 (commit c823fe2d3f23ed090e36ce39beed4c448298bd2f), and it implements the original intent of the commit in a better way. The original intent of the above mentioned commit was to not deadlock the keyboard when console is enabled, and hid_listen is not started. The above mentioned commit had a few drawbacks: 1) When a lot of data was printed to the console, the queue would get full, and drop data, even if hid_listen was running. (For example having matrix debug enabled just didn't work right at all) 2) I believe the function in which this was implemented is used by all other USB endpoints, so with the above change, overflow, and data loss could happen in other important functions of QMK as well. This commit implements deadlock prevention in a slightly similar way to how it's done on AVR. There is an additional static local variable, that memorizes whether the console has timeouted before. If we are in the timeouted=false state, then we send the character normally with a 5ms timeout. If it does time out, then hid_listen is likely not running, and future characters should not be sent with a timeout, but those characters should still be sent if there is space in the queue. The difference between the AVR implementation and this one is that the AVR implementation checks the queue state directly, but this implementation instead attempts to write the character with a zero timeout. If it fails, then we remain in the timeouted=true state, if it succeeds, then hid_listen started removing data from the queue, so we can go out of the timeouted=true state. * Added comment explaining the timeouted logic to console flow control. * Console flow control: refactor chibios flowcontrol code to make it more readable, and rename the timeouted variable to timed_out on both chibios and lufa. Changed comments to says timed_out is an approximation of listener_disconnected, to make it clear that it's not the same thing * fix typo
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-252-0/+14
|\|
| * Add RGB matrix suspend wake function for Planck/rev6 (#12290)Albert Y2021-04-252-0/+14
| | | | | | | | | | | | | | | | | | | | * Add RGB matrix suspend wake function for Planck/rev6 * Update suggested definition to allow user override. Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: filterpaper <filterpaper@localhost> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-251-7/+12
|\|
| * Fix CLI incorrectly following `DEFAULT_FOLDER` (#12529)Nick Brassel2021-04-251-7/+12
| | | | | | | | | | | | | | * Attempt to sort out incorrectly following DEFAULT_FOLDER. * Fix CI checks. * qmk pyformat
* | Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)Sergey Vlasov2021-04-252-80/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 00:35:46 +0000