Merge remote-tracking branch 'origin/master' into develop
Play Keyboard Helen 80: fix matrix mapping (#11585)
Merge remote-tracking branch 'origin/master' into develop
Fix VENDOR_ID for ymd67 (#11838)
Remove FAUXCLICKY feature (deprecated) (#11829)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add Splitty keyboard (#11613)
Merge remote-tracking branch 'origin/master' into develop
Simplify NIBBLE encoder code and clean up keymaps (#11808) * Simplify encoder code and clean up keymaps. -Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps. -Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build. -Move layer names to enum * Change encoder_update_kb to encoder_update_user per PR feedback
Merge remote-tracking branch 'origin/master' into develop
ws2812: Fix number of nops for AVR at 8 MHz (#9559) * ws2812: Fix number of nops for AVR at 8 MHz When trying to calculate the number of nops for AVR running at 8 MHz, the value of `w3` is expected to be negative; however, because `F_CPU` is defined in tmk_core/avr.mk with the `UL` suffix, the preprocessor performs its calculations using `unsigned long`, getting a very large positive number instead of the expected negative number; this then results in generating code with a huge number of nops. Fix the broken calculations by performing a comparison before subtraction, so that the unsigned number wraparound does not occur. The keyboard which triggers the problem is `handwired/promethium`; the buggy code silently compiles, but the resulting timings would be completely wrong. * ws2812: Clean up the code after the 8 MHz fix Remove old code which was unsuccessfully trying to clamp negative w1, w2 and w3 values to 0, and set w1_nops, w2_nops and w3_nops directly.
remove deprecated qmk json-keymap (#11823)
Merge remote-tracking branch 'origin/master' into develop
Fix RGBLIGHT_LIMIT_VAL typo (#11826)
Merge remote-tracking branch 'origin/master' into develop
Migrate some tmk_core files to quantum (#11791) * Migrate some tmk_core files to quantum * Fix build errors
Merge remote-tracking branch 'origin/master' into develop
via support for bat43 (#11729) * via support for bat43 * add adjust layer for via
Merge remote-tracking branch 'origin/master' into develop
[Update] Allow APM32 on TrinityXTtkl (#11715) * amp32 initial change * fix spacing