From 97f3a7d438d103d7ee38ef68c324dd3802940362 Mon Sep 17 00:00:00 2001 From: Marcus Date: Mon, 11 Jan 2021 18:42:00 +0100 Subject: [PATCH] readd TimePropCommand --- tasmota/xdrv_48_timeprop.ino | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tasmota/xdrv_48_timeprop.ino b/tasmota/xdrv_48_timeprop.ino index 93a75efe9..684d6e4b3 100644 --- a/tasmota/xdrv_48_timeprop.ino +++ b/tasmota/xdrv_48_timeprop.ino @@ -87,6 +87,8 @@ #define D_CMND_TIMEPROP "timeprop_" #define D_CMND_TIMEPROP_SETPOWER "setpower_" // add index no on end (0:8) and data is power 0:1 +#include "Timeprop.h" + enum TimepropCommands { CMND_TIMEPROP_SETPOWER }; const char kTimepropCommands[] PROGMEM = D_CMND_TIMEPROP_SETPOWER; @@ -117,8 +119,6 @@ static long currentRelayStates = 0; // current actual relay states. Bit 0 first #define TIMEPROP_RELAYS 1 // which relay to control 1:8 #endif -#include "Timeprop.h" - struct { Timeprop timeprops[TIMEPROP_NUM_OUTPUTS]; int relay_nos[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_RELAYS}; @@ -209,7 +209,7 @@ bool TimepropCommand() AddLog(LOG_LEVEL_INFO); */ if (XdrvMailbox.index >=0 && XdrvMailbox.index < TIMEPROP_NUM_OUTPUTS) { - timeprops[XdrvMailbox.index].setPower( atof(XdrvMailbox.data), timeprop_current_time_secs ); + timeprops[XdrvMailbox.index].setPower( atof(XdrvMailbox.data), Tprop.current_time_secs ); } snprintf_P(TasmotaGlobal.mqtt_data, sizeof(TasmotaGlobal.mqtt_data), PSTR("{\"" D_CMND_TIMEPROP D_CMND_TIMEPROP_SETPOWER "%d\":\"%s\"}"), XdrvMailbox.index, XdrvMailbox.data); @@ -239,12 +239,9 @@ bool Xdrv48(byte function) { case FUNC_EVERY_SECOND: TimepropEverySecond(); break; - case FUNC_COMMAND: - result = TimepropCommand(); - break; - case FUNC_COMMAND: - result = TimepropCommand(); - break; + case FUNC_COMMAND: + result = TimepropCommand(); + break; case FUNC_SET_POWER: TimepropXdrvPower(); break; @@ -252,5 +249,4 @@ bool Xdrv48(byte function) { return result; } -#endif // FIRMWARE_MINIMAL #endif // USE_TIMEPROP