mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6777 from andrethomas/tasmota_slave 

TasmotaSlave: Add support for FUNC_EVERY_SECOND
This commit is contained in:
Theo Arends 2019-10-28 20:45:31 +01:00 committed by GitHub
parent 2dabaa3d20 abc99da9f1
commit 9b0f16f123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/xdrv_31_tasmota_slave.ino
View File

@ -43,6 +43,7 @@
#define CMND_FEATURES 0x01 #define CMND_FEATURES 0x01
#define CMND_JSON 0x02 #define CMND_JSON 0x02
#define CMND_SECOND_TICK 0x03
#define PARAM_DATA_START 0xFE #define PARAM_DATA_START 0xFE
#define PARAM_DATA_END 0xFF #define PARAM_DATA_END 0xFF
@ -144,8 +145,8 @@ struct TSLAVE {
typedef union { typedef union {
uint16_t data; uint16_t data;
struct { struct {
uint16_t json : 1; uint16_t json : 1; // Slave supports providing a JSON for TELEPERIOD
uint16_t spare1 : 1; uint16_t second_tick : 1; // Slave supports receiving a FUNC_EVERY_SECOND callback with no response
uint16_t spare2 : 1; uint16_t spare2 : 1;
uint16_t spare3 : 1; uint16_t spare3 : 1;
uint16_t spare4 : 1; uint16_t spare4 : 1;
@ -378,6 +379,7 @@ void TasmotaSlave_Flash(void)
} }
} }
TasmotaSlave_exitProgMode(); TasmotaSlave_exitProgMode();
AddLog_P2(LOG_LEVEL_INFO, PSTR("TasmotaSlave: Flash done!"));
TSlave.flashing = false; TSlave.flashing = false;
restart_flag = 2; restart_flag = 2;
} }
@ -485,6 +487,11 @@ bool Xdrv31(uint8_t function)
switch (function) { switch (function) {
case FUNC_EVERY_SECOND: case FUNC_EVERY_SECOND:
TasmotaSlave_Init(); TasmotaSlave_Init();
if (TSlave.type) {
if (TSlaveSettings.features.second_tick) {
TasmotaSlave_sendCmnd(CMND_SECOND_TICK, 0);
}
}
break; break;
case FUNC_JSON_APPEND: case FUNC_JSON_APPEND:
TasmotaSlave_Show(); TasmotaSlave_Show();