jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 20:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Sensor MQTT data adding rule support

Browse Source
This commit is contained in:
Theo Arends 2019-11-10 17:40:37 +01:00
parent b2e6a2fe75
commit 48e15216be
13 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasmota/tasmota.ino
View File

@ -851,7 +851,14 @@ void PerformEverySecond(void)
tele_period = 0; tele_period = 0;
MqttPublishTeleState(); MqttPublishTeleState();
MqttPublishSensor();
mqtt_data[0] = '\0';
if (MqttShowSensor()) {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN
#if defined(USE_RULES) || defined(USE_SCRIPT)
RulesTeleperiod(); // Allow rule based HA messages
#endif // USE_RULES
}
XdrvCall(FUNC_AFTER_TELEPERIOD); XdrvCall(FUNC_AFTER_TELEPERIOD);
} }

4
tasmota/xdrv_02_mqtt.ino
View File

@ -432,9 +432,7 @@ void MqttPublishPrefixTopic_P(uint32_t prefix, const char* subtopic)
void MqttPublishTeleSensor(void) void MqttPublishTeleSensor(void)
{ {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN
#if defined(USE_RULES) || defined(USE_SCRIPT) XdrvRulesProcess();
RulesTeleperiod(); // Allow rule based HA messages
#endif // USE_RULES
} }
void MqttPublishPowerState(uint32_t device) void MqttPublishPowerState(uint32_t device)

2
tasmota/xdrv_03_energy.ino
View File

@ -425,7 +425,7 @@ void EnergyMqttShow(void)
EnergyShow(true); EnergyShow(true);
tele_period = tele_period_save; tele_period = tele_period_save;
ResponseJsonEnd(); ResponseJsonEnd();
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
Energy.power_delta = false; Energy.power_delta = false;
} }
#endif // USE_ENERGY_MARGIN_DETECTION #endif // USE_ENERGY_MARGIN_DETECTION

2
tasmota/xdrv_15_pca9685.ino
View File

@ -181,7 +181,7 @@ void PCA9685_OutputTelemetry(bool telemetry) {
} }
ResponseAppend_P(PSTR("\"END\":1}}")); ResponseAppend_P(PSTR("\"END\":1}}"));
if (telemetry) { if (telemetry) {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
} }

2
tasmota/xdsp_08_ILI9488.ino
View File

@ -126,7 +126,7 @@ void ILI9488_InitDriver()
#ifdef USE_TOUCH_BUTTONS #ifdef USE_TOUCH_BUTTONS
void ILI9488_MQTT(uint8_t count,const char *cp) { void ILI9488_MQTT(uint8_t count,const char *cp) {
ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7); ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) { void ILI9488_RDW_BUTT(uint32_t count,uint32_t pwr) {

2
tasmota/xdsp_10_RA8876.ino
View File

@ -111,7 +111,7 @@ void RA8876_InitDriver()
#ifdef USE_TOUCH_BUTTONS #ifdef USE_TOUCH_BUTTONS
void RA8876_MQTT(uint8_t count,const char *cp) { void RA8876_MQTT(uint8_t count,const char *cp) {
ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7); ResponseTime_P(PSTR(",\"RA8876\":{\"%s%d\":\"%d\"}}"), cp,count+1,(buttons[count]->vpower&0x80)>>7);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) { void RA8876_RDW_BUTT(uint32_t count,uint32_t pwr) {

6
tasmota/xsns_29_mcp230xx.ino
View File

@ -742,7 +742,7 @@ void MCP230xx_OutputTelemetry(void) {
} }
} }
ResponseAppend_P(PSTR("\"END\":1}}")); ResponseAppend_P(PSTR("\"END\":1}}"));
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
} }
@ -757,7 +757,7 @@ void MCP230xx_Interrupt_Counter_Report(void) {
} }
} }
ResponseAppend_P(PSTR("\"END\":1}}")); ResponseAppend_P(PSTR("\"END\":1}}"));
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
mcp230xx_int_sec_counter = 0; mcp230xx_int_sec_counter = 0;
} }
@ -772,7 +772,7 @@ void MCP230xx_Interrupt_Retain_Report(void) {
} }
} }
ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult); ResponseAppend_P(PSTR("\"Value\":%u}}"),retainresult);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
/*********************************************************************************************\ /*********************************************************************************************\

2
tasmota/xsns_34_hx711.ino
View File

@ -360,7 +360,7 @@ void HxEvery100mSecond(void)
ResponseAppendTime(); ResponseAppendTime();
HxShow(true); HxShow(true);
ResponseJsonEnd(); ResponseJsonEnd();
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
Hx.weight_changed = false; Hx.weight_changed = false;
} }
} }

2
tasmota/xsns_40_pn532.ino
View File

@ -500,7 +500,7 @@ void PN532_ScanForTag(void)
ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids); ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), uids);
#endif // USE_PN532_DATA_FUNCTION #endif // USE_PN532_DATA_FUNCTION
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
#ifdef USE_PN532_CAUSE_EVENTS #ifdef USE_PN532_CAUSE_EVENTS

2
tasmota/xsns_44_sps30.ino
View File

@ -254,7 +254,7 @@ void SPS30_Show(bool json) {
void CmdClean(void) { void CmdClean(void) {
sps30_cmd(SPS_CMD_CLEAN); sps30_cmd(SPS_CMD_CLEAN);
ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}")); ResponseTime_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
bool SPS30_cmd(void) { bool SPS30_cmd(void) {

2
tasmota/xsns_51_rdm6300.ino
View File

@ -107,7 +107,7 @@ void RDM6300_ScanForTag() {
rdm_uid_str[9]=0; rdm_uid_str[9]=0;
ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str); ResponseTime_P(PSTR(",\"RDM6300\":{\"UID\":\"%s\"}}"), rdm_uid_str);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
/* /*
char command[24]; char command[24];
sprintf(command,"event RDM6300=%s",rdm_uid_str); sprintf(command,"event RDM6300=%s",rdm_uid_str);

2
tasmota/xsns_52_ibeacon.ino
View File

@ -548,7 +548,7 @@ void ibeacon_mqtt(const char *mac,const char *rssi) {
s_rssi[4]=0; s_rssi[4]=0;
int16_t n_rssi=atoi(s_rssi); int16_t n_rssi=atoi(s_rssi);
ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi); ResponseTime_P(PSTR(",\"" D_CMND_IBEACON "_%s\":{\"RSSI\":%d}}"),s_mac,n_rssi);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }

2
tasmota/xsns_53_sml.ino
View File

@ -1621,7 +1621,7 @@ void SML_Immediate_MQTT(const char *mp,uint8_t index,uint8_t mindex) {
// immediate mqtt // immediate mqtt
dtostrfd(meter_vars[index],dp&0xf,tpowstr); dtostrfd(meter_vars[index],dp&0xf,tpowstr);
ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr); ResponseTime_P(PSTR(",\"%s\":{\"%s\":%s}}"),meter_desc_p[mindex].prefix,jname,tpowstr);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishTeleSensor();
} }
} }
} }