summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25Add RGB matrix suspend wake function for Planck/rev6 (#12290)Albert Y
* 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>
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25Fix CLI incorrectly following `DEFAULT_FOLDER` (#12529)Nick Brassel
* Attempt to sort out incorrectly following DEFAULT_FOLDER. * Fix CI checks. * qmk pyformat
2021-04-25Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)Sergey Vlasov
* 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
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25[Keymap] Add Git keymap for ANAVI Macro Pad 8 (#12436)Leon Anavi
Git keymap for ANAVI Macro Pad 8 with the following shortcuts. On the first row from left to right: - git status - git log - git pull - git push On the second row from left to right: - git diff - git add - git commit - FN key to switch to the 2nd layout and control lights Reduce the number of supported RGB animations and effects in config.h to shrink the firmware size and fit it on the device. Signed-off-by: Leon Anavi <leon@anavi.org>
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25Add lm60n keyboard (#12408)gkeyboard
Add lm60n keyboard
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25Add m3n3van rev2 (#12405)Matthew Dias
* Add m3n3van rev2 * Add via support
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25Add VIA support for Filco Majestouch 2 /w The Tiger Lily (#12401)Christian Fehmer
2021-04-25Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-25not accessible and not needed anyway for a test keymap (#12366)Pavlos Vinieratos
2021-04-25Format code according to conventions (#12680)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-25feat: infinite timeout for leader key (#6580)Daniel Rodríguez Rivero
* feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs
2021-04-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-22adding keyboard (#12414)SonOfAres
* adding keyboard * Update keyboards/iriskeyboards/readme.md - picture size Co-authored-by: Ryan <fauxpark@gmail.com> * Delete iriskeyboards.json, it belongs in VIA repo * Update info.json * Update readme.md * Update keyboards/iriskeyboards/keymaps/default/keymap.c Removing unnecessary layers Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-22VIA support for Planck Rev6 (#9144)George Wietor
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: George Wietor <george@LIGHT-GRAY.local> Co-authored-by: Jack Humbert <jack.humb@gmail.com>
2021-04-22Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-22Delilah keyboard added (#12638)rainkeebs
* Delilah keyboard added * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * removed unnecessary lines as per review * removed unnecessary lines as per review Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-22[CI] Format code according to conventions (#12650)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-22LED Matrix: Split (#12633)Ryan
2021-04-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-21Personal keymap for dztech DZ60RGB plus README.md (#12485)MechMaster48
* Personal keymap and README to go along with it. * Noticed typo in README and removed name from comment in keymap * Added GPL copyright notice
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20Update for the dodger keymap for the Planck (#12456)Joshua Coffey
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20Add additional info to PR Checklist (#12630)Drashna Jaelre
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20Fix for gcc10 teensy_lc eeprom build warning (#12587)Joel Challis
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] Siris (#12415)Brandon Claveria
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] add adelais rev4 (#12443)mechlovin
2021-04-20[Keyboard] Added BKS65 Solder PCB (#12451)Felix Jen
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] Add amigopunk, a handwired 75% ALPS (#12489)Christiano Haesbaert
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] Matrix 1.2og AVR PCB - VIA support (#12534)kb-elmo
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] Added support for the older no_led revision (#12563)Mikkel Jeppesen
2021-04-20[Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-20[Keyboard] fix bella debounce (#12568)kb-elmo
2021-04-20[Keyboard] Add Acperience12 macropad (#12573)yynmt
Co-authored-by: yynmt <yynmt@yynmt.com>
2021-04-20Merge remote-tracking branch 'origin/master' into developQMK Bot