summaryrefslogtreecommitdiffstats
path: root/tmk_core
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix Indicator LED issues (#12097)50an6xy06r6n2021-08-182-3/+3
|
* Add alternate ldscript for STM32duino (F103xB) (#12914)Ryan2021-08-181-0/+1
| | | | | | | * Add alternate ldscript for STM32duino (F103xB) * Refactor out common ldscript stuff * Move ldscripts into stm32duino board dir, add search path to ldflags
* Unify behaviour of wait on AVR (#14025)Joel Challis2021-08-161-2/+20
|
* Move all the flash logic from tmk_core (#13927)Joel Challis2021-08-153-269/+0
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-101-0/+5
|\
| * Add padding to LUFA-MS .BIN files (#13922)Ryan2021-08-101-0/+5
| |
* | Remove ONEHAND_ENABLE (#13920)Joel Challis2021-08-091-3/+0
| |
* | Add HOLD_ON_OTHER_KEY_PRESS option for dual-role keys (#9404)Sergey Vlasov2021-08-071-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add HOLD_ON_OTHER_KEY_PRESS option for dual-role keys Implement an additional option for dual-role keys which converts the dual-role key press into a hold action immediately when another key is pressed (this is different from the existing PERMISSIVE_HOLD option, which selects the hold action when another key is tapped (pressed and then released) while the dual-role key is pressed). The Mod-Tap keys already behave in a similar way, unless the IGNORE_MOD_TAP_INTERRUPT option is enabled (but with some additional delays); the added option makes this behavior available for all other kinds of dual-role keys. * [Docs] Update tap-hold docs for HOLD_ON_OTHER_KEY_PRESS Document the newly added HOLD_ON_OTHER_KEY_PRESS option and update the documentation for closely related options (PERMISSIVE_HOLD and IGNORE_MOD_TAP_INTERRUPT). Use Layer Tap instead of Mod Tap in examples for PERMISSIVE_HOLD and HOLD_ON_OTHER_KEY_PRESS, because the effect of using these options with Mod Tap keys is mostly invisible without IGNORE_MOD_TAP_INTERRUPT. Add comments before return statements in sample implementations of `get_ignore_mod_tap_interrupt()`, `get_hold_on_other_key_press()` and `get_permissive_hold()`. Thanks to @Erovia and @precondition for comments and suggestions to improve the documentation.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-064-0/+18
|\|
| * Avoid name conflicts with usb_hid Arduino code (#13870)Joel Challis2021-08-064-0/+18
| | | | | | | | | | * Avoid name conflicts with usb_hid Arduino code * Fix tests
* | Process combos earlier & overlapping combos (#8591)Pete Sevander2021-08-064-16/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Combo processing improvements. Now it is possible to use ModTap and LayerTap keys as part of combos. Overlapping combos also don't trigger all the combos, just exactly the one that you press. New settings: - COMBO_MUST_HOLD_MODS - COMBO_MOD_TERM - COMBO_TERM_PER_COMBO - COMBO_MUST_HOLD_PER_COMBO - COMBO_STRICT_TIMER - COMBO_NO_TIMER * Remove the size flags from combo_t struct boolean members. This in the end actually saves space as the members are accessed so many times. The amount of operations needed to access the bits uses more memory than setting the size saves. * Fix `process_combo_key_release` not called correctly with tap-only combos * Fix not passing a pointer when NO_ACTION_TAPPING is defined. * Docs for `COMBO_ONLY_FROM_LAYER` * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update quantum/process_keycode/process_combo.c Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Add `EXTRA_SHORT_COMBOS` option. Stuff combo's `disabled` and `active` flags into `state`. Possibly can save some space. * Add more examples and clarify things with dict management system. - Simple examples now has a combo that has modifiers included. - The slightly more advanced examples now are actually more advanced instead of just `tap_code16(<modded-keycode>)`. - Added a note that `COMBO_ACTION`s are not needed anymore as you can just use custom keycodes. - Added a note that the `g/keymap_combo.h` macros use the `process_combo_event` function and that it is not usable in one's keymap afterwards. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Change "the" combo action example to "email" example. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Fix sneaky infinite loop with `combo_disable()` No need to call `dump_key_buffer` when disabling combos because the buffer is either being dumped if a combo-key was pressed, or the buffer is empty if a non-combo-key is pressed. * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> * Update docs/feature_combo.md Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Feature] Swap buttons on PS2 Mouse/Trackball (#9205)Juan Pablo Kutianski2021-08-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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>
* | Arm ps2 mouse interrupt (#6490)JohSchneider2021-08-064-18/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | 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-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0310-475/+4
| | | | | | | | | | * move print/debug files to quantum * Update comments
* | 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.
* | Fix alignment of USB out report buffer 2 -> 4 (#13838)a_p_u_r_o2021-08-021-1/+1
| |
* | __flash? (#13799)Joel Challis2021-07-311-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-291-0/+18
|\|
| * Fix unit tests after recent refactor (#13765)Joel Challis2021-07-291-0/+18
| |
* | Allow for higher USB Polling rate on ATSAM boards (#13755)Drashna Jaelre2021-07-281-3/+7
| |
* | Update LUFA (18-07-2021) and add QMK-HID Bootloader support (#13588)Drashna Jaelre2021-07-241-8/+26
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-255-2/+58
|\|
| * Refactor some platform dependent logic (#13675)Joel Challis2021-07-245-6/+58
| |
* | Avoid LTO conficts on arm_atsam (#13676)Joel Challis2021-07-245-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-223-0/+192
|\|
| * Implement GPIO abstraction for atsam (#13567)Joel Challis2021-07-223-0/+192
| | | | | | | | | | | | | | * Implement GPIO abstraction for atsam * Convert Drop boards to normal matrix config * Work round pin conflicts and matrix delay
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-165-114/+54
|\|
| * Migrate arm_atsam print logic to use common framework (#13554)Joel Challis2021-07-165-114/+54
| |
* | Use string literals for `SERIAL_NUMBER` (#13403)Ryan2021-07-163-4/+8
| |
* | [Feature] Key Overrides (#11422)Jonas Gessner2021-07-131-0/+28
| |
* | Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver (#13480)Chris Cullin2021-07-121-0/+1
| |
* | core: chibios: bootloader: use integer pointers as volatile (#13450)Thomas Weißschuh2021-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This prevents gcc from incorrectly trying to validate array bounds. ``` tmk_core/common/chibios/bootloader.c: error: '__builtin_memcpy' offset [0, 21] is out of the bounds [0, 0] [-Werror=array-bounds] 107 | __builtin_memcpy((void *) VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c16 Fixes #12925
* | Improve layer mask handling (#13065)Drashna Jaelre2021-07-032-8/+33
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-07-031-1/+1
|\|
| * Add "Ctrl+C to cancel" to "waiting for bootloader" messages (#13424)Ryan2021-07-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-262-2/+4
|\|
| * Allow configuration of USB_VBUS_PIN on chibios (#13342)Joel Challis2021-06-262-2/+4
| |
* | Add sync_timer support over serial_link (i.e. Ergodox Infinity) (#12845)Joakim Tufvegren2021-06-192-2/+2
| |
* | Extensible split data sync (#11930)Nick Brassel2021-06-181-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extensible split data sync capability through transactions. - Split common transport has been split up between the transport layer and data layer. - Split "transactions" model used, with convergence between I2C and serial data definitions. - Slave matrix "generation count" is used to determine if the full slave matrix needs to be retrieved. - Encoders get the same "generation count" treatment. - All other blocks of data are synchronised when a change is detected. - All transmissions have a globally-configurable deadline before a transmission is forced (`FORCED_SYNC_THROTTLE_MS`, default 100ms). - Added atomicity for all core-synced data, preventing partial updates - Added retries to AVR i2c_master's i2c_start, to minimise the number of failed transactions when interrupts are disabled on the slave due to atomicity checks. - Some keyboards have had slight modifications made in order to ensure that they still build due to firmware size restrictions. * Fixup LED_MATRIX compile. * Parameterise ERROR_DISCONNECT_COUNT.
* | Add CRC8 calculation subsystem to quantum (#12641)Stefan Kerkmann2021-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | * Intended usage is data validation in split transport code. * Default space efficient algorithm. * Opt-in fast table based algorithmn with #define CRC8_USE_TABLE switch. * Define switches for size and speed optimized versions, the default is size optimized by using uint_least8_t as datatype for calculations. * #define CRC8_OPTIMIZE_SPEED uses uint_fast8_t as datatype for calculations, this only affects 32-bit Archs like ARM and RISC-V. * Placeholder crc_init() function for hardware backed crc calculation, not implemented yet.
* | core: wire up flash make target for Teensy 4.x (#13077)Michael Stapelberg2021-06-171-1/+5
| | | | | | related to https://github.com/kinx-project/kint/issues/5
* | core: make RESET key work with Teensy 4.x (#13076)Michael Stapelberg2021-06-151-1/+1
| | | | | | related to https://github.com/kinx-project/kint/issues/5
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-162-10/+21
|\|
| * Make atmel-dfu and chibios-dfu flashing behave more like caterina flashing. ↵Purdea Andrei2021-06-162-10/+21
| | | | | | | | | | | | | | | | (#12552) This commit makes atmel-dfu and chibios-dfu bootloaders retry to detect the bootloader every 0,5 seconds (now configurable via the BOOTLOADER_RETRY_TIME makefile variable), and a period is printed after every try. This is a much more pleasant behaviour than the 5s retry timeout.
| * 2021 May 29 Breaking Changes Update (#13034)James Young2021-05-2942-666/+738
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |