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

Merge pull request #11988 from jamesturton/add-voltage-mon-shelly-dimmer-2 

Add support for voltage and current monitoring when using Shelly dimmer 2 hardware
This commit is contained in:
Theo Arends 2021-05-02 16:28:52 +02:00 committed by GitHub
parent 5b94f4450a 9d304b96b2
commit 6c46278778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/xdrv_45_shelly_dimmer.ino
View File

@ -100,6 +100,7 @@ struct SHD
uint32_t last_power_check = 0; // Time when last power was checked uint32_t last_power_check = 0; // Time when last power was checked
#endif // USE_ENERGY_SENSOR #endif // USE_ENERGY_SENSOR
bool present = false; bool present = false;
uint8_t hw_version = 0; // Dimmer 1 = 1 Dimmer 2 = 2
} Shd; } Shd;
/*********************************************************************************************\ /*********************************************************************************************\
@ -483,8 +484,9 @@ bool ShdPacketProcess(void)
case SHD_POLL_CMD: case SHD_POLL_CMD:
{ {
// 1 when returning fade_rate, 0 when returning wattage, brightness? // 1 when returning fade_rate, 0 when returning wattage, brightness?
uint16_t unknown_0 = Shd.buffer[pos + 1] << 8 | uint8_t hw_version_raw = Shd.buffer[pos + 0];
Shd.buffer[pos + 0];
uint16_t unknown_0 = Shd.buffer[pos + 1];
uint16_t brightness = Shd.buffer[pos + 3] << 8 | uint16_t brightness = Shd.buffer[pos + 3] << 8 |
Shd.buffer[pos + 2]; Shd.buffer[pos + 2];
@ -518,7 +520,17 @@ bool ShdPacketProcess(void)
if (current_raw > 0) if (current_raw > 0)
current = 1448 / (float)current_raw; current = 1448 / (float)current_raw;
if (hw_version_raw == 0)
Shd.hw_version = 1;
else if (hw_version_raw == 1)
Shd.hw_version = 2;
#ifdef USE_ENERGY_SENSOR #ifdef USE_ENERGY_SENSOR
if (Shd.hw_version == 2)
{
Energy.current_available = true;
Energy.voltage_available = true;
}
Energy.active_power[0] = wattage; Energy.active_power[0] = wattage;
Energy.voltage[0] = voltage; Energy.voltage[0] = voltage;
Energy.current[0] = current; Energy.current[0] = current;
@ -539,7 +551,7 @@ bool ShdPacketProcess(void)
float kWhused = (float)Energy.active_power[0] * (Rtc.utc_time - Shd.last_power_check) / 36; float kWhused = (float)Energy.active_power[0] * (Rtc.utc_time - Shd.last_power_check) / 36;
#ifdef SHELLY_DIMMER_DEBUG #ifdef SHELLY_DIMMER_DEBUG
AddLog(LOG_LEVEL_DEBUG, PSTR(SHD_LOGNAME "Adding %i mWh to todays usage from %lu to %lu"), (int)(kWhused * 10), Shd.last_power_check, Rtc.utc_time); AddLog(LOG_LEVEL_DEBUG, PSTR(SHD_LOGNAME "Adding %i mWh to todays usage from %lu to %lu"), (int)(kWhused * 10), Shd.last_power_check, Rtc.utc_time);
#endif // USE_ENERGY_SENSOR #endif // SHELLY_DIMMER_DEBUG
Energy.kWhtoday += kWhused; Energy.kWhtoday += kWhused;
EnergyUpdateToday(); EnergyUpdateToday();
} }
@ -547,7 +559,7 @@ bool ShdPacketProcess(void)
#endif // USE_ENERGY_SENSOR #endif // USE_ENERGY_SENSOR
#ifdef SHELLY_DIMMER_DEBUG #ifdef SHELLY_DIMMER_DEBUG
AddLog(LOG_LEVEL_DEBUG, PSTR(SHD_LOGNAME "ShdPacketProcess: Brightness:%d Power:%lu Voltage:%lu Current:%lu Fade:%d"), brightness, wattage_raw, voltage_raw, current_raw, fade_rate); AddLog(LOG_LEVEL_DEBUG, PSTR(SHD_LOGNAME "ShdPacketProcess: Dimmer %d Brightness:%d Power:%lu Voltage:%lu Current:%lu Fade:%d"), Shd.hw_version, brightness, wattage_raw, voltage_raw, current_raw, fade_rate);
#endif // SHELLY_DIMMER_DEBUG #endif // SHELLY_DIMMER_DEBUG
Shd.dimmer.brightness = brightness; Shd.dimmer.brightness = brightness;
Shd.dimmer.power = wattage_raw; Shd.dimmer.power = wattage_raw;
@ -840,6 +852,7 @@ bool Xnrg31(uint8_t function) {
Energy.current_available = false; Energy.current_available = false;
Energy.voltage_available = false; Energy.voltage_available = false;
#endif // SHELLY_VOLTAGE_MON #endif // SHELLY_VOLTAGE_MON
Energy.use_overtemp = true; // Use global temperature for overtemp detection
TasmotaGlobal.energy_driver = XNRG_31; TasmotaGlobal.energy_driver = XNRG_31;
} }
} }