Squashed commit of the following:

commit 0ffa4ef Merge: 11bba43 42c6920 Author: QMK Bot <hello@qmk.fm> Date: Sun May 28 22:27:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 42c6920 Author: Joel Challis <git@zvecr.com> Date: Sun May 28 23:27:13 2023 +0100 Update auto_tag.yml (qmk#21050) commit 11bba43 Merge: f2808dc d02ff2e Author: QMK Bot <hello@qmk.fm> Date: Sun May 28 20:37:30 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit d02ff2e Author: Joel Challis <git@zvecr.com> Date: Sun May 28 21:36:46 2023 +0100 Update "Most Recent ChangeLog" (qmk#21071) commit f2808dc Author: Nick Brassel <nick@tzarc.org> Date: Mon May 29 06:19:41 2023 +1000 Branch point for 2023q3 Breaking Change. commit 5024370 Merge: 16767e4 8b1d86e Author: Nick Brassel <nick@tzarc.org> Date: Mon May 29 06:17:24 2023 +1000 Merge branch 'develop' commit 8b1d86e Author: Nick Brassel <nick@tzarc.org> Date: Mon May 29 06:16:06 2023 +1000 Remove `develop` note in readme. commit 32d8655 Author: Nick Brassel <nick@tzarc.org> Date: Mon May 29 06:02:11 2023 +1000 `develop` 2023q2 changelog (qmk#21049) Co-authored-by: Ryan <fauxpark@gmail.com> commit 8c9f54d Author: Nick Brassel <nick@tzarc.org> Date: Sun May 28 13:38:24 2023 +1000 Encoder map: NUM_DIRECTIONS (qmk#21066) commit f98f8ee Author: nuess0r <nussgipfel@brain4free.org> Date: Sat May 27 15:12:36 2023 +0200 Consolidate modelm v2 (qmk#14996) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> commit e759230 Author: Nick Brassel <nick@tzarc.org> Date: Sat May 27 14:49:57 2023 +1000 Fix up `keebio/cepstrum` (qmk#21062) commit 249fb3c Author: André Greiner-Petter <5708782+AndreG-P@users.noreply.github.com> Date: Sat May 27 12:26:14 2023 +0900 [BUG] Allow multiple IS31FL3741 drivers per board in rgb_matrix (qmk#20988) commit 5642bd1 Author: Nick Brassel <nick@tzarc.org> Date: Sat May 27 13:23:07 2023 +1000 Fix up `qmk find` when not specifying filters. (qmk#21059) commit 363bfdb Author: Ryan <fauxpark@gmail.com> Date: Sat May 27 12:27:44 2023 +1000 Move `RGBLIGHT_LIMIT_VAL` to data driven (qmk#20974) Co-authored-by: Nick Brassel <nick@tzarc.org> commit 8fdcba1 Merge: 5efdc28 16767e4 Author: QMK Bot <hello@qmk.fm> Date: Fri May 26 20:19:17 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 16767e4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri May 26 21:18:33 2023 +0100 Bump JamesIves/github-pages-deploy-action from 4.4.1 to 4.4.2 (qmk#21057) Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.1 to 4.4.2. - [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.4.1...v4.4.2) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 5efdc28 Merge: b2e5017 1c1bc56 Author: QMK Bot <hello@qmk.fm> Date: Fri May 26 02:07:54 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 1c1bc56 Author: Pablo Martínez <58857054+elpekenin@users.noreply.github.com> Date: Fri May 26 04:07:06 2023 +0200 [Bugfix + Refactor] `qmk painter-convert-graphics` (qmk#19994) commit b2e5017 Author: Joel Challis <git@zvecr.com> Date: Thu May 25 23:08:12 2023 +0100 Move `thekey` to Drop vendor folder (qmk#21032) commit 873922d Author: Joel Challis <git@zvecr.com> Date: Thu May 25 23:07:47 2023 +0100 Implement UF2 device type id extension tag (qmk#21029) commit ed69d78 Author: Drashna Jaelre <drashna@live.com> Date: Thu May 25 08:41:12 2023 -0700 [Bug][Keyboard] Fix key display on Corne OLED (qmk#21044) commit 6e41377 Author: Joel Challis <git@zvecr.com> Date: Wed May 24 23:27:57 2023 +0100 qmk info - Remove printing of "Keyboard Folder" (qmk#21033) commit 6d93d8b Merge: a12c1e0 f9c3297 Author: QMK Bot <hello@qmk.fm> Date: Wed May 24 18:48:31 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit f9c3297 Author: Danny <nooges@users.noreply.github.com> Date: Wed May 24 14:47:46 2023 -0400 Add encoder map FoldKB in VIA (qmk#21038) commit a12c1e0 Merge: 3969d70 618d0f0 Author: QMK Bot <hello@qmk.fm> Date: Wed May 24 07:54:46 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 618d0f0 Author: Xyverz <xyverz@gmail.com> Date: Wed May 24 00:54:06 2023 -0700 Removed unneeded layers from xyverz keymaps (qmk#21008) commit 3969d70 Author: Joel Challis <git@zvecr.com> Date: Mon May 22 07:04:19 2023 +0100 Duplicate board files for blok converter (qmk#20629) * Duplicate board files for blok converter * Swap converters board file too * Update platforms/chibios/boards/QMK_BLOK/configs/board.h commit fb056c5 Author: Joel Challis <git@zvecr.com> Date: Mon May 22 07:03:59 2023 +0100 Update json2c to use dump_lines (qmk#21013) commit 595f7db Author: Ryan <fauxpark@gmail.com> Date: Mon May 22 13:40:34 2023 +1000 Remove HHKB RN42 code (qmk#21007) commit 36b08d5 Merge: 5261ac9 725c9f3 Author: QMK Bot <hello@qmk.fm> Date: Sun May 21 16:44:51 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 725c9f3 Author: Bodo Graumann <mail@bodograumann.de> Date: Sun May 21 18:44:06 2023 +0200 Use wayback machine for unreachable site (qmk#20987) commit 5261ac9 Merge: 9d96bfc 08a8d35 Author: QMK Bot <hello@qmk.fm> Date: Sun May 21 15:57:48 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 08a8d35 Author: Ananya Kirti <AnanyaKirti@users.noreply.github.com> Date: Sun May 21 21:27:08 2023 +0530 [Keyboard] Added Support for trainpad (qmk#20973) * Added Support for trainpad added support for trainpad * corrected capitalisation corrected capitalisation * Update keyboards/trainpad/keymaps/via/keymap.c * Update keyboards/trainpad/info.json * Update keyboards/trainpad/keymaps/default/keymap.c * Update readme.md updated readme to remove handwire, and corrected number of keys * removed config.h, trainpad.c and trainpad.h removed config.h, trainpad.c and trainpad.h * updated readme upadted readme to correct capitalisation * Update keyboards/trainpad/info.json * Update keyboards/trainpad/info.json * Update keyboards/trainpad/rules.mk * updated Readme updated Readme * Update keyboards/trainpad/readme.md commit 9d96bfc Merge: d7220da 420e35f Author: QMK Bot <hello@qmk.fm> Date: Sat May 20 21:29:58 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 420e35f Author: Nick Brassel <nick@tzarc.org> Date: Sun May 21 07:29:21 2023 +1000 `qmk generate-make-dependencies` improvements (qmk#21001) * Recommendations from @sigprof * Fix CI tests commit d7220da Author: Drashna Jaelre <drashna@live.com> Date: Sat May 20 13:22:46 2023 -0700 [Bug] Fix issue with Repeat Key-Combo test (qmk#21005) commit 6a7ba7a Author: Sergey Vlasov <sigprof@gmail.com> Date: Sat May 20 21:51:26 2023 +0300 rart/rart80:via: restore rules.mk after qmk#20334 (qmk#21002) PR qmk#20334 accidentally removed the `rules.mk` file from the `via` keymap for `rart/rart80`; restore that file.
freznel10 · May 29, 2023 · 6295d3f · 6295d3f
1 parent b2b96e1
commit 6295d3f
Show file tree

Hide file tree

Showing 862 changed files with 2,055 additions and 3,431 deletions.
diff --git a/.github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.64.0
+      uses: anothrNick/github-tag-action@1.66.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -37,7 +37,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.4.1
+      uses: JamesIves/github-pages-deploy-action@v4.4.2
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
@@ -152,6 +152,7 @@ endif
 # To produce a UF2 file in your build, add to your keyboard's rules.mk:
 #      FIRMWARE_FORMAT = uf2
 UF2CONV = $(TOP_DIR)/util/uf2conv.py
+UF2CONV_ARGS ?=
 UF2_FAMILY ?= 0x0
 
 # Compiler flags to generate dependency files.
@@ -219,7 +220,7 @@ gccversion :
 	@$(BUILD_CMD)
 
 %.uf2: %.elf
-	$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
+	$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(UF2CONV_ARGS) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
 	#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
 	@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
 	@$(BUILD_CMD)

diff --git a/data/mappings/defaults.hjson b/data/mappings/defaults.hjson
@@ -33,7 +33,7 @@
         "blok": {
             "processor": "RP2040",
             "bootloader": "rp2040",
-            "board": "QMK_PM2040"
+            "board": "QMK_BLOK"
         },
         "michi": {
             "processor": "RP2040",

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
@@ -41,6 +41,9 @@
     "angel64": {
         "target": "angel64/alpha"
     },
+    "ashpil/modelm_usbc": {
+        "target": "ibm/model_m/ashpil_usbc"
+    },
     "at101_blackheart": {
         "target": "viktus/at101_bh"
     },
@@ -113,6 +116,15 @@
     "cmm_studio/saka68": {
         "target": "cmm_studio/saka68/solder"
     },
+    "converter/modelm101": {
+        "target": "ibm/model_m/teensypp"
+    },
+    "converter/modelm101_teensy2": {
+        "target": "ibm/model_m/teensy2"
+    },
+    "converter/modelm_ssk": {
+        "target": "ibm/model_m_ssk/teensypp_ssk"
+    },
     "cospad": {
         "target": "kprepublic/cospad"
     },
@@ -203,6 +215,9 @@
     "handwired/ferris": {
         "target": "ferris/0_1"
     },
+    "handwired/ibm122m": {
+        "target": "ibm/model_m_122/ibm122m"
+    },
     "handwired/p1800fl": {
         "target": "team0110/p1800fl"
     },
@@ -425,6 +440,9 @@
     "montsinger/rebound": {
         "target": "montsinger/rebound/rev1"
     },
+    "mschwingen/modelm": {
+        "target": "ibm/model_m/mschwingen"
+    },
     "noxary/268_2": {
         "layouts": {
             "LAYOUT": "LAYOUT_65_ansi_blocker"
@@ -943,6 +961,12 @@
     "m3n3van": {
         "target": "matthewdias/m3n3van"
     },
+    "massdrop/thekey": {
+        "target": "drop/thekey/v1"
+    },
+    "massdrop/thekey_v2": {
+        "target": "drop/thekey/v2"
+    },
     "mechmini/v1": {
         "target": "mechkeys/mechmini/v1"
     },
@@ -1240,6 +1264,9 @@
     "treadstone48/rev2": {
         "target": "marksard/treadstone48/rev2"
     },
+    "tronguylabs/m122_3270": {
+        "target": "ibm/model_m_122/m122_3270"
+    },
     "ua62": {
         "target": "nacly/ua62"
     },
@@ -1300,6 +1327,9 @@
     "ymdk_np21": {
         "target": "ymdk/np21"
     },
+    "yugo_m/model_m_101": {
+        "target": "ibm/model_m/yugo_m"
+    },
     "yurei": {
         "target": "kkatano/yurei"
     },

diff --git a/docs/ChangeLog/20230528.md b/docs/ChangeLog/20230528.md
diff --git a/docs/ChangeLog/20230528/PR20584.md b/docs/ChangeLog/20230528/PR20584.md
diff --git a/docs/_summary.md b/docs/_summary.md
@@ -139,7 +139,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20230226.md "QMK v0.20.0 - 2023 Feb 26")
+    * [Most Recent ChangeLog](ChangeLog/20230528.md "QMK v0.21.0 - 2023 May 28")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development

diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
@@ -10,27 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
 
 ## What has been included in past Breaking Changes?
 
+* [2023 May 28](ChangeLog/20230528.md)
 * [2023 Feb 26](ChangeLog/20230226.md)
 * [2022 Nov 26](ChangeLog/20221126.md)
-* [2022 Aug 27](ChangeLog/20220827.md)
-* [2022 May 28](ChangeLog/20220528.md)
-* [2022 Feb 26](ChangeLog/20220226.md)
 * [Older Breaking Changes](breaking_changes_history.md)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for May 28, 2023.
+The next Breaking Change is scheduled for August 27, 2023.
 
 ### Important Dates
 
-* 2023 Feb 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2023 Apr 30 - `develop` closed to new PRs.
-* 2023 Apr 30 - Call for testers.
-* 2023 May 14 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2023 May 21 - `develop` is locked, only critical bugfix PRs merged.
-* 2023 May 26 - `master` is locked, no PRs merged.
-* 2023 May 28 - Merge `develop` to `master`.
-* 2023 May 28 - `master` is unlocked. PRs can be merged again.
+* 2023 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2023 Jul 30 - `develop` closed to new PRs.
+* 2023 Jul 30 - Call for testers.
+* 2023 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2023 Aug 20 - `develop` is locked, only critical bugfix PRs merged.
+* 2023 Aug 25 - `master` is locked, no PRs merged.
+* 2023 Aug 27 - Merge `develop` to `master`.
+* 2023 Aug 27 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 
@@ -50,7 +48,7 @@ Criteria for acceptance:
 
 Strongly suggested:
 
-* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20221126`.
+* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20230827`.
     * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID.
     * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
 
@@ -121,6 +119,7 @@ This happens immediately after the previous `develop` branch is merged to `maste
     * `git commit -m 'Branch point for <DATE> Breaking Change'`
     * `git tag breakpoint_<YYYY>_<MM>_<DD>`
     * `git push upstream breakpoint_<YYYY>_<MM>_<DD>`
+    * `git push upstream develop`
 
 * All submodules under `lib` now need to be checked against their QMK-based forks:
     * `git submodule foreach git log -n1`

diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2023 May 28](ChangeLog/20230528.md) - version 0.21.0
 * [2023 Feb 26](ChangeLog/20230226.md) - version 0.20.0
 * [2022 Nov 26](ChangeLog/20221126.md) - version 0.19.0
 * [2022 Aug 27](ChangeLog/20220827.md) - version 0.18.0

diff --git a/docs/breaking_changes_instructions.md b/docs/breaking_changes_instructions.md
@@ -23,14 +23,6 @@ If it is determined that your submission is a breaking change, there are a few t
 
 If you are contributing core code, and the only reason it needs to go through breaking changes is that you are updating keymaps to match your change, consider whether you can submit your feature in a way that the old keymaps continue to work. Then submit a separate PR that goes through the breaking changes process to remove the old code.
 
-### Contribute a ChangeLog Entry
-
-We require submissions that go through the Breaking Change process to include a changelog entry. The entry should be a short summary of the changes your pull request makes &ndash; [each section here started as a changelog](ChangeLog/20190830.md "n.b. This should link to the 2019 Aug 30 Breaking Changes doc  - @noroadsleft").
-
-Your changelog should be located at `docs/ChangeLog/YYYYMMDD/PR####.md`, where `YYYYMMDD` is the date on which QMK's breaking change branch &ndash; usually named `develop` &ndash; will be merged into the `master` branch, and `####` is the number of your pull request.
-
-If your submission requires action on the part of users, your changelog should instruct users what action(s) must be taken, or link to a location that does so.
-
 ### Document Your Changes
 
 Understanding the purpose for your submission, and possible implications or actions it will require can make the review process more straightforward. A changelog may suffice for this purpose, but more extensive changes may require a level of detail that is ill-suited for a changelog.

diff --git a/docs/feature_space_cadet.md b/docs/feature_space_cadet.md
@@ -1,6 +1,6 @@
 # Space Cadet: The Future, Built In
 
-Steve Losh described the [Space Cadet Shift](https://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds, and now even cooler supporting Control and Alt as well!
+Steve Losh described the [Space Cadet Shift](https://web.archive.org/web/20230330090938/https://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds, and now even cooler supporting Control and Alt as well!
 
 ## Usage
 

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
@@ -62,7 +62,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
         - valid maintainer
         - valid USB VID/PID and device version
         - displays correctly in Configurator (press Ctrl+Shift+I to preview local file, turn on fast input to verify ordering)
-        - `layout` definitions should include matrix positions, so that `LAYOUT` macros can be generated at build time
+        - `layout` definitions must include matrix positions, so that `LAYOUT` macros can be generated at build time
             - should use standard definitions if applicable
             - use the Community Layout macro names where they apply (preferred above `LAYOUT`/`LAYOUT_all`)
             - If the keyboard only has a single electrical/switch layout:
@@ -124,7 +124,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - hardware that's enabled at the keyboard level and requires configuration such as OLED displays or encoders should have basic functionality implemented here
 - `<keyboard>.h`
     - `#include "quantum.h"` appears at the top
-    - `LAYOUT` macros should be moved to `info.json`
+    - `LAYOUT` macros are no longer accepted and should instead be moved to `info.json`
 - keymap `config.h`
     - no duplication of `rules.mk` or `config.h` from keyboard
 - `keymaps/default/keymap.c`

diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
@@ -104,11 +104,11 @@ void IS31FL3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
 }
 
 bool IS31FL3741_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
-    // Assume PG1 is already selected
+    // Assume PG0 is already selected
 
     for (int i = 0; i < 342; i += 18) {
         if (i == 180) {
-            // unlock the command register and select PG2
+            // unlock the command register and select PG1
             IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
             IS31FL3741_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM1);
         }
@@ -246,7 +246,7 @@ void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index) {
 
         // CS1_SW1 to CS30_SW6 are on PG2
         for (int i = CS1_SW1; i <= CS30_SW6; ++i) {
-            IS31FL3741_write_register(addr, i, g_scaling_registers[0][i]);
+            IS31FL3741_write_register(addr, i, g_scaling_registers[index][i]);
         }
 
         // unlock the command register and select PG3
@@ -255,7 +255,7 @@ void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index) {
 
         // CS1_SW7 to CS39_SW9 are on PG3
         for (int i = CS1_SW7; i <= CS39_SW9; ++i) {
-            IS31FL3741_write_register(addr, i - CS1_SW7, g_scaling_registers[0][i]);
+            IS31FL3741_write_register(addr, i - CS1_SW7, g_scaling_registers[index][i]);
         }
 
         g_scaling_registers_update_required[index] = false;

diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
@@ -19,7 +19,6 @@
 
 /* underglow */
 #define RGBLED_NUM 24
-#define RGBLIGHT_LIMIT_VAL 185 // limit max I to 400mA 
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
@@ -8,5 +8,8 @@
     },
     "ws2812": {
         "pin": "B6"
+    },
+    "rgblight": {
+        "max_brightness": 185
     }
 }
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10            // The number of steps to cycle through the hue by
 #define RGBLIGHT_SAT_STEP 17            // The number of steps to increment the saturation by
 #define RGBLIGHT_VAL_STEP 17            // The number of steps to increment the brightness by
-#define RGBLIGHT_LIMIT_VAL 255          // Max brightness level
 #define RGBLIGHT_SLEEP                  // RGB will switch off when host goes to sleep
 
 #define RGBLIGHT_EFFECT_BREATHING       // Enable all additional RGB animation modes

diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
@@ -12,7 +12,6 @@
 
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGBLIGHT_LIMIT_VAL 150
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150

diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define RGBLIGHT_HUE_STEP 8
 #        define RGBLIGHT_SAT_STEP 8
 #        define RGBLIGHT_VAL_STEP 8
-#        define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #        define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #        define RGBLIGHT_EFFECT_BREATHING
 #        define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
@@ -21,7 +21,6 @@
 
 #define RGB_MATRIX_LED_COUNT 20
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#    define RGBLIGHT_LIMIT_VAL 255
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255

diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== choose animations ==*/
 #    define RGBLIGHT_EFFECT_BREATHING

diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
-   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */

diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
 #    define RGBLIGHT_SLEEP       /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE 1
 
 #define RGBLED_NUM 16
-#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD