summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-04Updated settings.json file to fit VSC's docs (#13829)Changsu Park
This change fixes the warning caused by deprecated way of configuring terminal profiles. The warning caused by old settings.json is the following: This is deprecated, the new recommended way to configure your default shell is by creating a terminal profile in `#terminal.integrated.profiles.windows#` and setting its profile name as the default in `#terminal.integrated.defaultProfile.windows#`. This will currently take priority over the new profiles settings but that will change in the future. Refer to the link below for more information: https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-04boardsource/holiday/spooky: update info.json layout macro reference (#13875)James Young
- change LAYOUT to LAYOUT_ortho_2x3
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-04rb86 (#13824)Ryan Baker
* rb86 * adjudicate comments
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-04Fix overflows in WPM calculations (#13128)Joakim Tufvegren
* Fix overflow in WPM calculations. First, the "fresh" WPM calculation could end up being up to 12000 (with default `WPM_ESTIMATED_WORD_SIZE`) if keys were pressed more or less simultaneously. This value has now been clamped down to 255, in effect clamping WPM to its max value of 255. Second, with `WPM_ALLOW_COUNT_REGRESSION` enabled, it was possible to regress the WPM below 0 (i.e. to 255) by just repeatedly pressing backspace. * Fix WPM being limited to 235 due to float/int logic.
2021-08-04Trigger a wakeup after USB Reset on ChibiOS. (#12831)Joakim Tufvegren
After a USB Reset event the device must, according to the spec wake up from any suspend state, so the Configured event that arrives afterwards should be interpreted as an implicit wakeup.
2021-08-04Remove the #10088 hotfix for Teensy 3.1-like Input:Club keyboards (#12870)Joakim Tufvegren
* Remove the #10088 hotfix for K20x MCU:s. It seems to _cause_ the issue it intended to solve there. * Cleaner way of removing #10088 hotfix. Now only affects Ergodox Infinity, Whitefox and K-type, though. Switches over Ergodox Infinity to the `IC_TEENSY_3_1` board, since that was a nice place to implement the `restart_usb_driver` override. However, I would guess this issue is present for other K20x/Teensy 3.1 boards as well... * Fix comment regarding `IC_TEENSY_3_1` for all keyboards using it.
2021-08-03Move print/debug files to quantum (#12069)Joel Challis
* move print/debug files to quantum * Update comments
2021-08-03Unconditionally call led_init_ports (#12116)Joel Challis
* Unconditionally call led_init_ports * Another call to led_init_ports
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-03aves65: complete layout data (#13868)James Young
add layout data for: - LAYOUT_all - LAYOUT_65_iso - LAYOUT_65_iso_split_bs - LAYOUT_65_iso_blocker_split_bs - LAYOUT_65_ansi - LAYOUT_65_ansi_split_bs - LAYOUT_65_ansi_blocker - LAYOUT_65_ansi_blocker_split_bs
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-034pplet/eagle_viper_rep/rev_a: fix missing key object (#13867)James Young
Adds a key object for the KC_NUHS key to the info.json data.
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-03[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)Jonathan Rascher
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-0340percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866)James Young
* 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 * remove ortho_4x8 from Community Layouts rule ortho_4x8 isn't a valid option here.
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-03capsunlocked/cu7: fix missing key object (#13862)James Young
Adds a key object for the encoder keypress.
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-02[Docs] Remove extra word it bootmagic page (#13855)plarso
2021-08-03Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-020xCB Static: fix `qmk info` and Configurator issues (#13856)James Young
2021-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-02Function96 V2: Fixed info.json file (#13322)JTM
Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.
2021-08-02Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-02flash_stm32: don't unlock flash if already unlocked (#13841)xyzz
On stm32f4 after reboot from DFU it was observed that the flash is already unlocked. In that case, attempting to unlock it again causes a data abort.
2021-08-02Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-08-02Fix alignment of USB out report buffer 2 -> 4 (#13838)a_p_u_r_o
2021-08-01[BUG] Fix Key Override includes (#13831)Drashna Jaelre
* [BUG] Fix Key Override includes * simplify includes
2021-08-01fix develop branch move file (#13832)Jonavin
Co-authored-by: zvecr <git@zvecr.com>
2021-07-31Duck Eagle/Viper V2 Refactor (#13828)James Young
2021-07-31[Keyboard] Fix SRC include for matrix/m20add issi driver (#13826)Drashna Jaelre
2021-07-31Merro60 Layout Macro Refactor (#13827)James Young
2021-07-31Momoka Ergo: layout macro/Configurator fix (#13825)James Young
* momoka_ergo.h: use modified QMK 3-character notation Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively. * physically arrange layout macro Arrange the layout macro and keycodes to resemble the assembled keyboard. * info.json: rebuild LAYOUT data Fixes mispositioned keys in QMK Configurator.
2021-07-31Fix compile issues due to LED changes (#13821)Drashna Jaelre
2021-07-31Update endgame keymap to work with suspend changes (#13805)slashbunny
Updates the Massdrop CTRL keyboard engame keymap to work after the changes to USB suspend in #12697 Fixes #13782
2021-07-31__flash? (#13799)Joel Challis
2021-07-31Move some led drivers to common folder (#13749)Joel Challis
* Move some led drivers to common folder
2021-07-31DP60 layout macro renames (#13811)James Young
* info.json: apply human-friendly formatting * rename LAYOUT_60_wkl to LAYOUT_60_ansi_tsangan_split_rshift * rename LAYOUT_60_wkl_split_bs to LAYOUT_60_tsangan_hhkb * info.json: remove `key_count` keys
2021-07-31Charue Sunsetter: layout macro fixes (#13809)James Young
* remove K214 from LAYOUT_1065_ansi macro Position K214 is only used by the ISO layout (as KC_NUHS); it doesn't get used here. Removing it so the layout macro matches the info.json layout data. Also updates info.json to use human-friendly formatting. * add layout macros Adds: - LAYOUT_1065_ansi_split_bs macro - LAYOUT_1065_iso macro - LAYOUT_1065_iso_split_bs macro - `default_iso` keymap * add LAYOUT_all macro Adds LAYOUT_all macro and a `default_all` keymap. This PCB is unusual in that the ANSI Backslash and ANSI Enter do not share their matrix positions with the Non-US Backslash or ISO Enter keys at all. This layout macro supports both the ANSI and ISO positions in one macro/keymap.
2021-07-31Rartland: add 65_ansi and 65_iso layouts (#13807)James Young
* add 65_ansi and 65_iso layouts ... with Community Layout support * add block comment of layouts to rartland.h
2021-07-31[Keymap] Add peott-fr Kinesis keymap (#13812)peott-fr
2021-07-31[develop] Fix pimoroni trackball read address (#13810)Dasky
2021-07-31[Keyboard] Reduce nibble oled_status keymap size (#13813)Jay Greco
2021-07-31[Keyboard] Fix RGBKB Pan Rev1 Encoder RGB handling (#13781)Drashna Jaelre
2021-07-31Update LUFA Submodule (2021-07-30) (#13819)Drashna Jaelre
2021-07-31change DIP_SWITCH_ENABLE to off (#13815)MakotoKurauchi