";
const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
- "| " D_DOMOTICZ_IDX " {1 | |
"
- "| " D_DOMOTICZ_KEY_IDX " {1 | |
";
+ "| " D_DOMOTICZ_IDX " {1 | |
"
+ "| " D_DOMOTICZ_KEY_IDX " {1 | |
";
const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
- "| " D_DOMOTICZ_SWITCH_IDX " {1 | |
";
+ "| " D_DOMOTICZ_SWITCH_IDX " {1 | |
";
const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
- "| " D_DOMOTICZ_SENSOR_IDX " {1 {2 | |
";
+ "| " D_DOMOTICZ_SENSOR_IDX " {1 {2 | |
";
const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
- "| " D_DOMOTICZ_UPDATE_TIMER " (" STR(DOMOTICZ_UPDATE_TIMER) ") | |
";
+ "| " D_DOMOTICZ_UPDATE_TIMER " (" STR(DOMOTICZ_UPDATE_TIMER) ") | |
";
#endif // USE_WEBSERVER
-enum DomoticzCommands {
- CMND_IDX, CMND_KEYIDX, CMND_SWITCHIDX, CMND_SENSORIDX, CMND_UPDATETIMER };
-const char kDomoticzCommands[] PROGMEM =
- D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
+enum DomoticzCommands { CMND_IDX, CMND_KEYIDX, CMND_SWITCHIDX, CMND_SENSORIDX, CMND_UPDATETIMER };
+const char kDomoticzCommands[] PROGMEM = D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
//enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS};
@@ -338,6 +336,7 @@ void HandleDomoticzConfiguration()
String page = FPSTR(HTTP_HEAD);
page.replace(F("{v}"), FPSTR(S_CONFIGURE_DOMOTICZ));
+ page += FPSTR(HTTP_HEAD_STYLE);
page += FPSTR(HTTP_FORM_DOMOTICZ);
for (int i = 0; i < MAX_DOMOTICZ_IDX; i++) {
if (i < devices_present) {
diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino
index 571b24cfb..ba4547bdf 100644
--- a/sonoff/xdrv_interface.ino
+++ b/sonoff/xdrv_interface.ino
@@ -17,58 +17,49 @@
along with this program. If not, see .
*/
-void XDrvInit()
-{
- for (byte i = 0; i < XDRV_MAX; i++) {
- xdrv_func_ptr[i] = NULL;
- }
- xdrv_present = 0;
-
+boolean (* const xdrv_func_ptr[])(byte) PROGMEM = { // Driver Function Pointers
#ifdef XDRV_01
- xdrv_func_ptr[xdrv_present++] = &Xdrv01;
+ &Xdrv01,
#endif
#ifdef XDRV_02
- xdrv_func_ptr[xdrv_present++] = &Xdrv02;
+ &Xdrv02,
#endif
#ifdef XDRV_03
- xdrv_func_ptr[xdrv_present++] = &Xdrv03;
+ &Xdrv03,
#endif
#ifdef XDRV_04
- xdrv_func_ptr[xdrv_present++] = &Xdrv04;
+ &Xdrv04,
#endif
#ifdef XDRV_05
- xdrv_func_ptr[xdrv_present++] = &Xdrv05;
+ &Xdrv05,
#endif
#ifdef XDRV_06
- xdrv_func_ptr[xdrv_present++] = &Xdrv06;
+ &Xdrv06,
#endif
#ifdef XDRV_07
- xdrv_func_ptr[xdrv_present++] = &Xdrv07;
+ &Xdrv07,
#endif
#ifdef XDRV_08
- xdrv_func_ptr[xdrv_present++] = &Xdrv08;
+ &Xdrv08,
#endif
#ifdef XDRV_09
- xdrv_func_ptr[xdrv_present++] = &Xdrv09;
+ &Xdrv09,
#endif
#ifdef XDRV_10
- xdrv_func_ptr[xdrv_present++] = &Xdrv10;
+ &Xdrv10,
#endif
+};
-// snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_DEBUG "Drivers %d"), xdrv_present);
-// AddLog(LOG_LEVEL_DEBUG);
-
- XdrvCall(FUNC_INIT);
-}
+const uint8_t xdrv_present = sizeof(xdrv_func_ptr) / sizeof(xdrv_func_ptr[0]); // Number of drivers found
boolean XdrvCommand(char *type, uint16_t index, char *dataBuf, uint16_t data_len, int16_t payload)
{
diff --git a/sonoff/xplg_wemohue.ino b/sonoff/xplg_wemohue.ino
index da7e86ecf..07df239aa 100644
--- a/sonoff/xplg_wemohue.ino
+++ b/sonoff/xplg_wemohue.ino
@@ -388,10 +388,10 @@ void HandleUpnpEvent()
//differentiate get and set state
if (request.indexOf(F("SetBinaryState")) > 0) {
if (request.indexOf(F("State>1 0) {
- ExecuteCommandPower(devices_present, 1);
+ ExecuteCommandPower(devices_present, POWER_ON);
}
else if (request.indexOf(F("State>0 0) {
- ExecuteCommandPower(devices_present, 0);
+ ExecuteCommandPower(devices_present, POWER_OFF);
}
}
else if(request.indexOf(F("GetBinaryState")) > 0){
@@ -661,10 +661,10 @@ void HueLights(String *path)
on = hue_json["on"];
switch(on)
{
- case false : ExecuteCommandPower(device, 0);
+ case false : ExecuteCommandPower(device, POWER_OFF);
response.replace("{re", "false");
break;
- case true : ExecuteCommandPower(device, 1);
+ case true : ExecuteCommandPower(device, POWER_ON);
response.replace("{re", "true");
break;
default : response.replace("{re", (power & (1 << (device-1))) ? "true" : "false");
diff --git a/sonoff/xsns_09_bmp.ino b/sonoff/xsns_09_bmp.ino
index 91f6d2d7a..56457dec9 100644
--- a/sonoff/xsns_09_bmp.ino
+++ b/sonoff/xsns_09_bmp.ino
@@ -507,8 +507,10 @@ boolean Xsns09(byte function)
break;
case FUNC_EVERY_SECOND:
#ifdef USE_BME680
- if (tele_period == Settings.tele_period -3) {
- Bme680PerformReading();
+ if ((Settings.tele_period - tele_period) < 300) { // 5 minute stabilization time
+ if (tele_period &1) {
+ Bme680PerformReading(); // Keep BME680 busy every two seconds
+ }
}
#endif // USE_BME680
break;
diff --git a/sonoff/xsns_13_ina219.ino b/sonoff/xsns_13_ina219.ino
index 6ee99ed13..8fb4e2f1b 100644
--- a/sonoff/xsns_13_ina219.ino
+++ b/sonoff/xsns_13_ina219.ino
@@ -19,6 +19,9 @@
#ifdef USE_I2C
#ifdef USE_INA219
+
+#define XSNS_13 13
+
/*********************************************************************************************\
* INA219 - Low voltage (max 32V!) Current sensor
*
@@ -152,6 +155,23 @@ float Ina219GetCurrent_mA()
return value;
}
+/*********************************************************************************************\
+ * Command Sensor13
+\*********************************************************************************************/
+
+bool Ina219CommandSensor()
+{
+ boolean serviced = true;
+
+ if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) {
+ Settings.ina219_mode = XdrvMailbox.payload;
+ restart_flag = 2;
+ }
+ snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_SENSOR_INDEX_NVALUE, XSNS_13, Settings.ina219_mode);
+
+ return serviced;
+}
+
/********************************************************************************************/
void Ina219Detect()
@@ -211,14 +231,17 @@ void Ina219Show(boolean json)
* Interface
\*********************************************************************************************/
-#define XSNS_13
-
boolean Xsns13(byte function)
{
boolean result = false;
if (i2c_flg) {
switch (function) {
+ case FUNC_COMMAND:
+ if ((XSNS_13 == XdrvMailbox.index) && (ina219_type)) {
+ result = Ina219CommandSensor();
+ }
+ break;
case FUNC_PREP_BEFORE_TELEPERIOD:
Ina219Detect();
break;
diff --git a/sonoff/xsns_15_mhz19.ino b/sonoff/xsns_15_mhz19.ino
index 3c3158d04..79c427ca9 100644
--- a/sonoff/xsns_15_mhz19.ino
+++ b/sonoff/xsns_15_mhz19.ino
@@ -18,6 +18,9 @@
*/
#ifdef USE_MHZ19
+
+#define XSNS_15 15
+
/*********************************************************************************************\
* MH-Z19 - CO2 sensor
*
@@ -71,7 +74,7 @@ const char kMhzTypes[] PROGMEM = "MHZ19|MHZ19B";
const uint8_t mhz_cmnd_read_ppm[9] = {0xFF, 0x01, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79};
const uint8_t mhz_cmnd_abc_enable[9] = {0xFF, 0x01, 0x79, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xE6};
const uint8_t mhz_cmnd_abc_disable[9] = {0xFF, 0x01, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86};
-//const uint8_t mhz_cmnd_zeropoint[9] = {0xff, 0x01, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78};
+const uint8_t mhz_cmnd_zeropoint[9] = {0xff, 0x01, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78};
uint8_t mhz_type = 1;
uint16_t mhz_last_ppm = 0;
@@ -209,6 +212,34 @@ void Mhz50ms()
}
}
+/*********************************************************************************************\
+ * Command Sensor15
+\*********************************************************************************************/
+
+/*
+ 0 - ABC Off
+ 1 - ABC On
+ 2 - Manual start = ABC Off
+
+ 3 - Optional filter settings
+*/
+
+bool MhzCommandSensor()
+{
+ boolean serviced = true;
+
+ switch (XdrvMailbox.payload) {
+ case 2:
+ MhzSerial->write(mhz_cmnd_zeropoint, 9);
+ snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_SENSOR_INDEX_SVALUE, XSNS_15, D_JSON_ZERO_POINT_CALIBRATION);
+ break;
+ default:
+ serviced = false;
+ }
+
+ return serviced;
+}
+
/*********************************************************************************************/
void MhzInit()
@@ -245,8 +276,6 @@ void MhzShow(boolean json)
* Interface
\*********************************************************************************************/
-#define XSNS_15
-
boolean Xsns15(byte function)
{
boolean result = false;
@@ -259,6 +288,11 @@ boolean Xsns15(byte function)
case FUNC_EVERY_50_MSECOND:
Mhz50ms();
break;
+ case FUNC_COMMAND:
+ if (XSNS_15 == XdrvMailbox.index) {
+ result = MhzCommandSensor();
+ }
+ break;
case FUNC_JSON_APPEND:
MhzShow(1);
break;
diff --git a/sonoff/xsns_interface.ino b/sonoff/xsns_interface.ino
index 60cfac26e..c8a5b488b 100644
--- a/sonoff/xsns_interface.ino
+++ b/sonoff/xsns_interface.ino
@@ -1,5 +1,5 @@
/*
- xsns_interface.ino - External sensor interface support for Sonoff-Tasmota
+ xsns_interface.ino - Sensor interface support for Sonoff-Tasmota
Copyright (C) 2018 Theo Arends inspired by ESPEasy
@@ -17,98 +17,89 @@
along with this program. If not, see .
*/
-void XSnsInit()
-{
- for (byte i = 0; i < XSNS_MAX; i++) {
- xsns_func_ptr[i] = NULL;
- }
- xsns_present = 0;
-
+boolean (* const xsns_func_ptr[])(byte) PROGMEM = { // Sensor Function Pointers for simple implementation of sensors
#ifdef XSNS_01
- xsns_func_ptr[xsns_present++] = &Xsns01;
+ &Xsns01,
#endif
#ifdef XSNS_02
- xsns_func_ptr[xsns_present++] = &Xsns02;
+ &Xsns02,
#endif
#ifdef XSNS_03
- xsns_func_ptr[xsns_present++] = &Xsns03;
+ &Xsns03,
#endif
#ifdef XSNS_04
- xsns_func_ptr[xsns_present++] = &Xsns04;
+ &Xsns04,
#endif
#ifdef XSNS_05
- xsns_func_ptr[xsns_present++] = &Xsns05;
+ &Xsns05,
#endif
#ifdef XSNS_06
- xsns_func_ptr[xsns_present++] = &Xsns06;
+ &Xsns06,
#endif
#ifdef XSNS_07
- xsns_func_ptr[xsns_present++] = &Xsns07;
+ &Xsns07,
#endif
#ifdef XSNS_08
- xsns_func_ptr[xsns_present++] = &Xsns08;
+ &Xsns08,
#endif
#ifdef XSNS_09
- xsns_func_ptr[xsns_present++] = &Xsns09;
+ &Xsns09,
#endif
#ifdef XSNS_10
- xsns_func_ptr[xsns_present++] = &Xsns10;
+ &Xsns10,
#endif
#ifdef XSNS_11
- xsns_func_ptr[xsns_present++] = &Xsns11;
+ &Xsns11,
#endif
#ifdef XSNS_12
- xsns_func_ptr[xsns_present++] = &Xsns12;
+ &Xsns12,
#endif
#ifdef XSNS_13
- xsns_func_ptr[xsns_present++] = &Xsns13;
+ &Xsns13,
#endif
#ifdef XSNS_14
- xsns_func_ptr[xsns_present++] = &Xsns14;
+ &Xsns14,
#endif
#ifdef XSNS_15
- xsns_func_ptr[xsns_present++] = &Xsns15;
+ &Xsns15,
#endif
#ifdef XSNS_16
- xsns_func_ptr[xsns_present++] = &Xsns16;
+ &Xsns16,
#endif
#ifdef XSNS_17
- xsns_func_ptr[xsns_present++] = &Xsns17;
+ &Xsns17,
#endif
#ifdef XSNS_18
- xsns_func_ptr[xsns_present++] = &Xsns18;
+ &Xsns18,
#endif
#ifdef XSNS_19
- xsns_func_ptr[xsns_present++] = &Xsns19;
+ &Xsns19,
#endif
#ifdef XSNS_20
- xsns_func_ptr[xsns_present++] = &Xsns20;
+ &Xsns20,
#endif
+};
-// snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_DEBUG "Sensors found %d"), xsns_present);
-// AddLog(LOG_LEVEL_DEBUG);
-
- XsnsCall(FUNC_INIT);
-}
+const uint8_t xsns_present = sizeof(xsns_func_ptr) / sizeof(xsns_func_ptr[0]); // Number of External Sensors found
/*********************************************************************************************\
* Function call to all xsns
@@ -118,6 +109,7 @@ void XSnsInit()
* FUNC_SAVE_BEFORE_RESTART
* FUNC_JSON_APPEND
* FUNC_WEB_APPEND
+ * return FUNC_COMMAND
* FUNC_EVERY_SECOND
* FUNC_EVERY_50_MSECOND
\*********************************************************************************************/
@@ -127,7 +119,23 @@ boolean XsnsCall(byte Function)
boolean result = false;
for (byte x = 0; x < xsns_present; x++) {
- xsns_func_ptr[x](Function);
+ if (FUNC_WEB_APPEND == Function) {
+ mqtt_data[0] = '\0';
+ }
+ result = xsns_func_ptr[x](Function);
+ if (result) {
+ break;
+ }
+ if ((FUNC_WEB_APPEND == Function) && strlen(mqtt_data)) {
+ if (D_DECIMAL_SEPARATOR[0] != '.') {
+ for (int i = 0; i < strlen(mqtt_data); i++) {
+ if ('.' == mqtt_data[i]) {
+ mqtt_data[i] = D_DECIMAL_SEPARATOR[0];
+ }
+ }
+ }
+ WebServer->sendContent(mqtt_data);
+ }
}
return result;