mirror of https://github.com/arendst/Tasmota.git
remove code that did not seem to be necessary
This commit is contained in:
parent
ce1a104397
commit
8b5961c37d
|
@ -82,11 +82,6 @@
|
||||||
|
|
||||||
# include "Timeprop.h"
|
# include "Timeprop.h"
|
||||||
|
|
||||||
#define D_CMND_TIMEPROP "timeprop_"
|
|
||||||
#define D_CMND_TIMEPROP_SETPOWER "setpower_" // add index no on end (0:8) and data is power 0:1
|
|
||||||
|
|
||||||
enum TimepropCommands { CMND_TIMEPROP_SETPOWER };
|
|
||||||
const char kTimepropCommands[] PROGMEM = D_CMND_TIMEPROP_SETPOWER;
|
|
||||||
|
|
||||||
static Timeprop timeprops[TIMEPROP_NUM_OUTPUTS];
|
static Timeprop timeprops[TIMEPROP_NUM_OUTPUTS];
|
||||||
static int relayNos[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_RELAYS};
|
static int relayNos[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_RELAYS};
|
||||||
|
@ -148,50 +143,7 @@ void Timeprop_Xdrv_Power() {
|
||||||
/* } XdrvMailbox; */
|
/* } XdrvMailbox; */
|
||||||
|
|
||||||
// To get here post with topic cmnd/timeprop_setpower_n where n is index into timeprops 0:7
|
// To get here post with topic cmnd/timeprop_setpower_n where n is index into timeprops 0:7
|
||||||
bool Timeprop_Command()
|
|
||||||
{
|
|
||||||
char command [CMDSZ];
|
|
||||||
bool serviced = true;
|
|
||||||
uint8_t ua_prefix_len = strlen(D_CMND_TIMEPROP); // to detect prefix of command
|
|
||||||
/*
|
|
||||||
snprintf_P(log_data, sizeof(log_data), "Command called: "
|
|
||||||
"index: %d data_len: %d payload: %d topic: %s data: %s\n",
|
|
||||||
XdrvMailbox.index,
|
|
||||||
XdrvMailbox.data_len,
|
|
||||||
XdrvMailbox.payload,
|
|
||||||
(XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""),
|
|
||||||
(XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : ""));
|
|
||||||
|
|
||||||
AddLog(LOG_LEVEL_INFO);
|
|
||||||
*/
|
|
||||||
if (0 == strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_TIMEPROP), ua_prefix_len)) {
|
|
||||||
// command starts with timeprop_
|
|
||||||
int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + ua_prefix_len, kTimepropCommands);
|
|
||||||
if (CMND_TIMEPROP_SETPOWER == command_code) {
|
|
||||||
/*
|
|
||||||
snprintf_P(log_data, sizeof(log_data), "Timeprop command timeprop_setpower: "
|
|
||||||
"index: %d data_len: %d payload: %d topic: %s data: %s",
|
|
||||||
XdrvMailbox.index,
|
|
||||||
XdrvMailbox.data_len,
|
|
||||||
XdrvMailbox.payload,
|
|
||||||
(XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""),
|
|
||||||
(XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : ""));
|
|
||||||
AddLog(LOG_LEVEL_INFO);
|
|
||||||
*/
|
|
||||||
if (XdrvMailbox.index >=0 && XdrvMailbox.index < TIMEPROP_NUM_OUTPUTS) {
|
|
||||||
timeprops[XdrvMailbox.index].setPower( atof(XdrvMailbox.data), timeprop_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);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
serviced = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
serviced = false;
|
|
||||||
}
|
|
||||||
return serviced;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*********************************************************************************************\
|
/*********************************************************************************************\
|
||||||
* Interface
|
* Interface
|
||||||
|
@ -210,9 +162,6 @@ bool Xdrv48(byte function)
|
||||||
case FUNC_EVERY_SECOND:
|
case FUNC_EVERY_SECOND:
|
||||||
Timeprop_Every_Second();
|
Timeprop_Every_Second();
|
||||||
break;
|
break;
|
||||||
case FUNC_COMMAND:
|
|
||||||
result = Timeprop_Command();
|
|
||||||
break;
|
|
||||||
case FUNC_SET_POWER:
|
case FUNC_SET_POWER:
|
||||||
Timeprop_Xdrv_Power();
|
Timeprop_Xdrv_Power();
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue