2021-01-04 09:29:12 +00:00
|
|
|
/*
|
2021-01-06 22:09:23 +00:00
|
|
|
xdrv_48_timeprop.ino - Timeprop support for Sonoff-Tasmota
|
2021-01-07 14:07:14 +00:00
|
|
|
|
|
|
|
Copyright (C) 2021 Colin Law and Thomas Herrmann
|
|
|
|
|
2021-01-04 09:29:12 +00:00
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
2021-01-07 14:07:14 +00:00
|
|
|
|
2021-01-04 09:29:12 +00:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
2021-01-07 14:07:14 +00:00
|
|
|
|
2021-01-04 09:29:12 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
#ifdef USE_TIMEPROP
|
2021-01-11 17:59:20 +00:00
|
|
|
#ifndef FIRMWARE_MINIMAL
|
2021-01-07 14:07:14 +00:00
|
|
|
/*********************************************************************************************\
|
2021-01-04 09:29:12 +00:00
|
|
|
* Code to drive one or more relays in a time proportioned manner give a
|
|
|
|
* required power value.
|
|
|
|
*
|
|
|
|
* Given required power values in the range 0.0 to 1.0 the relays will be
|
|
|
|
* driven on/off in such that the average power suppled will represent
|
|
|
|
* the required power.
|
|
|
|
* The cycle time is configurable. If, for example, the
|
|
|
|
* period is set to 10 minutes and the power input is 0.2 then the output will
|
|
|
|
* be on for two minutes in every ten minutes.
|
|
|
|
*
|
|
|
|
* A value for actuator dead time may be provided. If you have a device that
|
|
|
|
* takes a significant time to open/close then set this to the average of the
|
|
|
|
* open and close times. The algorithim will then adjust the output timing
|
|
|
|
* accordingly to ensure that the output is not switched more rapidly than
|
|
|
|
* the actuator can cope with.
|
|
|
|
*
|
|
|
|
* A facility to invert the output is provided which can be useful when used in
|
|
|
|
* refrigeration processes and similar.
|
|
|
|
*
|
|
|
|
* In the case where only one relay is being driven the power value is set by
|
|
|
|
* writing the value to the mqtt topic cmnd/timeprop_setpower_0. If more than
|
|
|
|
* one relay is being driven (as might be the case for a heat/cool application
|
|
|
|
* where one relay drives the heater and the other the cooler) then the power
|
|
|
|
* for the second relay is written to topic cmnd/timeprop_setpower_1 and so on.
|
|
|
|
*
|
|
|
|
* To cope with the problem of temporary wifi failure etc a
|
|
|
|
* TIMEPROP_MAX_UPDATE_INTERVALS value is available. This can be set to the max
|
|
|
|
* expected time between power updates and if this time is exceeded then the
|
|
|
|
* power will fallback to a given safe value until a new value is provided. Set
|
|
|
|
* the interval to 0 to disable this feature.
|
|
|
|
*
|
|
|
|
* Usage:
|
|
|
|
* Place this file in the sonoff folder.
|
|
|
|
* Clone the library https://github.com/colinl/process-control.git from Github
|
|
|
|
* into a subfolder of lib.
|
|
|
|
* In user_config.h or user_config_override.h for a single relay, include
|
|
|
|
* code as follows:
|
|
|
|
|
|
|
|
#define USE_TIMEPROP // include the timeprop feature (+1.2k)
|
|
|
|
// for single output
|
|
|
|
#define TIMEPROP_NUM_OUTPUTS 1 // how many outputs to control (with separate alogorithm for each)
|
|
|
|
#define TIMEPROP_CYCLETIMES 60 // cycle time seconds
|
|
|
|
#define TIMEPROP_DEADTIMES 0 // actuator action time seconds
|
|
|
|
#define TIMEPROP_OPINVERTS false // whether to invert the output
|
|
|
|
#define TIMEPROP_FALLBACK_POWERS 0 // falls back to this if too long betwen power updates
|
|
|
|
#define TIMEPROP_MAX_UPDATE_INTERVALS 120 // max no secs that are allowed between power updates (0 to disable)
|
|
|
|
#define TIMEPROP_RELAYS 1 // which relay to control 1:8
|
|
|
|
|
|
|
|
* or for two relays:
|
|
|
|
#define USE_TIMEPROP // include the timeprop feature (+1.2k)
|
|
|
|
// for single output
|
|
|
|
#define TIMEPROP_NUM_OUTPUTS 2 // how many outputs to control (with separate alogorithm for each)
|
|
|
|
#define TIMEPROP_CYCLETIMES 60, 10 // cycle time seconds
|
|
|
|
#define TIMEPROP_DEADTIMES 0, 0 // actuator action time seconds
|
|
|
|
#define TIMEPROP_OPINVERTS false, false // whether to invert the output
|
|
|
|
#define TIMEPROP_FALLBACK_POWERS 0, 0 // falls back to this if too long betwen power updates
|
|
|
|
#define TIMEPROP_MAX_UPDATE_INTERVALS 120, 120 // max no secs that are allowed between power updates (0 to disable)
|
|
|
|
#define TIMEPROP_RELAYS 1, 2 // which relay to control 1:8
|
|
|
|
|
|
|
|
* Publish values between 0 and 1 to the topic(s) described above
|
2021-01-08 20:57:56 +00:00
|
|
|
*
|
|
|
|
**/
|
|
|
|
|
|
|
|
|
2021-01-04 09:29:12 +00:00
|
|
|
|
2021-01-08 20:36:28 +00:00
|
|
|
#define D_CMND_TIMEPROP "timeprop_"
|
|
|
|
#define D_CMND_TIMEPROP_SETPOWER "setpower_" // add index no on end (0:8) and data is power 0:1
|
|
|
|
|
2021-01-11 17:42:00 +00:00
|
|
|
#include "Timeprop.h"
|
|
|
|
|
2021-01-08 20:36:28 +00:00
|
|
|
enum TimepropCommands { CMND_TIMEPROP_SETPOWER };
|
|
|
|
const char kTimepropCommands[] PROGMEM = D_CMND_TIMEPROP_SETPOWER;
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
#ifndef TIMEPROP_NUM_OUTPUTS
|
|
|
|
#define TIMEPROP_NUM_OUTPUTS 1 // how many outputs to control (with separate alogorithm for each)
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_CYCLETIMES
|
|
|
|
#define TIMEPROP_CYCLETIMES 60 // cycle time seconds
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_DEADTIMES
|
|
|
|
#define TIMEPROP_DEADTIMES 0 // actuator action time seconds
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_OPINVERTS
|
|
|
|
#define TIMEPROP_OPINVERTS false // whether to invert the output
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_FALLBACK_POWERS
|
|
|
|
#define TIMEPROP_FALLBACK_POWERS 0 // falls back to this if too long betwen power updates
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_MAX_UPDATE_INTERVALS
|
|
|
|
#define TIMEPROP_MAX_UPDATE_INTERVALS 120 // max no secs that are allowed between power updates (0 to disable)
|
|
|
|
#endif
|
|
|
|
#ifndef TIMEPROP_RELAYS
|
|
|
|
#define TIMEPROP_RELAYS 1 // which relay to control 1:8
|
|
|
|
#endif
|
|
|
|
|
2021-09-25 18:20:36 +01:00
|
|
|
static Timeprop timeprops[TIMEPROP_NUM_OUTPUTS];
|
|
|
|
static int relayNos[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_RELAYS};
|
|
|
|
static long currentRelayStates = 0; // current actual relay states. Bit 0 first relay
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
struct {
|
|
|
|
Timeprop timeprops[TIMEPROP_NUM_OUTPUTS];
|
|
|
|
int relay_nos[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_RELAYS};
|
|
|
|
long current_relay_states = 0; // current actual relay states. Bit 0 first relay
|
|
|
|
long current_time_secs = 0; // a counter that counts seconds since initialisation
|
|
|
|
} Tprop;
|
2021-01-04 09:29:12 +00:00
|
|
|
|
|
|
|
/* call this from elsewhere if required to set the power value for one of the timeprop instances */
|
|
|
|
/* index specifies which one, 0 up */
|
2021-01-07 14:07:14 +00:00
|
|
|
void TimepropSetPower(int index, float power) {
|
|
|
|
if (index >= 0 && index < TIMEPROP_NUM_OUTPUTS) {
|
|
|
|
Tprop.timeprops[index].setPower( power, Tprop.current_time_secs);
|
2021-01-04 09:29:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
void TimepropInit(void) {
|
2021-01-23 15:26:23 +00:00
|
|
|
// AddLog(LOG_LEVEL_INFO, PSTR("TPR: Timeprop Init"));
|
2021-01-04 09:29:12 +00:00
|
|
|
int cycleTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_CYCLETIMES};
|
|
|
|
int deadTimes[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_DEADTIMES};
|
|
|
|
int opInverts[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_OPINVERTS};
|
|
|
|
int fallbacks[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_FALLBACK_POWERS};
|
|
|
|
int maxIntervals[TIMEPROP_NUM_OUTPUTS] = {TIMEPROP_MAX_UPDATE_INTERVALS};
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
for (int i = 0; i < TIMEPROP_NUM_OUTPUTS; i++) {
|
|
|
|
Tprop.timeprops[i].initialise(cycleTimes[i], deadTimes[i], opInverts[i], fallbacks[i],
|
|
|
|
maxIntervals[i], Tprop.current_time_secs);
|
2021-01-04 09:29:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-07 14:07:14 +00:00
|
|
|
void TimepropEverySecond(void) {
|
|
|
|
Tprop.current_time_secs++; // increment time
|
2021-01-04 09:29:12 +00:00
|
|
|
for (int i=0; i<TIMEPROP_NUM_OUTPUTS; i++) {
|
2021-01-07 14:07:14 +00:00
|
|
|
int newState = Tprop.timeprops[i].tick(Tprop.current_time_secs);
|
|
|
|
if (newState != bitRead(Tprop.current_relay_states, Tprop.relay_nos[i]-1)){
|
2021-01-04 09:29:12 +00:00
|
|
|
// remove the third parameter below if using tasmota prior to v6.0.0
|
2021-01-07 14:07:14 +00:00
|
|
|
ExecuteCommandPower(Tprop.relay_nos[i], newState,SRC_IGNORE);
|
2021-01-04 09:29:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// called by the system each time a relay state is changed
|
2021-01-07 14:07:14 +00:00
|
|
|
void TimepropXdrvPower(void) {
|
2021-01-04 09:29:12 +00:00
|
|
|
// for a single relay the state is in the lsb of index, I have think that for
|
|
|
|
// multiple outputs then succesive bits will hold the state but have not been
|
|
|
|
// able to test that
|
2021-01-07 14:07:14 +00:00
|
|
|
Tprop.current_relay_states = XdrvMailbox.index;
|
2021-01-04 09:29:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* struct XDRVMAILBOX { */
|
|
|
|
/* uint16_t valid; */
|
|
|
|
/* uint16_t index; */
|
|
|
|
/* uint16_t data_len; */
|
|
|
|
/* int16_t payload; */
|
|
|
|
/* char *topic; */
|
|
|
|
/* char *data; */
|
|
|
|
/* } XdrvMailbox; */
|
|
|
|
|
2021-01-08 20:36:28 +00:00
|
|
|
// To get here post with topic cmnd/timeprop_setpower_n where n is index into timeprops 0:7
|
|
|
|
bool TimepropCommand()
|
|
|
|
{
|
|
|
|
char command [CMDSZ];
|
|
|
|
bool serviced = true;
|
|
|
|
uint8_t ua_prefix_len = strlen(D_CMND_TIMEPROP); // to detect prefix of command
|
|
|
|
/*
|
2021-06-05 10:47:09 +01:00
|
|
|
AddLog(LOG_LEVEL_INFO, PSTR("Command called: "
|
2021-01-23 12:21:17 +00:00
|
|
|
"index: %d data_len: %d payload: %d topic: %s data: %s"),
|
2021-01-08 20:36:28 +00:00
|
|
|
XdrvMailbox.index,
|
|
|
|
XdrvMailbox.data_len,
|
|
|
|
XdrvMailbox.payload,
|
|
|
|
(XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""),
|
|
|
|
(XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : ""));
|
|
|
|
*/
|
|
|
|
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) {
|
|
|
|
/*
|
2021-06-05 10:47:09 +01:00
|
|
|
AddLog(LOG_LEVEL_INFO, PSTR("Timeprop command timeprop_setpower: "
|
2021-01-23 12:21:17 +00:00
|
|
|
"index: %d data_len: %d payload: %d topic: %s data: %s"),
|
2021-01-08 20:36:28 +00:00
|
|
|
XdrvMailbox.index,
|
|
|
|
XdrvMailbox.data_len,
|
|
|
|
XdrvMailbox.payload,
|
|
|
|
(XdrvMailbox.payload >= 0 ? XdrvMailbox.topic : ""),
|
|
|
|
(XdrvMailbox.data_len >= 0 ? XdrvMailbox.data : ""));
|
|
|
|
*/
|
|
|
|
if (XdrvMailbox.index >=0 && XdrvMailbox.index < TIMEPROP_NUM_OUTPUTS) {
|
2021-01-11 17:42:00 +00:00
|
|
|
timeprops[XdrvMailbox.index].setPower( atof(XdrvMailbox.data), Tprop.current_time_secs );
|
2021-01-08 20:36:28 +00:00
|
|
|
}
|
2021-05-23 15:50:17 +01:00
|
|
|
Response_P(PSTR("{\"" D_CMND_TIMEPROP D_CMND_TIMEPROP_SETPOWER "%d\":\"%s\"}"), XdrvMailbox.index, XdrvMailbox.data);
|
2021-01-08 20:36:28 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
serviced = false;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
serviced = false;
|
|
|
|
}
|
|
|
|
return serviced;
|
|
|
|
}
|
2021-01-04 09:29:12 +00:00
|
|
|
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* Interface
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2021-01-06 22:09:23 +00:00
|
|
|
#define XDRV_48 48
|
2021-01-04 09:29:12 +00:00
|
|
|
|
2022-11-11 09:44:56 +00:00
|
|
|
bool Xdrv48(uint32_t function) {
|
2021-01-06 15:36:24 +00:00
|
|
|
bool result = false;
|
2021-01-04 09:29:12 +00:00
|
|
|
|
|
|
|
switch (function) {
|
2021-01-07 14:07:14 +00:00
|
|
|
case FUNC_INIT:
|
|
|
|
TimepropInit();
|
|
|
|
break;
|
|
|
|
case FUNC_EVERY_SECOND:
|
|
|
|
TimepropEverySecond();
|
|
|
|
break;
|
2021-01-11 17:42:00 +00:00
|
|
|
case FUNC_COMMAND:
|
|
|
|
result = TimepropCommand();
|
|
|
|
break;
|
2021-01-07 14:07:14 +00:00
|
|
|
case FUNC_SET_POWER:
|
|
|
|
TimepropXdrvPower();
|
|
|
|
break;
|
2021-01-04 09:29:12 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2021-01-11 17:59:20 +00:00
|
|
|
#endif // FIRMWARE_MINIMAL
|
2021-01-04 09:29:12 +00:00
|
|
|
#endif // USE_TIMEPROP
|