jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-03 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor light driver saving code space

Browse Source 
Refactor light driver saving code  space
This commit is contained in:
Theo Arends 2019-08-17 13:17:30 +02:00
parent b9302d9ab9
commit 38c6254833
8 changed files with 325 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sonoff/sonoff.h
View File

@ -266,8 +266,6 @@ const uint8_t kDefaultRfCode[9] PROGMEM = { 0x21, 0x16, 0x01, 0x0E, 0x03, 0x48,
* Extern global variables * Extern global variables
\*********************************************************************************************/ \*********************************************************************************************/
extern uint8_t light_device; // Light device number
extern power_t light_power; // Light power
extern uint8_t rotary_changed; // Rotary switch changed extern uint8_t rotary_changed; // Rotary switch changed
#endif // _SONOFF_H_ #endif // _SONOFF_H_

4
sonoff/sonoff.ino
View File

@ -631,8 +631,8 @@ void MqttShowState(void)
for (uint32_t i = 1; i <= devices_present; i++) { for (uint32_t i = 1; i <= devices_present; i++) {
#ifdef USE_LIGHT #ifdef USE_LIGHT
if ((light_device) && (i >= light_device)) { if ((LightDevice()) && (i >= LightDevice())) {
if (i == light_device) { LightState(1); } // call it only once if (i == LightDevice()) { LightState(1); } // call it only once
} else { } else {
#endif #endif
ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable), GetStateText(bitRead(power, i-1))); ResponseAppend_P(PSTR(",\"%s\":\"%s\""), GetPowerDevice(stemp1, i, sizeof(stemp1), Settings.flag.device_index_enable), GetStateText(bitRead(power, i-1)));

2
sonoff/support_button.ino
View File

@ -237,7 +237,7 @@ void ButtonHandler(void)
} }
} }
#ifdef USE_LIGHT #ifdef USE_LIGHT
if ((MI_DESK_LAMP == my_module_type) && (button_index == 0) && (rotary_changed) && (light_power)) { if ((MI_DESK_LAMP == my_module_type) && (button_index == 0) && (rotary_changed) && (LightPower())) {
rotary_changed = 0; // Color temp changed, no need to turn of the light rotary_changed = 0; // Color temp changed, no need to turn of the light
} else { } else {
#endif #endif

2
sonoff/support_rotary.ino
View File

@ -68,7 +68,7 @@ void update_rotary(void) ICACHE_RAM_ATTR;
void update_rotary(void) void update_rotary(void)
{ {
if (MI_DESK_LAMP == my_module_type){ if (MI_DESK_LAMP == my_module_type){
if (light_power) { if (LightPower()) {
update_position(); update_position();
} }
} }

601
sonoff/xdrv_04_light.ino
View File

File diff suppressed because it is too large Load Diff

6
sonoff/xdrv_12_home_assistant.ino
View File

@ -250,7 +250,7 @@ void HAssAnnounceRelayLight(void)
strncpy_P(stemp3, Settings.flag.not_power_linked?PSTR("last"):PSTR("brightness"), sizeof(stemp3)); strncpy_P(stemp3, Settings.flag.not_power_linked?PSTR("last"):PSTR("brightness"), sizeof(stemp3));
TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3); TryResponseAppend_P(HASS_DISCOVER_LIGHT_DIMMER, brightness_command_topic, state_topic, stemp3);
if (light_subtype >= LST_RGB) { if (Light.subtype >= LST_RGB) {
char *rgb_command_topic = stemp1; char *rgb_command_topic = stemp1;
GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR); GetTopic_P(rgb_command_topic, CMND, mqtt_topic, D_CMND_COLOR);
@ -263,14 +263,14 @@ void HAssAnnounceRelayLight(void)
TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic); TryResponseAppend_P(HASS_DISCOVER_LIGHT_SCHEME, effect_command_topic, state_topic);
} }
if (LST_RGBW == light_subtype) { if (LST_RGBW == Light.subtype) {
char *white_temp_command_topic = stemp1; char *white_temp_command_topic = stemp1;
GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE); GetTopic_P(white_temp_command_topic, CMND, mqtt_topic, D_CMND_WHITE);
Shorten(&white_temp_command_topic, prefix); Shorten(&white_temp_command_topic, prefix);
TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic); TryResponseAppend_P(HASS_DISCOVER_LIGHT_WHITE, white_temp_command_topic, state_topic);
} }
if ((LST_COLDWARM == light_subtype) || (LST_RGBWC == light_subtype)) { if ((LST_COLDWARM == Light.subtype) || (LST_RGBWC == Light.subtype)) {
char *color_temp_command_topic = stemp1; char *color_temp_command_topic = stemp1;
GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE); GetTopic_P(color_temp_command_topic, CMND, mqtt_topic, D_CMND_COLORTEMPERATURE);

16
sonoff/xdrv_20_hue.ino
View File

@ -245,11 +245,11 @@ char prev_y_str[24] = "\0";
uint8_t getLocalLightSubtype(uint8_t device) { uint8_t getLocalLightSubtype(uint8_t device) {
if (light_type) { if (light_type) {
if (device >= light_device) { if (device >= Light.device) {
if (Settings.flag3.pwm_multi_channels) { if (Settings.flag3.pwm_multi_channels) {
return LST_SINGLE; // If SetOption68, each channel acts like a dimmer return LST_SINGLE; // If SetOption68, each channel acts like a dimmer
} else { } else {
return light_subtype; // the actual light return Light.subtype; // the actual light
} }
} else { } else {
return LST_NONE; // relays return LST_NONE; // relays
@ -268,7 +268,7 @@ void HueLightStatus1(uint8_t device, String *response)
uint8_t sat = 0; uint8_t sat = 0;
uint8_t bri = 254; uint8_t bri = 254;
uint32_t echo_gen = findEchoGeneration(); // 1 for 1st gen =+ Echo Dot 2nd gen, 2 for 2nd gen and above uint32_t echo_gen = findEchoGeneration(); // 1 for 1st gen =+ Echo Dot 2nd gen, 2 for 2nd gen and above
// local_light_subtype simulates the light_subtype for 'device' // local_light_subtype simulates the Light.subtype for 'device'
// For relays LST_NONE, for dimmers LST_SINGLE // For relays LST_NONE, for dimmers LST_SINGLE
uint8_t local_light_subtype = getLocalLightSubtype(device); uint8_t local_light_subtype = getLocalLightSubtype(device);
@ -458,7 +458,7 @@ void HueLights(String *path)
bool on = false; bool on = false;
bool change = false; // need to change a parameter to the light bool change = false; // need to change a parameter to the light
uint8_t device = 1; uint8_t device = 1;
uint8_t local_light_subtype = light_subtype; uint8_t local_light_subtype = Light.subtype;
uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present; uint8_t maxhue = (devices_present > MAX_HUE_DEVICES) ? MAX_HUE_DEVICES : devices_present;
path->remove(0,path->indexOf("/lights")); // Remove until /lights path->remove(0,path->indexOf("/lights")); // Remove until /lights
@ -535,7 +535,7 @@ void HueLights(String *path)
response.replace("{id", String(device)); response.replace("{id", String(device));
response.replace("{cm", "bri"); response.replace("{cm", "bri");
response.replace("{re", String(tmp)); response.replace("{re", String(tmp));
if (LST_SINGLE <= light_subtype) { if (LST_SINGLE <= Light.subtype) {
change = true; change = true;
} }
resp = true; resp = true;
@ -576,7 +576,7 @@ void HueLights(String *path)
response.replace("{id", String(device)); response.replace("{id", String(device));
response.replace("{cm", "hue"); response.replace("{cm", "hue");
response.replace("{re", String(tmp)); response.replace("{re", String(tmp));
if (LST_RGB <= light_subtype) { if (LST_RGB <= Light.subtype) {
g_gotct = false; g_gotct = false;
change = true; change = true;
} }
@ -592,7 +592,7 @@ void HueLights(String *path)
response.replace("{id", String(device)); response.replace("{id", String(device));
response.replace("{cm", "sat"); response.replace("{cm", "sat");
response.replace("{re", String(tmp)); response.replace("{re", String(tmp));
if (LST_RGB <= light_subtype) { if (LST_RGB <= Light.subtype) {
g_gotct = false; g_gotct = false;
change = true; change = true;
} }
@ -606,7 +606,7 @@ void HueLights(String *path)
response.replace("{id", String(device)); response.replace("{id", String(device));
response.replace("{cm", "ct"); response.replace("{cm", "ct");
response.replace("{re", String(ct)); response.replace("{re", String(ct));
if ((LST_COLDWARM == light_subtype) || (LST_RGBW <= light_subtype)) { if ((LST_COLDWARM == Light.subtype) || (LST_RGBW <= Light.subtype)) {
g_gotct = true; g_gotct = true;
change = true; change = true;
} }

12
sonoff/xplg_ws2812.ino
View File

@ -222,7 +222,7 @@ void Ws2812Gradient(uint32_t schemenr)
uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat); uint32_t range = (uint32_t)ceil((float)Settings.light_pixels / (float)repeat);
uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1)); uint32_t gradRange = (uint32_t)ceil((float)range / (float)(scheme.count - 1));
uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10); uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
uint32_t offset = speed > 0 ? strip_timer_counter / speed : 0; uint32_t offset = speed > 0 ? Light.strip_timer_counter / speed : 0;
WsColor oldColor, currentColor; WsColor oldColor, currentColor;
Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset); Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset);
@ -233,9 +233,9 @@ void Ws2812Gradient(uint32_t schemenr)
} }
if (Settings.light_speed > 0) { if (Settings.light_speed > 0) {
// Blend old and current color based on time for smooth movement. // Blend old and current color based on time for smooth movement.
c.R = map(strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red); c.R = map(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red);
c.G = map(strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green); c.G = map(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green);
c.B = map(strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue); c.B = map(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue);
} }
else { else {
// No animation, just use the current color. // No animation, just use the current color.
@ -269,7 +269,7 @@ void Ws2812Bars(uint32_t schemenr)
if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; } if (kWidth[Settings.light_width] > maxSize) { maxSize = 0; }
uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10); uint32_t speed = ((Settings.light_speed * 2) -1) * (STATES / 10);
uint32_t offset = (speed > 0) ? strip_timer_counter / speed : 0; uint32_t offset = (speed > 0) ? Light.strip_timer_counter / speed : 0;
WsColor mcolor[scheme.count]; WsColor mcolor[scheme.count];
memcpy(mcolor, scheme.colors, sizeof(mcolor)); memcpy(mcolor, scheme.colors, sizeof(mcolor));
@ -366,7 +366,7 @@ char* Ws2812GetColor(uint32_t led, char* scolor)
sl_ledcolor[1] = lcolor.G; sl_ledcolor[1] = lcolor.G;
sl_ledcolor[2] = lcolor.B; sl_ledcolor[2] = lcolor.B;
scolor[0] = '\0'; scolor[0] = '\0';
for (uint32_t i = 0; i < light_subtype; i++) { for (uint32_t i = 0; i < Light.subtype; i++) {
if (Settings.flag.decimal_text) { if (Settings.flag.decimal_text) {
snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]); snprintf_P(scolor, 25, PSTR("%s%s%d"), scolor, (i > 0) ? "," : "", sl_ledcolor[i]);
} else { } else {