From 6c3d9d2ff5f641886b9de4a847b5689d20a42aa6 Mon Sep 17 00:00:00 2001 From: Shantur Rathore Date: Tue, 27 Aug 2019 14:40:43 +0100 Subject: [PATCH] Fix sonoff-display compilation after Tuya Power metering changes --- sonoff/xdrv_16_tuyadimmer.ino | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sonoff/xdrv_16_tuyadimmer.ino b/sonoff/xdrv_16_tuyadimmer.ino index 85a4083d6..a1b3f1090 100644 --- a/sonoff/xdrv_16_tuyadimmer.ino +++ b/sonoff/xdrv_16_tuyadimmer.ino @@ -54,8 +54,9 @@ struct TUYA { uint8_t data_len = 0; // Data lenght of command int8_t wifi_state = -2; // Keep MCU wifi-status in sync with WifiState() uint8_t heartbeat_timer = 0; // 10 second heartbeat timer for tuya module +#ifdef USE_ENERGY_SENSOR uint32_t lastPowerCheckTime = 0; // Time when last power was checked - +#endif // USE_ENERGY_SENSOR char *buffer = nullptr; // Serial receive buffer int byte_counter = 0; // Index in serial receive buffer } Tuya; @@ -229,6 +230,7 @@ void TuyaPacketProcess(void) } } +#ifdef USE_ENERGY_SENSOR if (Settings.param[P_TUYA_VOLTAGE_ID] == Tuya.buffer[6]) { Energy.voltage = (float)(Tuya.buffer[12] << 8 | Tuya.buffer[13]) / 10; AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: Rx ID=%d Voltage=%d"), Settings.param[P_TUYA_VOLTAGE_ID], (Tuya.buffer[12] << 8 | Tuya.buffer[13])); @@ -247,6 +249,8 @@ void TuyaPacketProcess(void) } else if (Settings.param[P_TUYA_DIMMER_ID] != Tuya.buffer[6]){ AddLog_P2(LOG_LEVEL_DEBUG, PSTR("TYA: RX Unknown ID=%d"), Tuya.buffer[6]); } +#endif // USE_ENERGY_SENSOR + } break; @@ -459,6 +463,7 @@ bool Xdrv16(uint8_t function) return result; } +#ifdef USE_ENERGY_SENSOR /*********************************************************************************************\ * Energy Interface \*********************************************************************************************/ @@ -479,6 +484,7 @@ int Xnrg08(uint8_t function) } return result; } +#endif // USE_ENERGY_SENSOR #endif // USE_TUYA_DIMMER #endif // USE_LIGHT