Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit cb3872d319cb9869e7f1390d566466f0bb44be0f
Merge: 746b349466 66b744b
Author: freznel10 <[email protected]>
Date:   Sun Aug 27 20:12:09 2023 +0800

    Merge branch 'qmk:develop' into develop

commit 66b744b
Author: Ryan <[email protected]>
Date:   Sun Aug 27 16:51:19 2023 +1000

    Clean up Unicode API usage in user keymaps (qmk#21849)

commit 70e34e4
Author: Ryan <[email protected]>
Date:   Sun Aug 27 13:30:19 2023 +1000

    Unicode, Unicodemap and UCIS refactor (qmk#21659)

commit 95681b8
Author: Joel Challis <[email protected]>
Date:   Sun Aug 27 04:00:14 2023 +0100

    Add *_MATRIX_LED_COUNT generation (qmk#21110)

commit 25331be
Author: Drashna Jaelre <[email protected]>
Date:   Sat Aug 26 19:52:12 2023 -0700

    Revert  changes to ChibiOS Suspend Code (qmk#21830)

    * Partially revert qmk#19780

    * Finish

    * Get teensy 3.5/3.6 board files too

    * fix lint issue

    * Revert "[Bug] Restore usb suspend wakeup delay (qmk#21676)"

    This reverts commit e8e989f.

    * Apply suggestions from code review

    Co-authored-by: Joel Challis <[email protected]>

    ---------

    Co-authored-by: Joel Challis <[email protected]>

commit 7364515
Author: Ryan <[email protected]>
Date:   Sun Aug 27 06:03:29 2023 +1000

    Rework info.json reference (qmk#21324)

    * Rework info.json reference

    * Apply suggestions from code review

    Co-authored-by: Sergey Vlasov <[email protected]>

    * Update backlight.pins description

    * Add rgblight.driver and lowercase other driver names

    * Remove `split.main` and `split.matrix_grid` for now as they are not working yet

    ---------

    Co-authored-by: Sergey Vlasov <[email protected]>

commit 50151be
Merge: 5cd47f5 f07490b
Author: QMK Bot <[email protected]>
Date:   Sat Aug 26 18:44:20 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit f07490b
Author: Andy Smith <[email protected]>
Date:   Sat Aug 26 19:43:40 2023 +0100

    Corrected duration example, should be number not string (qmk#21839)

commit 5cd47f5
Author: HiryKun <[email protected]>
Date:   Sun Aug 27 02:31:59 2023 +0800

    Add "apm32-dfu" in keyboard.jsonschema (qmk#21842)

commit a9e2f6a
Author: Joel Challis <[email protected]>
Date:   Fri Aug 25 00:47:12 2023 +0100

    Remove `led_matrix.hue_steps` and `led_matrix.sat_steps` from schema (qmk#21827)

commit 0c51ed7
Merge: 023d644 7a73723
Author: QMK Bot <[email protected]>
Date:   Thu Aug 24 01:35:56 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 7a73723
Author: patrickxiong <[email protected]>
Date:   Thu Aug 24 11:35:13 2023 +1000

    converter/ibm_terminal: Fix F0_BREAK state transition (qmk#21824)

commit 023d644
Author: Ryan <[email protected]>
Date:   Thu Aug 24 07:11:39 2023 +1000

    Move RGBLight animations to data driven (qmk#21635)

    * Move RGBLight animations to data driven, 0-9

    * Move RGBLight animations to data driven, A

    * Move RGBLight animations to data driven, B

    * Move RGBLight animations to data driven, C

    * Move RGBLight animations to data driven, D

    * Move RGBLight animations to data driven, E

    * Move RGBLight animations to data driven, F

    * Move RGBLight animations to data driven, G

    * Move RGBLight animations to data driven, H

    * Move RGBLight animations to data driven, handwired

    * Move RGBLight animations to data driven, I

    * Move RGBLight animations to data driven, J

    * Move RGBLight animations to data driven, K

    * Move RGBLight animations to data driven, L

    * Move RGBLight animations to data driven, M

    * Move RGBLight animations to data driven, N

    * Move RGBLight animations to data driven, O

    * Move RGBLight animations to data driven, P

    * Move RGBLight animations to data driven, Q

    * Move RGBLight animations to data driven, R

    * Move RGBLight animations to data driven, S

    * Move RGBLight animations to data driven, T

    * Move RGBLight animations to data driven, U

    * Move RGBLight animations to data driven, V

    * Move RGBLight animations to data driven, W

    * Move RGBLight animations to data driven, X

    * Move RGBLight animations to data driven, Y

    * Move RGBLight animations to data driven, Z

    * Fix incorrect placement

    * Fix build failures and mismatches

commit 79491e3
Merge: a672fdd f699fde
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 19:55:42 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit f699fde
Author: Thomas Weißschuh <[email protected]>
Date:   Wed Aug 23 21:55:03 2023 +0200

    Generalize AVR -Werror=array-bounds workaround (qmk#21798)

    GCC 13 needs the same workaround as GCC 12.
    To avoid having to maintain an ever-growing list of broken versions
    apply the workaround wherever it can be used.

    If at some point a fixed version of GCC is released the workaround can
    be disabled for those fixed versions.

    See qmk#17064

commit a672fdd
Merge: 1cf040a f7cf066
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 19:55:00 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit f7cf066
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Aug 23 20:54:25 2023 +0100

    Bump tj-actions/changed-files from 37 to 38 (qmk#21822)

    Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 37 to 38.
    - [Release notes](https://github.com/tj-actions/changed-files/releases)
    - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
    - [Commits](tj-actions/changed-files@v37...v38)

    ---
    updated-dependencies:
    - dependency-name: tj-actions/changed-files
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 1cf040a
Merge: 2b7f1b0 90d1b32
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 13:39:25 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 90d1b32
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 14:38:48 2023 +0100

    Fix infinite recursion in lxxt encoder logic (qmk#21819)

commit 2b7f1b0
Merge: 1babb2c b1fbfaa
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 09:13:38 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit b1fbfaa
Author: Sergey Vlasov <[email protected]>
Date:   Wed Aug 23 12:13:03 2023 +0300

    keychron/c2_pro/ansi/white: Fix column 19 in the custom matrix (qmk#21805)

    Although `keychron/c2_pro/ansi/rgb` and `keychron/c2_pro/ansi/white` use
    the same custom matrix code, the matrix layouts are slightly different;
    in particular, only the `keychron/c2_pro/ansi/white` board actually uses
    column 19.  However, the handling of column 19 in the custom matrix code
    was broken, therefore that column did not work.

    Looks like the custom matrix code assumes that `SHIFT_COL_END` refers to
    the last column connected to the shift register, and not to the column
    past that; so the value of `SHIFT_COL_END` needs to be changed from 19
    to 18 (columns 11...18 are connected to the shift register, and column
    19 is connected to the C14 pin).

    Also the code which was determining `SIZE_T` and `UNSELECT_ALL_COL` had
    an off-by-one bug when counting the required number of bits (again due
    to the confusion on the `SHIFT_COL_END` meaning); this had been fixed
    too (the actual behavior of that part of the code did not change,
    because both the old and the new version select the 8 bit variant).

commit 1babb2c
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 06:13:01 2023 +0100

    Fix keyboards with old RGB driver names (qmk#21817)

commit 8e0173b
Merge: 9bb8230 c2b8375
Author: QMK Bot <[email protected]>
Date:   Wed Aug 23 04:53:27 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit c2b8375
Author: フィルターペーパー <[email protected]>
Date:   Wed Aug 23 12:52:52 2023 +0800

    [Doc] Improve magic keycode section (qmk#21787)

commit 9bb8230
Author: Ryan <[email protected]>
Date:   Wed Aug 23 11:49:02 2023 +1000

    Fix keyboards with old RGB driver names (qmk#21815)

commit 37bc949
Author: Ryan <[email protected]>
Date:   Wed Aug 23 10:00:03 2023 +1000

    RGB Matrix: driver naming cleanups (qmk#21594)

commit dfb6d38
Author: Joel Challis <[email protected]>
Date:   Wed Aug 23 00:03:01 2023 +0100

    Simplfy RGB/LED matrix effect logic (qmk#21703)

commit 0d53538
Author: Less/Rikki <[email protected]>
Date:   Tue Aug 22 13:39:33 2023 -0400

    fix: restore indicators to jellybean_raindrops (qmk#21792)

    After qmk#21169, rgb_matrix_indicators() was limited to running on the
    final render iteration. Since the jellybean_raindrops animation
    immediately returns false after updating a single LED, the iteration
    count no longer ends up high enough to render non-advanced indicators.

    This change also brings jellybean_raindrops more in line with raindrops.

commit 1236c29
Author: Controller Works <[email protected]>
Date:   Tue Aug 22 12:12:51 2023 -0400

    [Keyboard] Add city42 (qmk#21727)

    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>

commit 746b349466604e77b4c12739ac356b79c7676016
Merge: 7e7c865032 eed34f7
Author: freznel10 <[email protected]>
Date:   Tue Aug 22 11:42:59 2023 +0800

    Merge branch 'qmk:develop' into develop

commit eed34f7
Author: Joel Challis <[email protected]>
Date:   Tue Aug 22 00:10:08 2023 +0100

    Fix drop/shift/v2 compilation (qmk#21800)

commit 1149212
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 23:20:24 2023 +0100

    Align SENSE75 with recent Drop additions (qmk#21757)

commit 892ba2e
Merge: 96d90a5 3f19272
Author: zvecr <[email protected]>
Date:   Mon Aug 21 22:59:43 2023 +0100

    Merge remote-tracking branch 'origin/master' into develop

commit 3f19272
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:47:46 2023 +0100

    Initial support for SHIFT v2 (qmk#21756)

commit f422b3c
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:47:29 2023 +0100

    Initial support for CTRL v2 (qmk#21755)

commit f9aba86
Author: Joel Challis <[email protected]>
Date:   Mon Aug 21 22:46:12 2023 +0100

    Initial support for ALT v2 (qmk#21754)

commit 11970b1
Author: DUILCHOI <[email protected]>
Date:   Mon Aug 21 12:24:58 2023 +0900

    [Keyboard] Add linworks favepada (qmk#20794)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>
    Co-authored-by: jack <[email protected]>

commit dd4f4f8
Author: owlab2 <[email protected]>
Date:   Mon Aug 21 00:16:41 2023 +0800

    [Keyboard] Add Jelly Evolv (qmk#21407)

    Co-authored-by: jack <[email protected]>

commit 6d9eab8
Author: Pangorin <[email protected]>
Date:   Sun Aug 20 23:08:13 2023 +0700

    Adding support for TAN67 PCB (qmk#21003)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: Duncan Sutherland <[email protected]>

commit d91857d
Author: studiokestra <[email protected]>
Date:   Sat Aug 19 15:24:06 2023 -0600

    Add Galatea rev3 keyboard (qmk#21758)

commit 96d90a5
Author: Drashna Jaelre <[email protected]>
Date:   Thu Aug 17 17:39:16 2023 -0700

    [Bug] Fix compilation error for APA on ChibiOS (qmk#21773)

commit 7e7c865032110e3fbe6e35007faed4dcf548d981
Merge: e4b43861d2 6cece8adfe
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:33:13 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit e4b43861d274e5940eb9275f1cb4635121c393a0
Merge: ff62eba7de 89a30ef
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:32:23 2023 +0800

    Merge branch 'develop' of https://github.com/qmk/qmk_firmware into develop

commit 6cece8adfe4263f60b5a368637a98aa16675d019
Merge: 805324c 89a30ef
Author: freznel10 <[email protected]>
Date:   Thu Aug 17 17:29:02 2023 +0800

    Merge pull request #1 from qmk/develop

    Develop

commit ff62eba7de4e825ba9d07b7378059b6f97df46c7
Merge: ba4b9cb64d 805324c
Author: freznel10 <[email protected]>
Date:   Tue Aug 8 22:50:28 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit ba4b9cb64d5ce4278b34a2607da504f85773a206
Merge: 0f3063722b f407d90
Author: freznel10 <[email protected]>
Date:   Mon Jul 31 12:16:26 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 0f3063722bf76f3d4e6b501c0e244f4bb679ecdf
Merge: a34d21fbef 14c2e55
Author: freznel10 <[email protected]>
Date:   Tue Jul 25 14:33:04 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit a34d21fbef5ad7d6760855f72475eb5727c21add
Merge: b3162a03bf bfe27a0
Author: freznel10 <[email protected]>
Date:   Thu Jul 13 01:13:23 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit b3162a03bf8c8d218e98df68a8fe595d42c52ae0
Merge: 97945b22c6 66a1693
Author: freznel10 <[email protected]>
Date:   Thu Jun 29 14:02:25 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 97945b22c6f3afc7470b768cb22e670769aa57c2
Merge: 1a65c2721c ba055a9
Author: freznel10 <[email protected]>
Date:   Tue Jun 27 14:04:49 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit 1a65c2721c9912a20a339796ce102bffbcc34180
Merge: b51f2afe4c 5a4fab0
Author: freznel10 <[email protected]>
Date:   Thu Jun 22 16:21:39 2023 +0800

    Merge branch 'develop' of https://github.com/freznel10/qmk_firmware into develop

commit b51f2afe4cf66ac6d75e7047b4e63124ccef3def
Author: freznel10 <[email protected]>
Date:   Thu Jun 22 16:19:52 2023 +0800

    Squashed commit of the following:

    commit 5a4fab0
    Merge: c601b1f cc4ac72
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 04:36:15 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit cc4ac72
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 21:35:35 2023 -0700

        Igloo Configurator Touch-Up (qmk#21303)

        * [refactor] friendly-format info.json

        * [enhancement] add matrix diagram

        * [enhancement] remove key overlaps in layout data

    commit c601b1f
    Merge: adc954f 33f76d7
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 02:12:05 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 33f76d7
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 19:11:32 2023 -0700

        Quarkeys Z40 Community Layout Support and Touch-Up (qmk#21329)

        * [refactor] rename LAYOUT to LAYOUT_planck_mit

        * [style] friendly-format info.json

        * [style] refactor keymaps

        - grid-align keycodes
        - use four-space indent
        - remove trailing whitespace

        * [chore] tidy-up keyboard data in info.json

        - spell-check `manufacturer` value
        - use valid `url`
        - reference GitHub username for `maintainer`

        * [chore] tidy-up readme

        - link to maintainer's GitHub account
        - add Hardware Availability link
        - break-out Hardware Specs into its own section

        * [enhancement] enable Community Layout support

        * [chore] replace product image in readme

        Source repository for previous URL seems to have been deleted.

    commit adc954f
    Merge: 87b371c b8a12db
    Author: QMK Bot <[email protected]>
    Date:   Thu Jun 22 00:43:08 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit b8a12db
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 17:42:30 2023 -0700

        Pteropus: correct layout data (qmk#21326)

        * [style] friendly-format info.json

        * [chore] correct layout data

        Fix keys overlapping when rendered in QMK Configurator or CLI.

    commit 87b371c
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 14:20:02 2023 -0700

        ProtoTypist PT-80 Refactor (qmk#21325)

        * [style] friendly-format info.json

        * [docs] add layout/matrix diagram

        * [style] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] LAYOUT_all macro

        Move the JSON object for the Enter key to the end of the home row.

        * [style] refactor default keymap

        - update keycode grid alignment
        - remove trailing whitespace

        * [refactor] LAYOUT_tkl_iso macro

        Move the JSON object for the Enter key to the end of the home row.

        This commit fixes a key sequence error with the `tkl_iso` Community
        Layout support.

        * [style] refactor default_ansi keymap

        - update keycode grid alignment
        - remove trailing whitespace

        * [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

        Fix incorrect matrix position assignments on the function row keys for
        the `LAYOUT_tkl_iso` macro.

        * [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

        Fix incorrect matrix position assignments on the function row keys for
        the `LAYOUT_tkl_ansi` macro.

    commit 810cd9b
    Merge: e3faa76 6f39205
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 19:30:39 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 6f39205
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 12:30:04 2023 -0700

        Laneware LW75: correct layout data (qmk#21314)

        [refactor]

        Fixes misleading Configurator implementations of the available layouts.

    commit e3faa76
    Merge: fa1b533 20c0043
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 18:42:56 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 20c0043
    Author: lindgrenj6 <[email protected]>
    Date:   Wed Jun 21 13:42:23 2023 -0500

        [Keymap] Add lindgrenj6 planck layout (qmk#21155)

    commit fa1b533
    Merge: b6c76cd 4cc427c
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 18:30:50 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 4cc427c
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 11:30:15 2023 -0700

        Lucid Velvet Solder Layout Additions and Touch-Up (qmk#21313)

        * [refactor] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] refactor default keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [bugfix] fix key sequence error in default keymap

        * [enhancement] fix key overlaps in Configurator

        * [enhancement] add matrix diagram

        * [refactor] rename LAYOUT to LAYOUT_all

        * [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi

        * [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_iso

    commit b6c76cd
    Merge: 673b536 b814ff5
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 17:39:03 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit b814ff5
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 10:38:18 2023 -0700

        Lucid Velvet Hotswap Layout Additions and Touch-Up (qmk#21312)

        * [refactor] refactor via keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [refactor] refactor default keymap

        - grid-align keycodes
        - remove trailing whitespace

        * [bugfix] fix key sequence error in default keymap

        * [enhancement] fix key overlap in Configurator

        * [enhancement] add matrix diagram

        * [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi

        * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

        * [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

        * [enhancenment] enable Community Layout support

    commit 673b536
    Merge: 3274e0a 71b77df
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 16:00:31 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 71b77df
    Author: James Young <[email protected]>
    Date:   Wed Jun 21 08:59:54 2023 -0700

        Keebio Cepstrum Configurator Touch-Up (qmk#21310)

        * [enhancement] remove redundant layout data

        Remove the redundant layout data from the keyboard-level `info.json`.

        * [enhancement] correct JSON syntax in rev1/info.json

        * [enhancement] friendly-format rev1/info.json

        * [enhancement] correct layout data

    commit 3274e0a
    Merge: 08ba8a0 ecca9c5
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 03:05:47 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit ecca9c5
    Author: lalalademaxiya1 <[email protected]>
    Date:   Wed Jun 21 11:05:07 2023 +0800

        Add Keychron C2 Pro (qmk#20701)

        Co-authored-by: Drashna Jaelre <[email protected]>
        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 08ba8a0
    Merge: 6373543 595d393
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 03:02:34 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 595d393
    Author: jonylee@hfd <[email protected]>
    Date:   Wed Jun 21 11:01:43 2023 +0800

        [Keyboard] Add Monsgeek M5 (qmk#21182)

        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 6373543
    Merge: dad41bd 2f1cac6
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 02:58:50 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit dad41bd
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 19:58:44 2023 -0700

        ProtoTypist PT-60 Refactor (qmk#21322)

    commit 2f1cac6
    Author: Albert Y <[email protected]>
    Date:   Wed Jun 21 10:58:13 2023 +0800

        [Docs] Code markdown amendment (qmk#21323)

    commit c69f82f
    Merge: 6ec91a7 7753249
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 02:30:16 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 7753249
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 19:29:44 2023 -0700

        NovelKeys NK+: correct layout data (qmk#21317)

        * NovelKeys NK+: correct layout data

        Add key sizes to the layout data.

        * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan

    commit 6ec91a7
    Merge: ffdc70b 42cd55e
    Author: QMK Bot <[email protected]>
    Date:   Wed Jun 21 00:33:07 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 42cd55e
    Author: Jack Humbert <[email protected]>
    Date:   Tue Jun 20 20:32:32 2023 -0400

        Planck Matrix Fixes (qmk#21196)

        * fix non-default keymap compiling, initial matrix state, watchdog options

        * fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

        * chore: update function name on all cases.

        * remove old midi tone option

        Co-authored-by: Ryan <[email protected]>

        * fixes abhixec's planck keymap

        * add audio enable condition to abhixec's planck keymap

        * add audio enable condition to all muse includes

        * Revert "add audio enable condition to all muse includes"

        This reverts commit 9779e90.

        * Revert "add audio enable condition to abhixec's planck keymap"

        This reverts commit 24c742a.

        * Revert "fixes abhixec's planck keymap"

        This reverts commit 4bb085d.

        ---------

        Co-authored-by: Peter.Falken <[email protected]>
        Co-authored-by: Ryan <[email protected]>

    commit ffdc70b
    Author: Nick Brassel <[email protected]>
    Date:   Wed Jun 21 08:41:49 2023 +1000

        Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (qmk#21272)

    commit 45dc1cc
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 15:40:31 2023 -0700

        EC Pro X JIS Layout Touch-Up (qmk#21260)

        * [refactor] update `info.json` for readability

        - sort the JSON objects representing the keyboard's keys in the order:
          - label, matrix, x, y, w, h
        - convert numeric JSON values to integers where appropriate

        * [refactor] remove key labels from `info.json`

        * [refactor] keymap refactor

        - grid-align keycodes

        * [bugfix] move Enter key to home row

        Moves the JSON object representing the Enter key to the home row.

        Fixes an issue that resulted in correct key assignment only if the
        keymap being compiled/flashed was based upon the `via` keymap.

    commit ac14fce
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 10:18:16 2023 -0700

        Kalakos Bahrnob65 Configurator Layout Touch-Up (qmk#21309)

        * [enhancement] add matrix diagram

        * [refactor] friendly-format info.json

        * [enhancement] remove key overlaps

    commit a9f49a0
    Merge: 01cfc72 85b8044
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 17:17:10 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 85b8044
    Author: James Young <[email protected]>
    Date:   Tue Jun 20 10:16:35 2023 -0700

        KJ-Modify RS40 Configurator Touch-Up (qmk#21311)

        * [refactor] friendly-format info.json

        * [enhancement] remove key overlap

        Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

        * [enhancement] replace store links with product links

        Replace URLs that point to the vendor's shop with URLs to the vendor's
        product listing.

    commit 01cfc72
    Merge: 965cfec 45c52c7
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:42:27 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 45c52c7
    Author: lalalademaxiya1 <[email protected]>
    Date:   Tue Jun 20 23:41:45 2023 +0800

        [Keyboard] Add Keychron C1 Pro (qmk#20700)

        Co-authored-by: adophoxia <[email protected]>
        Co-authored-by: Drashna Jaelre <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit 965cfec
    Merge: a2e2d92 958cae3
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:39:02 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 958cae3
    Author: Roberts Kursitis <[email protected]>
    Date:   Tue Jun 20 18:38:26 2023 +0300

        [Keyboard] Add Alisaie (qmk#21266)

    commit a2e2d92
    Merge: d98b60c 0abe312
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 15:36:05 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 0abe312
    Author: Derek <[email protected]>
    Date:   Tue Jun 20 11:35:23 2023 -0400

        [Keyboard] Add bigsmoothknob (qmk#21265)

        Co-authored-by: Joel Challis <[email protected]>
        Co-authored-by: jack <[email protected]>

    commit d98b60c
    Author: jonylee@hfd <[email protected]>
    Date:   Tue Jun 20 10:31:46 2023 +0800

        Move kb83 keyboard (qmk#20761)

        * move hfdkb/keyboard_sw/k83 --> inland/kb83

        * move hfdkb/keyboard_sw/k83 --> inland/kb83

        * Update data/mappings/keyboard_aliases.hjson

        * Update keyboard_aliases.hjson

        * fixed  the Configurator layout data

        * fixed the Configurator layout data

        * Revert "Update keyboard_aliases.hjson"

        This reverts commit c085c54.

        * Revert "fixed  the Configurator layout data"

        * Update keyboard_aliases.hjson

        * Update info.json

    commit 808228c
    Merge: be6f92c 7bd1d18
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 01:56:07 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 7bd1d18
    Author: Drashna Jaelre <[email protected]>
    Date:   Mon Jun 19 18:55:27 2023 -0700

        [Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (qmk#21290)

        Co-authored-by: Ryan <[email protected]>

    commit be6f92c
    Merge: b749a5f 31e39a9
    Author: QMK Bot <[email protected]>
    Date:   Tue Jun 20 01:46:21 2023 +0000

        Merge remote-tracking branch 'origin/master' into develop

    commit 31e39a9
    Author: James Young <[email protected]>
    Date:   Mon Jun 19 18:45:47 2023 -0700

        dnworks SBL Community Layout Support and Touch-Up (qmk#21267)

    commit b749a5f
    Author: jack <[email protected]>
    Date:   Mon Jun 19 13:59:35 2023 -0600

        Fixup `nightly_boards/n40_o` (qmk#21307)

    commit c4a67d3
    Author: jack <[email protected]>
    Date:   Mon Jun 19 09:46:27 2023 -0600

        Remove encoder in-matrix workaround code (qmk#20389)
  • Loading branch information
@freznel10
freznel10 committed Aug 27, 2023
1 parent 9425b65 commit df23f8b
Show file tree
Hide file tree
Showing 2,454 changed files with 19,083 additions and 16,815 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v37
uses: tj-actions/changed-files@v38

- name: Run qmk formatters
shell: 'bash {0}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v37
uses: tj-actions/changed-files@v38

- name: Print info
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ define PARSE_TEST
ifeq ($$(TEST_NAME),all)
MATCHED_TESTS := $$(TEST_LIST)
else
MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME), $$(notdir $$(TEST))), $$(TEST),))
MATCHED_TESTS := $$(foreach TEST, $$(TEST_LIST),$$(if $$(findstring x$$(TEST_NAME)x, x$$(notdir $$(TEST))x), $$(TEST),))
endif
$$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
endef
Expand Down
36 changes: 20 additions & 16 deletions builddefs/common_features.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ endif
COMMON_VPATH += $(QUANTUM_DIR)/led_matrix
COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
Expand Down Expand Up @@ -375,7 +376,7 @@ endif

RGB_MATRIX_ENABLE ?= no

VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3736 IS31FL3737 IS31FL3741 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 WS2812 custom
VALID_RGB_MATRIX_TYPES := aw20216 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a ckled2001 ws2812 custom
ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
$(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
Expand All @@ -388,96 +389,97 @@ endif
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
POST_CONFIG_H += $(QUANTUM_DIR)/rgb_matrix/post_config.h
SRC += $(QUANTUM_DIR)/color.c
SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
SRC += $(LIB_PATH)/lib8tion/lib8tion.c
CIE1931_CURVE := yes
RGB_KEYCODES_ENABLE := yes

ifeq ($(strip $(RGB_MATRIX_DRIVER)), AW20216)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216)
OPT_DEFS += -DAW20216 -DSTM32_SPI -DHAL_USE_SPI=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led
SRC += aw20216.c
QUANTUM_LIB_SRC += spi_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3731)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3731)
OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31fl3731.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3733)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3733)
OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31fl3733.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3736)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3736)
OPT_DEFS += -DIS31FL3736 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31fl3736.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3737)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3737)
OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31fl3737.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3741)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3741)
OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31fl3741.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3742A)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3742a)
OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31flcommon.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3743A)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3743a)
OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31flcommon.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3745)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3745)
OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31flcommon.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3746A)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3746a)
OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led/issi
SRC += is31flcommon.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), CKLED2001)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), ckled2001)
OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/led
SRC += ckled2001.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), WS2812)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), ws2812)
OPT_DEFS += -DWS2812
WS2812_DRIVER_REQUIRED := yes
endif

ifeq ($(strip $(RGB_MATRIX_DRIVER)), APA102)
ifeq ($(strip $(RGB_MATRIX_DRIVER)), apa102)
OPT_DEFS += -DAPA102
APA102_DRIVER_REQUIRED := yes
endif
Expand Down Expand Up @@ -742,13 +744,15 @@ endif
ifeq ($(strip $(UCIS_ENABLE)), yes)
OPT_DEFS += -DUCIS_ENABLE
UNICODE_COMMON := yes
SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c
SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c \
$(QUANTUM_DIR)/unicode/ucis.c
endif

ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
OPT_DEFS += -DUNICODEMAP_ENABLE
UNICODE_COMMON := yes
SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c
SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c \
$(QUANTUM_DIR)/unicode/unicodemap.c
endif

ifeq ($(strip $(UNICODE_ENABLE)), yes)
Expand Down
4 changes: 2 additions & 2 deletions data/mappings/info_config.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,12 @@

// LED Matrix
"LED_MATRIX_CENTER": {"info_key": "led_matrix.center_point", "value_type": "array.int"},
"LED_MATRIX_HUE_STEP": {"info_key": "led_matrix.hue_steps", "value_type": "int"},
"LED_MATRIX_MAXIMUM_BRIGHTNESS": {"info_key": "led_matrix.max_brightness", "value_type": "int"},
"LED_MATRIX_SAT_STEP": {"info_key": "led_matrix.sat_steps", "value_type": "int"},
"LED_MATRIX_SPD_STEP": {"info_key": "led_matrix.speed_steps", "value_type": "int"},
"LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"},
"LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"},
"LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"},
"LED_MATRIX_LED_COUNT": {"info_key": "led_matrix.led_count", "value_type": "int", "to_json": false},

// LUFA Bootloader
"QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"},
Expand Down Expand Up @@ -109,6 +108,7 @@
"RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"},
"RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"},
"RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"},
"RGB_MATRIX_LED_COUNT": {"info_key": "rgb_matrix.led_count", "value_type": "int", "to_json": false},

// RGBLight
"RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
Expand Down
3 changes: 1 addition & 2 deletions data/schemas/keyboard.jsonschema
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"bootloader": {
"type": "string",
"enum": [
"apm32-dfu",
"atmel-dfu",
"bootloadhid",
"caterina",
Expand Down Expand Up @@ -381,8 +382,6 @@
},
"max_brightness": {"$ref": "qmk.definitions.v1#/unsigned_int_8"},
"timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"hue_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"sat_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"val_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"speed_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
"split_count": {
Expand Down
12 changes: 3 additions & 9 deletions docs/feature_led_matrix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ enum led_matrix_effects {
LED_MATRIX_CYCLE_UP_DOWN, // Full gradient scrolling top to bottom
LED_MATRIX_CYCLE_OUT_IN, // Full gradient scrolling out to in
LED_MATRIX_DUAL_BEACON, // Full gradient spinning around center of keyboard
#if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
LED_MATRIX_SOLID_REACTIVE_SIMPLE, // Pulses keys hit then fades out
LED_MATRIX_SOLID_REACTIVE_WIDE // Value pulses near a single key hit then fades out
LED_MATRIX_SOLID_REACTIVE_MULTIWIDE // Value pulses near multiple key hits then fades out
Expand All @@ -257,7 +256,6 @@ enum led_matrix_effects {
LED_MATRIX_SOLID_REACTIVE_MULTINEXUS // Value pulses away on the same column and row of multiple key hits then fades out
LED_MATRIX_SOLID_SPLASH, // Value pulses away from a single key hit then fades out
LED_MATRIX_SOLID_MULTISPLASH, // Value pulses away from multiple key hits then fades out
#endif
LED_MATRIX_WAVE_LEFT_RIGHT // Sine wave scrolling from left to right
LED_MATRIX_WAVE_UP_DOWN // Sine wave scrolling from up to down
LED_MATRIX_EFFECT_MAX
Expand All @@ -281,8 +279,6 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
|`#define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT` |Enables `LED_MATRIX_WAVE_LEFT_RIGHT` |
|`#define ENABLE_LED_MATRIX_WAVE_UP_DOWN` |Enables `LED_MATRIX_WAVE_UP_DOWN` |

?> These modes don't require any additional defines.

|Reactive Defines |Description |
|-------------------------------------------------------|----------------------------------------------|
|`#define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE` |Enables `LED_MATRIX_SOLID_REACTIVE_SIMPLE` |
Expand All @@ -295,7 +291,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
|`#define ENABLE_LED_MATRIX_SOLID_SPLASH` |Enables `LED_MATRIX_SOLID_SPLASH` |
|`#define ENABLE_LED_MATRIX_SOLID_MULTISPLASH` |Enables `LED_MATRIX_SOLID_MULTISPLASH` |

?> These modes also require the `LED_MATRIX_KEYPRESSES` or `LED_MATRIX_KEYRELEASES` define to be available.
?> These modes introduce additional logic that can increase firmware size.

## Custom LED Matrix Effects :id=custom-led-matrix-effects

Expand Down Expand Up @@ -361,9 +357,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
## Additional `config.h` Options :id=additional-configh-options

```c
#define LED_MATRIX_KEYPRESSES // reacts to keypresses
#define LED_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define LED_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
#define LED_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
#define LED_MATRIX_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
#define LED_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define LED_MATRIX_LED_PROCESS_LIMIT (LED_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
Expand All @@ -373,7 +367,7 @@ For inspiration and examples, check out the built-in effects under `quantum/led_
#define LED_MATRIX_DEFAULT_VAL LED_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
#define LED_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set
#define LED_MATRIX_SPLIT { X, Y } // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
// If LED_MATRIX_KEYPRESSES or LED_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
// If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
```
## EEPROM storage :id=eeprom-storage
Expand Down
2 changes: 1 addition & 1 deletion docs/feature_macros.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
],
[
{"action":"tap", "keycodes": ["F1"]},
{"action":"delay", "duration": "1000"},
{"action":"delay", "duration": 1000},
{"action":"tap", "keycodes": ["PGDN"]}
]
],
Expand Down
Loading

0 comments on commit df23f8b

Please sign in to comment.