0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Support RGBW on PCA9632 (#20455)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Jan Krajdl 2020-12-22 15:27:14 +01:00 committed by GitHub
parent c559fc8227
commit de9c0eda36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/leds/leds.h
View file

@ -34,7 +34,7 @@
#endif #endif
// A white component can be passed // A white component can be passed
#if EITHER(RGBW_LED, NEOPIXEL_LED) #if ANY(RGBW_LED, NEOPIXEL_LED, PCA9632_RGBW)
#define HAS_WHITE_LED 1 #define HAS_WHITE_LED 1
#endif #endif

46
Marlin/src/feature/leds/pca9632.cpp
View file

@ -58,7 +58,7 @@
#define PCA9632_AUTOGLO 0xC0 #define PCA9632_AUTOGLO 0xC0
#define PCA9632_AUTOGI 0xE0 #define PCA9632_AUTOGI 0xE0
// Red=LED0 Green=LED1 Blue=LED2 // Red=LED0 Green=LED1 Blue=LED2 White=LED3
#ifndef PCA9632_RED #ifndef PCA9632_RED
#define PCA9632_RED 0x00 #define PCA9632_RED 0x00
#endif #endif
@ -68,9 +68,12 @@
#ifndef PCA9632_BLU #ifndef PCA9632_BLU
#define PCA9632_BLU 0x04 #define PCA9632_BLU 0x04
#endif #endif
#if HAS_WHITE_LED && !defined(PCA9632_WHT)
#define PCA9632_WHT 0x06
#endif
// If any of the color indexes are greater than 0x04 they can't use auto increment // If any of the color indexes are greater than 0x04 they can't use auto increment
#if !defined(PCA9632_NO_AUTO_INC) && (PCA9632_RED > 0x04 || PCA9632_GRN > 0x04 || PCA9632_BLU > 0x04) #if !defined(PCA9632_NO_AUTO_INC) && (PCA9632_RED > 0x04 || PCA9632_GRN > 0x04 || PCA9632_BLU > 0x04 || PCA9632_WHT > 0x04)
#define PCA9632_NO_AUTO_INC #define PCA9632_NO_AUTO_INC
#endif #endif
@ -89,25 +92,28 @@ static void PCA9632_WriteRegister(const byte addr, const byte regadd, const byte
Wire.endTransmission(); Wire.endTransmission();
} }
static void PCA9632_WriteAllRegisters(const byte addr, const byte regadd, const byte vr, const byte vg, const byte vb) { static void PCA9632_WriteAllRegisters(const byte addr, const byte regadd, const byte vr, const byte vg, const byte vb
#if ENABLED(PCA9632_RGBW)
, const byte vw
#endif
) {
#if DISABLED(PCA9632_NO_AUTO_INC) #if DISABLED(PCA9632_NO_AUTO_INC)
uint8_t data[4], len = 4; uint8_t data[4];
data[0] = PCA9632_AUTO_IND | regadd; data[0] = PCA9632_AUTO_IND | regadd;
data[1 + (PCA9632_RED >> 1)] = vr; data[1 + (PCA9632_RED >> 1)] = vr;
data[1 + (PCA9632_GRN >> 1)] = vg; data[1 + (PCA9632_GRN >> 1)] = vg;
data[1 + (PCA9632_BLU >> 1)] = vb; data[1 + (PCA9632_BLU >> 1)] = vb;
Wire.beginTransmission(I2C_ADDRESS(addr));
Wire.write(data, sizeof(data));
Wire.endTransmission();
#else #else
uint8_t data[6], len = 6; PCA9632_WriteRegister(addr, regadd + (PCA9632_RED >> 1), vr);
data[0] = regadd + (PCA9632_RED >> 1); PCA9632_WriteRegister(addr, regadd + (PCA9632_GRN >> 1), vg);
data[1] = vr; PCA9632_WriteRegister(addr, regadd + (PCA9632_BLU >> 1), vb);
data[2] = regadd + (PCA9632_GRN >> 1); #if ENABLED(PCA9632_RGBW)
data[3] = vg; PCA9632_WriteRegister(addr, regadd + (PCA9632_WHT >> 1), vw);
data[4] = regadd + (PCA9632_BLU >> 1); #endif
data[5] = vb;
#endif #endif
Wire.beginTransmission(I2C_ADDRESS(addr));
Wire.write(data, len);
Wire.endTransmission();
} }
#if 0 #if 0
@ -130,9 +136,17 @@ void PCA9632_set_led_color(const LEDColor &color) {
const byte LEDOUT = (color.r ? LED_PWM << PCA9632_RED : 0) const byte LEDOUT = (color.r ? LED_PWM << PCA9632_RED : 0)
| (color.g ? LED_PWM << PCA9632_GRN : 0) | (color.g ? LED_PWM << PCA9632_GRN : 0)
| (color.b ? LED_PWM << PCA9632_BLU : 0); | (color.b ? LED_PWM << PCA9632_BLU : 0)
#if ENABLED(PCA9632_RGBW)
| (color.w ? LED_PWM << PCA9632_WHT : 0)
#endif
;
PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, color.r, color.g, color.b); PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, color.r, color.g, color.b
#if ENABLED(PCA9632_RGBW)
, color.w
#endif
);
PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_LEDOUT, LEDOUT); PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_LEDOUT, LEDOUT);
} }