summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | [Feature] Swap buttons on PS2 Mouse/Trackball (#9205)Juan Pablo Kutianski2021-08-062-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Feature Request] Swap buttons on PS2 Mouse/Trackball * [Feature Request] Swap buttons on PS2 Mouse/Trackball * Added id: to the doc * Missing space * Solve comment https://github.com/qmk/qmk_firmware/pull/9205#discussion_r430783182 * Solve comments https://github.com/qmk/qmk_firmware/pull/9205#discussion_r430783182 & https://github.com/qmk/qmk_firmware/pull/9205#discussion_r430783884 * Format code more according to https://docs.qmk.fm/#/coding_conventions_c * change logic to LUT * WIP: Clean up * WIP: Solution with xor operators to mask the change * delete #endif & added the missed xor operator (ahhh) * Variable (mouse_report->buttons): avoid setting twice https://github.com/qmk/qmk_firmware/pull/9205#discussion_r430783884 * Update tmk_core/protocol/ps2_mouse.c Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: juank <juank@fktech.net> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | add yaml_build_options target (#10533)Takeshi ISHII2021-08-061-0/+20
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Rework as per 9824 (#13898)Nick Brassel2021-08-0619-7/+7
| |
* | Arm ps2 mouse interrupt (#6490)JohSchneider2021-08-065-20/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ps2_mouse on ARM: an interrupt-version of the ps2-mouse code ported to ARM/chibios * ps2_mouse on ARM: link EXT callback-channel selection to the user defined PS2_LINE_CLOCK * ps2_mouse on ARM: replace DELAY_X defines with hardware-agnostic wait_X * ps2_mouse on ARM: replace chibios-specific defines for the pins/lines with defines from quantum/config_common.h and drop the '_LINE' component from teh define name * ps2_mouse on ARM: expose the software-intterupt port as a user editable define * Update docs/feature_ps2_mouse.md Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com> * Update feature_ps2_mouse.md * use a define to deduce the PS_DATA_PORT instead * reduce all-zero extcfg to oneliner * ps2_mouse: use generic wait instead of avr-delay * Update docs/feature_ps2_mouse.md * ps2_mouse: changes for new chibios version (17.6.0 -> 19.1.0) replacing the legacy externa-interrupt driver with pal-callbacks * ps2_mouse: use PLATFORM_KEY Co-Authored-By: Joel Challis <git@zvecr.com> * ps2_mouse: clang-format corrections * ps2_mouse: add systemlocks using the chibios equivalent to AVRs cli: chSys[Unl|L]ock Co-authored-by: Johannes <you@example.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Bump gtest (#13885)Joel Challis2021-08-051-0/+0
| | | | | | | | | | * Bump gtest * Pin to latest release
* | Tidy up rgbkb/mun (#13801)Joel Challis2021-08-0511-201/+334
| | | | | | * Tidy up rgbkb/mun
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-047-211/+237
|\|
| * cKeys Handwire 101 Refactor (#13879)James Young2021-08-047-211/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update info.json - use human-friendly formatting - remove `key_count` key * rename LAYOUT to LAYOUT_ortho_4x4 * refactor default keymap - add license header - qmk cformat pass - keycode grid alignment * remove empty config.h file from default keymap * update Manufacturer and Product strings * tidy up handwire_101.c - add license header - remove boilerplate functions * tidy up handwire_101.h - add license header - remove instructive comment * minor rules.mk tidy-up - remove Bootloader selection sample comments * rewrite SEND_STRING() statements per fauxpark Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Fix knops keymaps (#13872)Dasky2021-08-045-82/+82
| |
* | [Keyboard] Switch Draculad to using WPM char hack (#13886)Drashna Jaelre2021-08-042-23/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-046-98/+101
|\|
| * BM65ISO: refactor layout macro (#13860)James Young2021-08-046-98/+101
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0419-0/+1697
|\|
| * Updated Ducky 2 one mini support (#11112)Reza Jelveh2021-08-0419-0/+1697
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial Ducky One 2 Mini keyboard and keymap * Keymap macro issue, together with general polish suggestions * Separate default keymap into proper default, iso and ansi versions * info.json updates (Configurator support). DEBOUNCE define adjust. * Unused keymap defines removed. * update requested ducky one mini2 board changes * ducky: don't trigger app key with left shift * ducky: make default mouse key behavior more linear * ducky: add GRAVE_ESC_GUI_OVERRIDE to allow for win+esc to work * ducky: playpause on fn space * ducky: disable RGB_MATRIX until driver is merged * ducky: clang-format matrix and one2mini.c * ducky: update requested changes Remove WFI_IDLE since it's already in the rules.mk CORTEX_ENABLE_WFI_IDLE=TRUE * ducky: update requested changes * ducky: move winkey grave esc to default keymap * ducky: remove dipswitch from keymap and use DIP_SWITCH_MATRIX_GRID instead * ducky: info.json lint * ducky: enable DIP_SWITCH_ENABLE rule * ducky: update readme * ducky: fix backslash on default keymap * ducky: remove unused USB_LED_CAPSLOCK_INDEX 28 * ducky: move mbi5042 led driver to ducky keyboard * ducky: cosmetics * ducky: requested changes * ducky: refactor matrix.c again so we can better compare it to other boards * ducky: remove bootmagic_lite as the boards bootloader trigger is actually handled in its own bootloader * ducky: remove custom matrix * ducky: update for chibios-contrib changes * ducky: debug new USB driver * ducky: debug usb issues * ducky: update chibios version * ducky: remove halconf.h * ducky: update rules.mk * ducky: update chconf.h * Matching submodules. * Restructure to explicitly define which board is in use, remove RGB driver pending followup PR. * Revert "Matching submodules." This reverts commit 2fbb34e0c63ea67ee09d2e2d525723c01431d1cd. Co-authored-by: GitWellBack <48095880+GitWellBack@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-041-1/+1
|\|
| * barracuda: update info.json layout macro reference (#13874)James Young2021-08-042-3/+1
| | | | | | | | | | | | | | | | | | * barracuda: update info.json layout macro reference - change LAYOUT to LAYOUT_ortho_3x11 * remove Community Layouts rule ortho_3x11 isn't a valid Community Layout.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-043-9/+27
|\|
| * Add bootloader section to keyboard template (#13774)Drashna Jaelre2021-08-042-2/+17
| | | | | | | | | | | | | | | | | | * Add bootloader section to keyboard template * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Updated settings.json file to fit VSC's docs (#13829)Changsu Park2021-08-041-7/+10
| | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+1
|\|
| * boardsource/holiday/spooky: update info.json layout macro reference (#13875)James Young2021-08-041-1/+1
| | | | | | - change LAYOUT to LAYOUT_ortho_2x3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0310-0/+347
|\|
| * rb86 (#13824)Ryan Baker2021-08-0410-0/+347
| | | | | | | | | | * rb86 * adjudicate comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-2/+12
|\|
| * Fix overflows in WPM calculations (#13128)Joakim Tufvegren2021-08-041-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Trigger a wakeup after USB Reset on ChibiOS. (#12831)Joakim Tufvegren2021-08-041-0/+7
| | | | | | | | | | 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.
* | Remove the #10088 hotfix for Teensy 3.1-like Input:Club keyboards (#12870)Joakim Tufvegren2021-08-045-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Move print/debug files to quantum (#12069)Joel Challis2021-08-0313-44/+25
| | | | | | | | | | * move print/debug files to quantum * Update comments
* | Unconditionally call led_init_ports (#12116)Joel Challis2021-08-0330-215/+20
| | | | | | | | | | * Unconditionally call led_init_ports * Another call to led_init_ports
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-9/+623
|\|
| * aves65: complete layout data (#13868)James Young2021-08-031-9/+623
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+2
|\|
| * 4pplet/eagle_viper_rep/rev_a: fix missing key object (#13867)James Young2021-08-031-1/+2
| | | | | | Adds a key object for the KC_NUHS key to the info.json data.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0315-38/+198
|\|
| * [Keymap] Minor cleanup of bcat keymaps and userspace (#13224)Jonathan Rascher2021-08-0315-38/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+1
|\|
| * 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866)James Young2021-08-032-2/+2
| | | | | | | | | | | | | | * 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 * remove ortho_4x8 from Community Layouts rule ortho_4x8 isn't a valid option here.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+11
|\|
| * capsunlocked/cu7: fix missing key object (#13862)James Young2021-08-031-1/+11
| | | | | | Adds a key object for the encoder keypress.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-031-1/+1
|\|
| * [Docs] Remove extra word it bootmagic page (#13855)plarso2021-08-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-034-26/+47
|\|
| * 0xCB Static: fix `qmk info` and Configurator issues (#13856)James Young2021-08-024-26/+47
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-021-2/+2
|\|
| * Function96 V2: Fixed info.json file (#13322)JTM2021-08-021-2/+2
| | | | | | Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-021-3/+5
|\|
| * flash_stm32: don't unlock flash if already unlocked (#13841)xyzz2021-08-021-3/+5
| | | | | | | | | | 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.
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-08-0240-328/+2099
|\|
| * Duck Eagle/Viper V2 Refactor (#13828)James Young2021-07-317-56/+393
| |
| * Merro60 Layout Macro Refactor (#13827)James Young2021-07-319-67/+238
| |