Merge remote-tracking branch 'origin/master' into develop
Revert back to the old matrix (Take the blue pill) (#10568)
* revert back to the old matrix.
* apparently I can't count, J is the 19th not the 20th column
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master' into develop
Bocaj - Third Annual Refactor (Redux) (#10295)
* Reset everything to upstream, reapply Bocaj changes
* Bocaj - address PR comments
* Just in time changes
* Bocaj - Several adjustments after using the layout for a while
gcc 10 compatibility for Drop alt (#9485)
* Split dmac_desc declaration and definition
According to the official documentation[1] gcc 10 is more strict about
correct extern usage.
I've had to move the definition of dmac_desc and dmac_desc_wb from
i2c_master.h to the corresponding .c file. This could be an issue if
anyone includes the i2c_master.h file without liking with the object
file.
[1]: https://gcc.gnu.org/gcc-10/porting_to.html
* Remove the keymap_config definition from keymaps
The keymap_config def was conflicting with the one found in
tmk_core/common/magic.c. Declaring it extern in magic.c breaks a bunch
of keyboard that rely on that declaration (like the ergodox). Instead
I've removed the one found in the keymap.c of the massdrop alt.
The same change will have to be made to other keyboards.
Merge remote-tracking branch 'origin/master' into develop
Update is31fl3731-simple (#7610)
* update simple
* Update is31fl3731-simple.c
Merge remote-tracking branch 'origin/master' into develop
add definition WS2812_BYTE_ORDER to fix RGB LED issues (#10184)
* add define for WS2812B-2020 to fix RGB issues
* update driver doc
* add WS2812_BYTE_ORDER definition to correct RGB byte issues
* add definition variable thing
* update per PR request
* update per PR reqs
* update per PR request
* inital changes
* move defines to color.h and add rgbw incase
* Update docs/ws2812_driver.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: hineybush <hineybushkeyboards@gmail.com>
Co-authored-by: Xelus22 <preyas22@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Add definitions for RGB off/black. (#11132)
Merge remote-tracking branch 'origin/master' into develop
Added OLED Initialized checks (#11129)
Merge remote-tracking branch 'origin/master' into develop
Fix error handling in SPI master. (#11122)
Co-authored-by: Dimitris Papavasiliou <dpapavas@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
Initial Nightingale Studios Hailey support (#11116)
* Initial Nightingale Studios Hailey support
* Add info.json
* Fix bootmagic jump
* Add missing header
* Update default keymap
Merge remote-tracking branch 'origin/master' into develop