jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor some energy drivers

Browse Source
This commit is contained in:
Theo Arends 2022-03-26 16:58:44 +01:00
parent 634c4343d6
commit e95456745f
5 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/xnrg_08_sdm120.ino
View File

@ -275,13 +275,11 @@ bool Xnrg08(uint8_t function)
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
#ifdef USE_ENERGY_COLUMN_GUI #ifdef USE_ENERGY_COLUMN_GUI
case FUNC_WEB_COL_SENSOR: case FUNC_WEB_COL_SENSOR:
Sdm220Show(0);
break;
#else // not USE_ENERGY_COLUMN_GUI #else // not USE_ENERGY_COLUMN_GUI
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
#endif // USE_ENERGY_COLUMN_GUI
Sdm220Show(0); Sdm220Show(0);
break; break;
#endif // USE_ENERGY_COLUMN_GUI
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
case FUNC_ENERGY_RESET: case FUNC_ENERGY_RESET:
Sdm220Reset(); Sdm220Reset();

4
tasmota/xnrg_13_fif_le01mr.ino
View File

@ -296,13 +296,11 @@ bool Xnrg13(uint8_t function)
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
#ifdef USE_ENERGY_COLUMN_GUI #ifdef USE_ENERGY_COLUMN_GUI
case FUNC_WEB_COL_SENSOR: case FUNC_WEB_COL_SENSOR:
FifLEShow(0);
break;
#else // not USE_ENERGY_COLUMN_GUI #else // not USE_ENERGY_COLUMN_GUI
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
#endif // USE_ENERGY_COLUMN_GUI
FifLEShow(0); FifLEShow(0);
break; break;
#endif // USE_ENERGY_COLUMN_GUI
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
case FUNC_ENERGY_RESET: case FUNC_ENERGY_RESET:
FifLEReset(); FifLEReset();

4
tasmota/xnrg_18_sdm72.ino
View File

@ -222,13 +222,11 @@ bool Xnrg18(uint8_t function)
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
#ifdef USE_ENERGY_COLUMN_GUI #ifdef USE_ENERGY_COLUMN_GUI
case FUNC_WEB_COL_SENSOR: case FUNC_WEB_COL_SENSOR:
Sdm72Show(0);
break;
#else // not USE_ENERGY_COLUMN_GUI #else // not USE_ENERGY_COLUMN_GUI
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
#endif // USE_ENERGY_COLUMN_GUI
Sdm72Show(0); Sdm72Show(0);
break; break;
#endif // USE_ENERGY_COLUMN_GUI
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
#endif // SDM72_IMPEXP #endif // SDM72_IMPEXP
case FUNC_INIT: case FUNC_INIT:

4
tasmota/xnrg_21_sdm230.ino
View File

@ -282,13 +282,11 @@ bool Xnrg21(uint8_t function)
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
#ifdef USE_ENERGY_COLUMN_GUI #ifdef USE_ENERGY_COLUMN_GUI
case FUNC_WEB_COL_SENSOR: case FUNC_WEB_COL_SENSOR:
Sdm230Show(0);
break;
#else // not USE_ENERGY_COLUMN_GUI #else // not USE_ENERGY_COLUMN_GUI
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
#endif // USE_ENERGY_COLUMN_GUI
Sdm230Show(0); Sdm230Show(0);
break; break;
#endif // USE_ENERGY_COLUMN_GUI
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
#endif // SDM230_MORE_REGS #endif // SDM230_MORE_REGS
case FUNC_ENERGY_RESET: case FUNC_ENERGY_RESET:

22
tasmota/xnrg_23_ade7880.ino
View File

@ -657,12 +657,28 @@ bool Ade7880Command(void) {
for (uint32_t i = 0; i < 57; i++) { for (uint32_t i = 0; i < 57; i++) {
int32_t value = Ade7880Read(ADE7880_AIGAIN + i); int32_t value = Ade7880Read(ADE7880_AIGAIN + i);
// snprintf_P(data, sizeof(data), PSTR("%s%s%08X"), data, (i)?",":"", value); // snprintf_P(data, sizeof(data), PSTR("%s%s%08X"), data, (i)?",":"", value);
if (bitRead(value, 27)) { value |= 0xF0000000; } // Make 32-bit negative (ZPSE) if (bitRead(value, 27)) { value |= 0xF0000000; } // Make 24-bit negative (ZPSE)
snprintf_P(data, sizeof(data), PSTR("%s%s%d"), data, (i)?",":"", value); snprintf_P(data, sizeof(data), PSTR("%s%s%d"), data, (i)?",":"", value);
} }
AddLog(LOG_LEVEL_DEBUG, PSTR("A78: DSP Regs 0x4380..B9 '%s'"), data); AddLog(LOG_LEVEL_DEBUG, PSTR("A78: DSP Regs 0x4380..B9 '%s'"), data);
return true; return true;
} }
if ('2' == XdrvMailbox.data[0]) {
// EnergyConfig 2 - Dump DSP UI data memory (0x43C0..0x43C7)
char data[600] = { 0 };
for (uint32_t i = 0; i < 8; i++) {
int32_t value = Ade7880Read(ADE7880_AIRMS + i);
snprintf_P(data, sizeof(data), PSTR("%s%s%08X"), data, (i)?",":"", value);
// if (7 == i) {
// if (bitRead(value, 27)) { value |= 0xF0000000; } // Make 28-bit negative (ZP)
// } else {
// if (bitRead(value, 23)) { value |= 0xFF000000; } // Make 24-bit negative (ZP)
// }
// snprintf_P(data, sizeof(data), PSTR("%s%s%d"), data, (i)?",":"", value);
}
AddLog(LOG_LEVEL_DEBUG, PSTR("A78: DSP Regs 0x43C0..C7 '%s'"), data);
return true;
}
#endif // ADE7880_DEBUG #endif // ADE7880_DEBUG
Ade7880Defaults(); // Load defaults Ade7880Defaults(); // Load defaults
if (Ade7880SetDefaults(XdrvMailbox.data)) { if (Ade7880SetDefaults(XdrvMailbox.data)) {
@ -728,13 +744,11 @@ bool Xnrg23(uint8_t function) {
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER
#ifdef USE_ENERGY_COLUMN_GUI #ifdef USE_ENERGY_COLUMN_GUI
case FUNC_WEB_COL_SENSOR: case FUNC_WEB_COL_SENSOR:
Ade7880Show(0);
break;
#else // not USE_ENERGY_COLUMN_GUI #else // not USE_ENERGY_COLUMN_GUI
case FUNC_WEB_SENSOR: case FUNC_WEB_SENSOR:
#endif // USE_ENERGY_COLUMN_GUI
Ade7880Show(0); Ade7880Show(0);
break; break;
#endif // USE_ENERGY_COLUMN_GUI
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
#endif // ADE7880_MORE_REGS #endif // ADE7880_MORE_REGS
case FUNC_COMMAND: case FUNC_COMMAND: