summaryrefslogtreecommitdiffstats
path: root/quantum
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-282-0/+14
|\|
| * Add rgblight_reload_from_eeprom() (#11411)Joshua Diamond2021-01-282-0/+14
| | | | | | | | | | * Add rgblight_reset_from_eeprom() * reset->reload
* | Backport ChibiOS Audio changes from ZSA (#11687)Drashna Jaelre2021-01-282-8/+19
| |
* | Keep track of encoder activity (#11595)Nick Brassel2021-01-212-5/+19
| | | | | | | | | | * Keep track of encoder activity, provide API for either matrix/encoder. * Fixup build when no RGBLIGHT or Backlight enabled.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-201-1/+1
|\|
| * Fix wrong key when "Music Map" is used with MAJOR_MODE. (#11234)Takeshi Nishio2021-01-191-1/+1
| | | | | | | | | | | | | | With MAJOR_MODE (= major scale), keys in one octave is not 12 but 7. To solve this problem, change divisor number from 12 to 7 at %(Modulo) and /(Division). NOTE: The last 12 represents half step keys in one octave for pitch calculation.
* | `qmk cformat`Nick Brassel2021-01-175-21/+21
| |
* | Keep track of last matrix activity. (#11552)Nick Brassel2021-01-181-8/+22
| | | | | | | | | | Co-authored-by: Dasky <daskygit@users.noreply.github.com> Co-authored-by: Dasky <daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-151-0/+9
|\|
| * Add BGR byte order for WS2812 drivers (#11562)kb-elmo2021-01-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | * add byte order bgr for ws2812 * update docs for driver change * Update ws2812_driver.md * Update docs/ws2812_driver.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-151-1/+24
|\|
| * allow customizing decrease delay of rgb heatmap (#11322)André Silva2021-01-141-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow customizing decrease delay of rgb heatmap * rename rgb typing heatmap decrease delay variable * address review comments * nix-shell: add clang-tools required for formatting the C code * heatmap: use real timer to track decrement rate * heatmap: fix ifndef var name typo * heatmap: add docs * Update docs/feature_rgb_matrix.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Revert "Keep track of last matrix activity (#10730)"Nick Brassel2021-01-151-20/+9
| | | | | | | | This reverts commit 79d1db332477963555416d9fff82ecac4399bd52.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-131-0/+5
|\|
| * keymap_fr_ch: undef `CH_H` (#11537)Ryan2021-01-131-0/+5
| |
* | fix matrix_io_delay() timing in quantum/matrix.c (#9603)Takeshi ISHII2021-01-134-8/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix matrix_io_delay() timing in quantum/matrix.c * Updated comments explaining the need for matrix_io_delay() in quantum/matrix.c * fix matrix_io_delay() timing in quantum/split_common/matrix.c * Update quantum/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/split_common/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/split_common/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * add waitOutputPinValid() and wait_cpuclock() into quantum/quantum.h and tmk_core/common/wait.h * add matrix_output_select_delay() and matrix_output_unselect_delay() * fix quantum/matrix_common.c, tmk_core/common/matrix.h * fix tmk_core/common/wait.h * fix quantum/quantum.h, tmk_core/common/wait.h * waitOutputPinValid() rename to waitInputPinDelay() in quantum/quantum.h. * waitOutputPinValid() rename to waitInputPinDelay() in quantum/matrix_common.c * update tmk_core/common/wait.h * update comment in quantum/matrix.c, quantum/split_common/matrix.c * update quantum/quantum.h: Make more margin in the GPIO_INPUT_PIN_DELAY default value. Co-authored-by: Ryan <fauxpark@gmail.com>
* | Keep track of last matrix activity (#10730)Nick Brassel2021-01-121-9/+20
| | | | | | | | | | | | | | * Allow recording of the last matrix activity time, to simplify implementation of display timeouts and the like. * Add requested changes from code review. * Simplify split matrix last changed.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-112-1/+46
|\|
| * Lighting Layers should be disabled when suspended (#11442)Joshua Diamond2021-01-112-1/+46
| | | | | | | | | | * Lighting Layers should be disabled when suspended * bugfixes
* | Refine twinkle to be smoother (use breathing curve) (#11350)Joshua Diamond2021-01-102-34/+49
| | | | | | | | | | | | | | | | | | * Refine twinkle to be smoother (use breathing curve) * tune more for firmware size * fix bug when v=255 ~ drashna approved ~
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-054-9/+11
|\|
| * Fix Tap-Hold Configs (#11127)Drashna Jaelre2021-01-044-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add proper prototypes for Tap-Hold Per Key functions * Fix handwired/tennie default keymap * Remove unneeded references * Fix tapping term per key check in space cadet * Pre-emptive fix for tap dance * Fix marksard/leftover30 * Replace hard coded tapping term with define
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-01-031-4/+4
|\|
| * Fix broken Lighting Layers when RGBLIGHT_MAX_LAYERS > 16 (#11406)Joshua Diamond2021-01-021-4/+4
| | | | | | | | | | | | | | | | | | * fix incorrect bit math when RGBLIGHT_MAX_LAYERS > 16 * with 1UL cast is not needed * ...but just casting works and is even more efficient * cformat
* | Improved Language Specific Keycodes for US International and Extended ↵Joshua Diamond2021-01-026-13/+592
| | | | | | | | | | Layouts (#11307) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-302-0/+334
|\|
| * Added mac variant of portuguese keymap extras (#11260)André Cruz2020-12-292-0/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added mac variant of portuguese keymap This keymap is very similar to the existing portuguese keymap, but some symbols are moved around. Apply suggestions from code review Corrected whitespace and implemented some suggested changes. Co-authored-by: Ryan <fauxpark@gmail.com> Converted some spaces to nbsp Added sendstring ISO version * Apply suggestions from code review Added suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Replaced space with nbsp * Corrected 2 chars in ascii_to_shift_lut { and } require shift Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-1/+1
|\|
| * [Bug] Fix RGB Matrix Indicators (#11308)Drashna Jaelre2020-12-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-275-12/+12
|\|
| * Ensure single newline at EOF for core files (#11310)Ryan2020-12-285-12/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2650-204/+68
|\|
| * Change include guards in quantum/ to pragma once (#11239)Ryan2020-12-2650-204/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-231-1/+0
|\|
| * Remove comments about custom ldscript for Teensy LC (#11224)Ryan2020-12-231-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-221-0/+19
|\|
| * Partial fix for Issue #9405 - Caps Lock not working with Unicode Map's XP on ↵Joshua Diamond2020-12-231-0/+19
| | | | | | | | Linux (#11232)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-222-3/+7
|\|
| * Fix Issue #9533 - Delayed shift state handling (#11220)Joshua Diamond2020-12-222-3/+7
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-181-1/+1
|\|
| * Various compilation fixes for avr-gcc 10 (#9269)Joel Challis2020-12-181-1/+1
| |
* | Fix duplicate I2C_KEYMAP_START define (#11237)Ryan2020-12-171-2/+1
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2020-12-184-39/+19
|\|
| * Run cformat and dos2unix manually (#11235)Ryan2020-12-174-39/+19
| |
* | Add modifier state to the split keyboard transport (#10400)Casey Webster2020-12-171-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add modifier state to the split transport This adds modifier state to the i2c and serial transport for split keyboards. The purpose of this is to allow e.g. displaying modifier state on the slave side of a split keyboard on an oled. This adds one byte to the data transferred between halves. This also fixes a missing ifdef guard for BLACKLIGHT_ENABLE. Break modifiers into real/weak/oneshot Fix incorrect slave serial mod setting Fix typo in serial weal mod setter Fix build errors for the I2C code that I introduced Code cleanup and formatting per project preferences Correctly get oneshot mods Fix missing braces Remove unneeded ifdef guard Make the added state transport optional Add documentation for the new define to enable this feature Fix stray grave mark * Fix error introduced in conflict resolution
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-161-1/+1
|\|
| * Normalise include statements in keyboard code (#11185)Ryan2020-12-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-161-457/+106
|\|
| * CLI-ify rgblight_breathing_table_calc.c (#11174)Ryan2020-12-161-457/+106
| | | | | | | | Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Zach White <skullydazed@drpepper.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-121-1/+1
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 20:35:37 +0000