jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor energy driver selection

Browse Source 
Refactor energy driver selection
This commit is contained in:
Theo Arends 2019-09-08 17:21:26 +02:00
parent 75abfc5fd9
commit 612654ffca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sonoff/xnrg_interface.ino
View File

@ -19,8 +19,6 @@
#ifdef USE_ENERGY_SENSOR #ifdef USE_ENERGY_SENSOR
uint8_t xnrg_active_driver_number = 0;
#ifdef XFUNC_PTR_IN_ROM #ifdef XFUNC_PTR_IN_ROM
bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = { // Energy driver Function Pointers bool (* const xnrg_func_ptr[])(uint8_t) PROGMEM = { // Energy driver Function Pointers
#else #else
@ -94,19 +92,21 @@ bool (* const xnrg_func_ptr[])(uint8_t) = { // Energy driver Function Pointers
const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]); // Number of drivers found const uint8_t xnrg_present = sizeof(xnrg_func_ptr) / sizeof(xnrg_func_ptr[0]); // Number of drivers found
uint8_t xnrg_active = 0;
bool XnrgCall(uint8_t function) bool XnrgCall(uint8_t function)
{ {
if (FUNC_PRE_INIT == function) { if (FUNC_PRE_INIT == function) {
for (uint32_t x = 0; x < xnrg_present; x++) { for (uint32_t x = 0; x < xnrg_present; x++) {
xnrg_func_ptr[x](function); xnrg_func_ptr[x](function);
if (energy_flg) { if (energy_flg) {
xnrg_active_driver_number = x; xnrg_active = x;
break; // Stop further driver investigation return true; // Stop further driver investigation
} }
} }
} }
else if (energy_flg) { else if (energy_flg) {
return xnrg_func_ptr[xnrg_active_driver_number](function); return xnrg_func_ptr[xnrg_active](function);
} }
return false; return false;
} }