mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5322 from gsimon75/sm16716_rgb_order 

sm16716: added config option for custom rgb order
This commit is contained in:
Theo Arends 2019-02-24 11:31:09 +01:00 committed by GitHub
parent 5003227139 38b81302e3
commit ff68b20148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/my_user_config.h
View File

@ -421,6 +421,7 @@
// #define USE_ALECTO_V2 // Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 weather stations using 868MHz RF sensor receiver (+1k7 code) // #define USE_ALECTO_V2 // Add support for decoding Alecto V2 sensors like ACH2010, WS3000 and DKW2012 weather stations using 868MHz RF sensor receiver (+1k7 code)
#define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code)
#define USE_SM16716_RGB_ORDER SM16716_RGB // SM16716 RGB order (SM16716_RGB, SM16716_RBG, SM16716_GRB, SM16716_GBR, SM16716_BRG, SM16716_BGR)
/*********************************************************************************************\ /*********************************************************************************************\
* Debug features are only supported in development branch * Debug features are only supported in development branch

7
sonoff/sonoff.h
View File

@ -171,6 +171,13 @@ typedef unsigned long power_t; // Power (Relay) type
#define LT_SM16716 16 // Lights that use SM16716 will have this bit set in light_type #define LT_SM16716 16 // Lights that use SM16716 will have this bit set in light_type
#define SM16716_RGB 0
#define SM16716_RBG 1
#define SM16716_GRB 2
#define SM16716_GBR 3
#define SM16716_BRG 4
#define SM16716_BGR 5
#define MQTT_PUBSUBCLIENT 1 // Mqtt PubSubClient library #define MQTT_PUBSUBCLIENT 1 // Mqtt PubSubClient library
#define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino - soon obsolete #define MQTT_TASMOTAMQTT 2 // Mqtt TasmotaMqtt library based on esp-mqtt-arduino - soon obsolete
#define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf - obsolete but define is present for debugging purposes #define MQTT_ESPMQTTARDUINO 3 // Mqtt esp-mqtt-arduino library by Ingo Randolf - obsolete but define is present for debugging purposes

30
sonoff/xdrv_04_light.ino
View File

@ -397,6 +397,12 @@ void SM16716_SendByte(uint8_t v)
} }
} }
void SM16716_SendRGB(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b) {
SM16716_SendByte(duty_r);
SM16716_SendByte(duty_g);
SM16716_SendByte(duty_b);
}
void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b) void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
{ {
if (sm16716_pin_sel < 99) { if (sm16716_pin_sel < 99) {
@ -432,17 +438,29 @@ void SM16716_Update(uint8_t duty_r, uint8_t duty_g, uint8_t duty_b)
// send start bit // send start bit
SM16716_SendBit(1); SM16716_SendBit(1);
// send 24-bit rgb data // send 24-bit rgb data
SM16716_SendByte(duty_r); #if USE_SM16716_RGB_ORDER == SM16716_RGB
SM16716_SendByte(duty_g); SM16716_SendRGB(duty_r, duty_g, duty_b);
SM16716_SendByte(duty_b); #elif USE_SM16716_RGB_ORDER == SM16716_RBG
SM16716_SendRGB(duty_r, duty_b, duty_g);
#elif USE_SM16716_RGB_ORDER == SM16716_GRB
SM16716_SendRGB(duty_g, duty_r, duty_b);
#elif USE_SM16716_RGB_ORDER == SM16716_GBR
SM16716_SendRGB(duty_g, duty_b, duty_r);
#elif USE_SM16716_RGB_ORDER == SM16716_BRG
SM16716_SendRGB(duty_b, duty_r, duty_g);
#elif USE_SM16716_RGB_ORDER == SM16716_BGR
SM16716_SendRGB(duty_b, duty_g, duty_r);
#else
// fall back to RGB
SM16716_SendRGB(duty_r, duty_g, duty_b);
#endif
// send a 'do it' pulse // send a 'do it' pulse
// (if multiple chips are chained, each one processes the 1st '1rgb' 25-bit block and // (if multiple chips are chained, each one processes the 1st '1rgb' 25-bit block and
// passes on the rest, right until the one starting with 0) // passes on the rest, right until the one starting with 0)
//SM16716_Init(); //SM16716_Init();
SM16716_SendBit(0); SM16716_SendBit(0);
SM16716_SendByte(0); SM16716_SendRGB(0, 0, 0);
SM16716_SendByte(0);
SM16716_SendByte(0);
} }
bool SM16716_ModuleSelected(void) bool SM16716_ModuleSelected(void)