diff options
| author | Daniel Prilik <danielprilik@gmail.com> | 2019-04-04 03:30:47 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-04-04 03:30:47 +0200 |
| commit | 763b26cdb98c2702f7b2f8de239d4edba0fa4065 (patch) | |
| tree | a99e15e1cb9be30eb5786e5ea1d3de809339b87b /tmk_core/protocol/arm_atsam/i2c_master.c | |
| parent | 63177760deaf23bb1f676974cecf211676285604 (diff) | |
| download | qmk_firmware-763b26cdb98c2702f7b2f8de239d4edba0fa4065.tar.gz qmk_firmware-763b26cdb98c2702f7b2f8de239d4edba0fa4065.tar.xz | |
RGB Matrix support for Massdrop CTRL/ALT (#5328)
* port Massdrop CTRL/ALT to use RGB Matrix
Co-authored-by: Matt Schneeberger <helluvamatt@gmail.com>
* Massdrop lighting support working
This commit is to get the Massdrop lighting code working again through use of the compilation define USE_MASSDROP_CONFIGURATOR added to a keymap's rules.mk.
Added keymaps for both CTRL and ALT named default_md and mac_md. These should be used if the Massdrop style lighting is desired.
* Updating config based on testing results with patrickmt & compile errors
* Updates for PR5328
For CTRL and ALT:
Moved location of new RGB Matrix macros from config_led.h to config.h.
Added RGB_MATRIX_LED_FLUSH_LIMIT (time between flushes) to config.h for correct LED driver update timing.
Re-added missing breathing code for when Massdrop configurator mode is defined.
* remove prilik keymap form PR
Diffstat (limited to 'tmk_core/protocol/arm_atsam/i2c_master.c')
| -rw-r--r-- | tmk_core/protocol/arm_atsam/i2c_master.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/arm_atsam/i2c_master.c b/tmk_core/protocol/arm_atsam/i2c_master.c index d91a851f3..1741d9ac5 100644 --- a/tmk_core/protocol/arm_atsam/i2c_master.c +++ b/tmk_core/protocol/arm_atsam/i2c_master.c @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "arm_atsam_protocol.h" -#ifndef MD_BOOTLOADER +#if !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE) #include <string.h> @@ -37,7 +37,7 @@ static uint8_t dma_sendbuf[I2C_DMA_MAX_SEND]; //Data being written to I2C volatile uint8_t i2c_led_q_running; -#endif //MD_BOOTLOADER +#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE) void i2c0_init(void) { @@ -112,7 +112,7 @@ void i2c0_stop(void) } } -#ifndef MD_BOOTLOADER +#if !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE) void i2c1_init(void) { DBGC(DC_I2C1_INIT_BEGIN); @@ -583,4 +583,4 @@ uint8_t i2c_led_q_run(void) return 1; } -#endif //MD_BOOTLOADER +#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE) |