| Emulation | ");
#ifdef USE_EMULATION
- if (EMUL_WEMO == sysCfg.emulation) {
+ if (EMUL_WEMO == sysCfg.flag.emulation) {
page += F("Belkin WeMo");
}
- else if (EMUL_HUE == sysCfg.emulation) {
+ else if (EMUL_HUE == sysCfg.flag.emulation) {
page += F("Hue Bridge");
}
else {
@@ -1556,7 +1556,7 @@ void handleNotFound()
#ifdef USE_EMULATION
String path = webServer->uri();
- if ((EMUL_HUE == sysCfg.emulation) && (path.startsWith("/api"))) {
+ if ((EMUL_HUE == sysCfg.flag.emulation) && (path.startsWith("/api"))) {
handle_hue_api(&path);
} else
#endif // USE_EMULATION
diff --git a/sonoff/xdrv_snfsc.ino b/sonoff/xdrv_snfsc.ino
index 88d22264b..892eb31eb 100644
--- a/sonoff/xdrv_snfsc.ino
+++ b/sonoff/xdrv_snfsc.ino
@@ -111,13 +111,10 @@ void sc_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
char stemp1[10];
char stemp2[10];
- float t = sc_value[1];
- if (TEMP_CONVERSION) {
- t = sc_convertCtoF(t);
- }
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp1);
+ float t = convertTemp(sc_value[1]);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp1);
float h = sc_value[0];
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp2);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp2);
// snprintf_P(svalue, ssvalue, PSTR("%s, \"SC\":{\"Temperature\":%s, \"Humidity\":%s, \"Light\":%d, \"Noise\":%d, \"AirQuality\":%d}"),
snprintf_P(svalue, ssvalue, PSTR("%s, \"Temperature\":%s, \"Humidity\":%s, \"Light\":%d, \"Noise\":%d, \"AirQuality\":%d"),
svalue, stemp1, stemp2, sc_value[2], sc_value[3], sc_value[4]);
@@ -139,15 +136,12 @@ String sc_webPresent()
char sensor[80];
char scstype[] = "";
- float t = sc_value[1];
- if (TEMP_CONVERSION) {
- t = sc_convertCtoF(t);
- }
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, scstype, stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ float t = convertTemp(sc_value[1]);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, scstype, stemp, tempUnit());
page += sensor;
float h = sc_value[0];
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp);
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, scstype, stemp);
page += sensor;
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_LIGHT, scstype, sc_value[2]);
diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino
index 5092ea6d0..b7e1b9e2c 100644
--- a/sonoff/xdrv_wemohue.ino
+++ b/sonoff/xdrv_wemohue.ino
@@ -214,10 +214,10 @@ void pollUDP()
String request = packetBuffer;
// addLog_P(LOG_LEVEL_DEBUG_MORE, packetBuffer);
if (request.indexOf("M-SEARCH") >= 0) {
- if ((EMUL_WEMO == sysCfg.emulation) &&(request.indexOf("urn:Belkin:device:**") > 0)) {
+ if ((EMUL_WEMO == sysCfg.flag.emulation) &&(request.indexOf("urn:Belkin:device:**") > 0)) {
wemo_respondToMSearch();
}
- else if ((EMUL_HUE == sysCfg.emulation) && ((request.indexOf("ST: urn:schemas-upnp-org:device:basic:1") > 0) || (request.indexOf("ST: upnp:rootdevice") > 0) || (request.indexOf("ST: ssdp:all") > 0))) {
+ else if ((EMUL_HUE == sysCfg.flag.emulation) && ((request.indexOf("ST: urn:schemas-upnp-org:device:basic:1") > 0) || (request.indexOf("ST: upnp:rootdevice") > 0) || (request.indexOf("ST: ssdp:all") > 0))) {
hue_respondToMSearch();
}
}
diff --git a/sonoff/xsns_bmp.ino b/sonoff/xsns_bmp.ino
index 391cba0a2..adf9a47c6 100644
--- a/sonoff/xsns_bmp.ino
+++ b/sonoff/xsns_bmp.ino
@@ -351,12 +351,7 @@ double bme280_readHumidity(void)
* BMP
\*********************************************************************************************/
-double bmp_convertCtoF(double c)
-{
- return c * 1.8 + 32;
-}
-
-double bmp_readTemperature(bool S)
+double bmp_readTemperature(void)
{
double t = NAN;
@@ -369,9 +364,7 @@ double bmp_readTemperature(bool S)
t = bmp280_readTemperature();
}
if (!isnan(t)) {
- if (S) {
- t = bmp_convertCtoF(t);
- }
+ t = convertTemp(t);
return t;
}
return 0;
@@ -453,12 +446,12 @@ void bmp_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
char stemp2[10];
char stemp3[10];
- double t = bmp_readTemperature(TEMP_CONVERSION);
+ double t = bmp_readTemperature();
double p = bmp_readPressure();
double h = bmp_readHumidity();
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp1);
- dtostrf(p, 1, PRESSURE_RESOLUTION &3, stemp2);
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp3);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp1);
+ dtostrf(p, 1, sysCfg.flag.pressure_resolution, stemp2);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp3);
if (!strcmp(bmpstype,"BME280")) {
snprintf_P(svalue, ssvalue, PSTR("%s, \"%s\":{\"Temperature\":%s, \"Humidity\":%s, \"Pressure\":%s}"),
svalue, bmpstype, stemp1, stemp3, stemp2);
@@ -480,18 +473,18 @@ String bmp_webPresent()
char stemp[10];
char sensor[80];
- double t_bmp = bmp_readTemperature(TEMP_CONVERSION);
+ double t_bmp = bmp_readTemperature();
double p_bmp = bmp_readPressure();
double h_bmp = bmp_readHumidity();
- dtostrf(t_bmp, 1, TEMP_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, bmpstype, stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ dtostrf(t_bmp, 1, sysCfg.flag.temperature_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, bmpstype, stemp, tempUnit());
page += sensor;
if (!strcmp(bmpstype,"BME280")) {
- dtostrf(h_bmp, 1, HUMIDITY_RESOLUTION &3, stemp);
+ dtostrf(h_bmp, 1, sysCfg.flag.humidity_resolution, stemp);
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, bmpstype, stemp);
page += sensor;
}
- dtostrf(p_bmp, 1, PRESSURE_RESOLUTION &3, stemp);
+ dtostrf(p_bmp, 1, sysCfg.flag.pressure_resolution, stemp);
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_PRESSURE, bmpstype, stemp);
page += sensor;
}
diff --git a/sonoff/xsns_dht.ino b/sonoff/xsns_dht.ino
index d391bad1b..3b130b91a 100644
--- a/sonoff/xsns_dht.ino
+++ b/sonoff/xsns_dht.ino
@@ -32,71 +32,80 @@ POSSIBILITY OF SUCH DAMAGE.
* Source: Adafruit Industries https://github.com/adafruit/DHT-sensor-library
\*********************************************************************************************/
-#define MIN_INTERVAL 2000
+#define DHT_MAX_SENSORS 3
+#define MIN_INTERVAL 2000
-uint8_t data[5];
-char dhtstype[7];
-uint32_t _lastreadtime;
-uint32_t _maxcycles;
-bool _lastresult;
-float mt;
-float mh = 0;
+uint32_t dht_maxcycles;
+uint8_t dht_data[5];
+byte dht_sensors = 0;
+
+struct DHTSTRUCT {
+ byte pin;
+ byte type;
+ char stype[10];
+ uint32_t lastreadtime;
+ bool lastresult;
+ float t;
+ float h = 0;
+} dht[DHT_MAX_SENSORS];
void dht_readPrep()
{
- digitalWrite(pin[GPIO_DHT11], HIGH);
+ for (byte i = 0; i < dht_sensors; i++) {
+ digitalWrite(dht[i].pin, HIGH);
+ }
}
-uint32_t dht_expectPulse(bool level)
+uint32_t dht_expectPulse(byte sensor, bool level)
{
uint32_t count = 0;
- while (digitalRead(pin[GPIO_DHT11]) == level) {
- if (count++ >= _maxcycles) {
+ while (digitalRead(dht[sensor].pin) == level) {
+ if (count++ >= dht_maxcycles) {
return 0;
}
}
return count;
}
-boolean dht_read()
+boolean dht_read(byte sensor)
{
char log[LOGSZ];
uint32_t cycles[80];
uint32_t currenttime = millis();
- if ((currenttime - _lastreadtime) < 2000) {
- return _lastresult;
+ if ((currenttime - dht[sensor].lastreadtime) < 2000) {
+ return dht[sensor].lastresult;
}
- _lastreadtime = currenttime;
+ dht[sensor].lastreadtime = currenttime;
- data[0] = data[1] = data[2] = data[3] = data[4] = 0;
+ dht_data[0] = dht_data[1] = dht_data[2] = dht_data[3] = dht_data[4] = 0;
-// digitalWrite(pin[GPIO_DHT11], HIGH);
+// digitalWrite(dht[sensor].pin, HIGH);
// delay(250);
- pinMode(pin[GPIO_DHT11], OUTPUT);
- digitalWrite(pin[GPIO_DHT11], LOW);
+ pinMode(dht[sensor].pin, OUTPUT);
+ digitalWrite(dht[sensor].pin, LOW);
delay(20);
noInterrupts();
- digitalWrite(pin[GPIO_DHT11], HIGH);
+ digitalWrite(dht[sensor].pin, HIGH);
delayMicroseconds(40);
- pinMode(pin[GPIO_DHT11], INPUT_PULLUP);
+ pinMode(dht[sensor].pin, INPUT_PULLUP);
delayMicroseconds(10);
- if (0 == dht_expectPulse(LOW)) {
+ if (0 == dht_expectPulse(sensor, LOW)) {
addLog_P(LOG_LEVEL_DEBUG, PSTR("DHT: Timeout waiting for start signal low pulse"));
- _lastresult = false;
- return _lastresult;
+ dht[sensor].lastresult = false;
+ return dht[sensor].lastresult;
}
- if (0 == dht_expectPulse(HIGH)) {
+ if (0 == dht_expectPulse(sensor, HIGH)) {
addLog_P(LOG_LEVEL_DEBUG, PSTR("DHT: Timeout waiting for start signal high pulse"));
- _lastresult = false;
- return _lastresult;
+ dht[sensor].lastresult = false;
+ return dht[sensor].lastresult;
}
for (int i = 0; i < 80; i += 2) {
- cycles[i] = dht_expectPulse(LOW);
- cycles[i+1] = dht_expectPulse(HIGH);
+ cycles[i] = dht_expectPulse(sensor, LOW);
+ cycles[i+1] = dht_expectPulse(sensor, HIGH);
}
interrupts();
@@ -105,101 +114,105 @@ boolean dht_read()
uint32_t highCycles = cycles[2*i+1];
if ((0 == lowCycles) || (0 == highCycles)) {
addLog_P(LOG_LEVEL_DEBUG, PSTR("DHT: Timeout waiting for pulse"));
- _lastresult = false;
- return _lastresult;
+ dht[sensor].lastresult = false;
+ return dht[sensor].lastresult;
}
- data[i/8] <<= 1;
+ dht_data[i/8] <<= 1;
if (highCycles > lowCycles) {
- data[i/8] |= 1;
+ dht_data[i/8] |= 1;
}
}
snprintf_P(log, sizeof(log), PSTR("DHT: Received %02X, %02X, %02X, %02X, %02X =? %02X"),
- data[0], data[1], data[2], data[3], data[4], (data[0] + data[1] + data[2] + data[3]) & 0xFF);
+ dht_data[0], dht_data[1], dht_data[2], dht_data[3], dht_data[4], (dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF);
addLog(LOG_LEVEL_DEBUG, log);
- if (data[4] == ((data[0] + data[1] + data[2] + data[3]) & 0xFF)) {
- _lastresult = true;
- return _lastresult;
+ if (dht_data[4] == ((dht_data[0] + dht_data[1] + dht_data[2] + dht_data[3]) & 0xFF)) {
+ dht[sensor].lastresult = true;
} else {
addLog_P(LOG_LEVEL_DEBUG, PSTR("DHT: Checksum failure"));
- _lastresult = false;
- return _lastresult;
+ dht[sensor].lastresult = false;
}
+ return dht[sensor].lastresult;
}
-float dht_convertCtoF(float c)
+boolean dht_readTempHum(byte sensor, float &t, float &h)
{
- return c * 1.8 + 32;
-}
-
-boolean dht_readTempHum(bool S, float &t, float &h)
-{
- if (!mh) {
+ if (!dht[sensor].h) {
t = NAN;
h = NAN;
} else {
- t = mt;
- h = mh;
+ t = dht[sensor].t;
+ h = dht[sensor].h;
}
- if (dht_read()) {
- switch (dht_type) {
+ if (dht_read(sensor)) {
+ switch (dht[sensor].type) {
case GPIO_DHT11:
- h = data[0];
- t = data[2];
- if (S) {
- t = dht_convertCtoF(t);
- }
+ h = dht_data[0];
+ t = convertTemp(dht_data[2]);
break;
case GPIO_DHT22:
case GPIO_DHT21:
- h = data[0];
+ h = dht_data[0];
h *= 256;
- h += data[1];
+ h += dht_data[1];
h *= 0.1;
- t = data[2] & 0x7F;
+ t = dht_data[2] & 0x7F;
t *= 256;
- t += data[3];
+ t += dht_data[3];
t *= 0.1;
- if (data[2] & 0x80) {
+ if (dht_data[2] & 0x80) {
t *= -1;
}
- if (S) {
- t = dht_convertCtoF(t);
- }
+ t = convertTemp(t);
break;
}
if (!isnan(t)) {
- mt = t;
+ dht[sensor].t = t;
}
if (!isnan(h)) {
- mh = h;
+ dht[sensor].h = h;
}
}
return (!isnan(t) && !isnan(h));
}
+boolean dht_setup(byte pin, byte type)
+{
+ boolean success = false;
+
+ if (dht_sensors < DHT_MAX_SENSORS) {
+ dht[dht_sensors].pin = pin;
+ dht[dht_sensors].type = type;
+ dht_sensors++;
+ success = true;
+ }
+ return success;
+}
+
void dht_init()
{
char log[LOGSZ];
- _maxcycles = microsecondsToClockCycles(1000); // 1 millisecond timeout for
- // reading pulses from DHT sensor.
- pinMode(pin[GPIO_DHT11], INPUT_PULLUP);
- _lastreadtime = -MIN_INTERVAL;
- switch (dht_type) {
- case GPIO_DHT11:
- strcpy(dhtstype, "DHT11");
- break;
- case GPIO_DHT21:
- strcpy(dhtstype, "AM2301");
- break;
- case GPIO_DHT22:
- strcpy(dhtstype, "DHT22");
+ dht_maxcycles = microsecondsToClockCycles(1000); // 1 millisecond timeout for reading pulses from DHT sensor.
+
+ for (byte i = 0; i < dht_sensors; i++) {
+ pinMode(dht[i].pin, INPUT_PULLUP);
+ dht[i].lastreadtime = -MIN_INTERVAL;
+ switch (dht[i].type) {
+ case GPIO_DHT11:
+ snprintf_P(dht[i].stype, sizeof(dht[i].stype), PSTR("DHT11-%02d"), dht[i].pin);
+ break;
+ case GPIO_DHT21:
+ snprintf_P(dht[i].stype, sizeof(dht[i].stype), PSTR("AM2301-%02d"), dht[i].pin);
+ break;
+ case GPIO_DHT22:
+ snprintf_P(dht[i].stype, sizeof(dht[i].stype), PSTR("DHT22-%02d"), dht[i].pin);
+ }
}
-
- snprintf_P(log, sizeof(log), PSTR("DHT: Max clock cycles %d"), _maxcycles);
+
+ snprintf_P(log, sizeof(log), PSTR("DHT: Max clock cycles %d"), dht_maxcycles);
addLog(LOG_LEVEL_DEBUG, log);
}
@@ -214,16 +227,22 @@ void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
float t;
float h;
- if (dht_readTempHum(TEMP_CONVERSION, t, h)) { // Read temperature
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp1);
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp2);
-// snprintf_P(svalue, ssvalue, PSTR("%s, \"%s\":{\"Temperature\":%s, \"Humidity\":%s}"),
-// svalue, dhtstype, stemp1, stemp2);
- snprintf_P(svalue, ssvalue, JSON_SNS_TEMPHUM, svalue, dhtstype, stemp1, stemp2);
- *djson = 1;
+ byte dsxflg = 0;
+ for (byte i = 0; i < dht_sensors; i++) {
+ if (dht_readTempHum(i, t, h)) { // Read temperature
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp1);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp2);
+// snprintf_P(svalue, ssvalue, PSTR("%s, \"%s\":{\"Temperature\":%s, \"Humidity\":%s}"),
+// svalue, dhtstype, stemp1, stemp2);
+ snprintf_P(svalue, ssvalue, JSON_SNS_TEMPHUM, svalue, dht[i].stype, stemp1, stemp2);
+ *djson = 1;
#ifdef USE_DOMOTICZ
- domoticz_sensor2(stemp1, stemp2);
+ if (!dsxflg) {
+ domoticz_sensor2(stemp1, stemp2);
+ dsxflg++;
+ }
#endif // USE_DOMOTICZ
+ }
}
}
@@ -231,20 +250,20 @@ void dht_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
String dht_webPresent()
{
String page = "";
+ char stemp[10];
+ char sensor[80];
float t;
float h;
- if (dht_readTempHum(TEMP_CONVERSION, t, h)) { // Read temperature as Celsius (the default)
- char stemp[10];
- char sensor[80];
-
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, dhtstype, stemp, (TEMP_CONVERSION) ? 'F' : 'C');
- page += sensor;
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, dhtstype, stemp);
- page += sensor;
-
+ for (byte i = 0; i < dht_sensors; i++) {
+ if (dht_readTempHum(i, t, h)) {
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, dht[i].stype, stemp, tempUnit());
+ page += sensor;
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, dht[i].stype, stemp);
+ page += sensor;
+ }
}
return page;
}
diff --git a/sonoff/xsns_ds18b20.ino b/sonoff/xsns_ds18b20.ino
index b84ff0857..0c24e962e 100644
--- a/sonoff/xsns_ds18b20.ino
+++ b/sonoff/xsns_ds18b20.ino
@@ -129,12 +129,7 @@ void dsb_readTempPrep()
dsb_write(0x44); // Start conversion
}
-float dsb_convertCtoF(float c)
-{
- return c * 1.8 + 32;
-}
-
-boolean dsb_readTemp(bool S, float &t)
+boolean dsb_readTemp(float &t)
{
int16_t DSTemp;
byte msb, lsb, crc, sign = 1;
@@ -178,10 +173,7 @@ boolean dsb_readTemp(bool S, float &t)
DSTemp = (~DSTemp) +1;
sign = -1;
}
- t = (float)sign * DSTemp * 0.0625;
- if(S) {
- t = dsb_convertCtoF(t);
- }
+ t = convertTemp((float)sign * DSTemp * 0.0625);
}
if (!isnan(t)) dsb_mt = t;
return !isnan(t);
@@ -196,8 +188,8 @@ void dsb_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
char stemp1[10];
float t;
- if (dsb_readTemp(TEMP_CONVERSION, t)) { // Check if read failed
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp1);
+ if (dsb_readTemp(t)) { // Check if read failed
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp1);
snprintf_P(svalue, ssvalue, PSTR("%s, \"DS18B20\":{\"Temperature\":%s}"), svalue, stemp1);
*djson = 1;
#ifdef USE_DOMOTICZ
@@ -213,12 +205,12 @@ String dsb_webPresent()
String page = "";
float st;
- if (dsb_readTemp(TEMP_CONVERSION, st)) { // Check if read failed
+ if (dsb_readTemp(st)) { // Check if read failed
char stemp[10];
char sensor[80];
- dtostrf(st, 1, TEMP_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, "DS18B20", stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ dtostrf(st, 1, sysCfg.flag.temperature_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, "DS18B20", stemp, tempUnit());
page += sensor;
}
dsb_readTempPrep();
diff --git a/sonoff/xsns_ds18x20.ino b/sonoff/xsns_ds18x20.ino
index 8afc60863..4eef3f685 100644
--- a/sonoff/xsns_ds18x20.ino
+++ b/sonoff/xsns_ds18x20.ino
@@ -107,12 +107,7 @@ void ds18x20_convert()
// delay(750); // 750ms should be enough for 12bit conv
}
-float ds18x20_convertCtoF(float c)
-{
- return c * 1.8 + 32;
-}
-
-boolean ds18x20_read(uint8_t sensor, bool S, float &t)
+boolean ds18x20_read(uint8_t sensor, float &t)
{
byte data[12];
int8_t sign = 1;
@@ -155,10 +150,7 @@ boolean ds18x20_read(uint8_t sensor, bool S, float &t)
} else {
temp9 = (data[0] >> 1) * sign;
}
- t = (temp9 - 0.25) + ((16.0 - data[6]) / 16.0);
- if(S) {
- t = ds18x20_convertCtoF(t);
- }
+ t = convertTemp((temp9 - 0.25) + ((16.0 - data[6]) / 16.0));
break;
case DS18B20_CHIPID: // DS18B20
case MAX31850_CHIPID: // MAX31850
@@ -167,10 +159,7 @@ boolean ds18x20_read(uint8_t sensor, bool S, float &t)
temp12 = (~temp12) +1;
sign = -1;
}
- t = sign * temp12 * 0.0625;
- if(S) {
- t = ds18x20_convertCtoF(t);
- }
+ t = convertTemp(sign * temp12 * 0.0625);
break;
}
}
@@ -205,9 +194,9 @@ void ds18x20_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
byte dsxflg = 0;
for (byte i = 0; i < ds18x20_sensors(); i++) {
- if (ds18x20_read(i, TEMP_CONVERSION, t)) { // Check if read failed
+ if (ds18x20_read(i, t)) { // Check if read failed
ds18x20_type(i);
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp2);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp2);
if (!dsxflg) {
snprintf_P(svalue, ssvalue, PSTR("%s, \"DS18x20\":{"), svalue);
*djson = 1;
@@ -237,11 +226,11 @@ String ds18x20_webPresent()
float t;
for (byte i = 0; i < ds18x20_sensors(); i++) {
- if (ds18x20_read(i, TEMP_CONVERSION, t)) { // Check if read failed
+ if (ds18x20_read(i, t)) { // Check if read failed
ds18x20_type(i);
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp);
snprintf_P(stemp2, sizeof(stemp2), PSTR("%s-%d"), dsbstype, i +1);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, stemp2, stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, stemp2, stemp, tempUnit());
page += sensor;
}
}
diff --git a/sonoff/xsns_hlw8012.ino b/sonoff/xsns_hlw8012.ino
index 340c6cb71..4f18f0fb0 100644
--- a/sonoff/xsns_hlw8012.ino
+++ b/sonoff/xsns_hlw8012.ino
@@ -375,7 +375,7 @@ void hlw_margin_chk()
} else {
hlw_mplh_counter--;
if (!hlw_mplh_counter) {
- snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxPowerReached\":\"%d%s\"}"), pw, (sysCfg.value_units) ? " W" : "");
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxPowerReached\":\"%d%s\"}"), pw, (sysCfg.flag.value_units) ? " W" : "");
mqtt_publish_topic_P(0, PSTR("WARNING"), svalue);
do_cmnd_power(1, 0);
if (!hlw_mplr_counter) {
@@ -421,7 +421,7 @@ void hlw_margin_chk()
else if ((1 == hlw_mkwh_state) && (uped >= sysCfg.hlw_mkwh)) {
hlw_mkwh_state = 2;
dtostrf(ped, 1, 3, svalue);
- snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxEnergyReached\":\"%s%s\"}"), svalue, (sysCfg.value_units) ? " kWh" : "");
+ snprintf_P(svalue, sizeof(svalue), PSTR("{\"MaxEnergyReached\":\"%s%s\"}"), svalue, (sysCfg.flag.value_units) ? " kWh" : "");
mqtt_publish_topic_P(0, PSTR("WARNING"), svalue);
do_cmnd_power(1, 0);
}
@@ -441,105 +441,105 @@ boolean hlw_command(char *type, uint16_t index, char *dataBuf, uint16_t data_len
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_pmin = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"PowerLow\":\"%d%s\"}"), sysCfg.hlw_pmin, (sysCfg.value_units) ? " W" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"PowerLow\":\"%d%s\"}"), sysCfg.hlw_pmin, (sysCfg.flag.value_units) ? " W" : "");
}
else if (!strcmp_P(type,PSTR("POWERHIGH"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_pmax = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"PowerHigh\":\"%d%s\"}"), sysCfg.hlw_pmax, (sysCfg.value_units) ? " W" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"PowerHigh\":\"%d%s\"}"), sysCfg.hlw_pmax, (sysCfg.flag.value_units) ? " W" : "");
}
else if (!strcmp_P(type,PSTR("VOLTAGELOW"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 501)) {
sysCfg.hlw_umin = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"VoltageLow\":\"%d%s\"}"), sysCfg.hlw_umin, (sysCfg.value_units) ? " V" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"VoltageLow\":\"%d%s\"}"), sysCfg.hlw_umin, (sysCfg.flag.value_units) ? " V" : "");
}
else if (!strcmp_P(type,PSTR("VOLTAGEHIGH"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 501)) {
sysCfg.hlw_umax = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("[\"VoltageHigh\":\"%d%s\"}"), sysCfg.hlw_umax, (sysCfg.value_units) ? " V" : "");
+ snprintf_P(svalue, ssvalue, PSTR("[\"VoltageHigh\":\"%d%s\"}"), sysCfg.hlw_umax, (sysCfg.flag.value_units) ? " V" : "");
}
else if (!strcmp_P(type,PSTR("CURRENTLOW"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 16001)) {
sysCfg.hlw_imin = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"CurrentLow\":\"%d%s\"}"), sysCfg.hlw_imin, (sysCfg.value_units) ? " mA" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"CurrentLow\":\"%d%s\"}"), sysCfg.hlw_imin, (sysCfg.flag.value_units) ? " mA" : "");
}
else if (!strcmp_P(type,PSTR("CURRENTHIGH"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 16001)) {
sysCfg.hlw_imax = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"CurrentHigh\":\"%d%s\"}"), sysCfg.hlw_imax, (sysCfg.value_units) ? " mA" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"CurrentHigh\":\"%d%s\"}"), sysCfg.hlw_imax, (sysCfg.flag.value_units) ? " mA" : "");
}
else if (!strcmp_P(type,PSTR("HLWPCAL"))) {
if ((data_len > 0) && (payload > 0) && (payload < 32001)) {
sysCfg.hlw_pcal = (payload > 9999) ? payload : HLW_PREF_PULSE; // 12530
}
- snprintf_P(svalue, ssvalue, PSTR("(\"HlwPcal\":\"%d%s\"}"), sysCfg.hlw_pcal, (sysCfg.value_units) ? " uS" : "");
+ snprintf_P(svalue, ssvalue, PSTR("(\"HlwPcal\":\"%d%s\"}"), sysCfg.hlw_pcal, (sysCfg.flag.value_units) ? " uS" : "");
}
else if (!strcmp_P(type,PSTR("HLWUCAL"))) {
if ((data_len > 0) && (payload > 0) && (payload < 32001)) {
sysCfg.hlw_ucal = (payload > 999) ? payload : HLW_UREF_PULSE; // 1950
}
- snprintf_P(svalue, ssvalue, PSTR("{\"HlwUcal\":\"%d%s\"}"), sysCfg.hlw_ucal, (sysCfg.value_units) ? " uS" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"HlwUcal\":\"%d%s\"}"), sysCfg.hlw_ucal, (sysCfg.flag.value_units) ? " uS" : "");
}
else if (!strcmp_P(type,PSTR("HLWICAL"))) {
if ((data_len > 0) && (payload > 0) && (payload < 32001)) {
sysCfg.hlw_ical = (payload > 2499) ? payload : HLW_IREF_PULSE; // 3500
}
- snprintf_P(svalue, ssvalue, PSTR("{\"HlwIcal\":\"%d%s\"}"), sysCfg.hlw_ical, (sysCfg.value_units) ? " uS" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"HlwIcal\":\"%d%s\"}"), sysCfg.hlw_ical, (sysCfg.flag.value_units) ? " uS" : "");
}
#if FEATURE_POWER_LIMIT
else if (!strcmp_P(type,PSTR("MAXPOWER"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_mpl = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"MaxPower\":\"%d%s\"}"), sysCfg.hlw_mpl, (sysCfg.value_units) ? " W" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"MaxPower\":\"%d%s\"}"), sysCfg.hlw_mpl, (sysCfg.flag.value_units) ? " W" : "");
}
else if (!strcmp_P(type,PSTR("MAXPOWERHOLD"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_mplh = (1 == payload) ? MAX_POWER_HOLD : payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"MaxPowerHold\":\"%d%s\"}"), sysCfg.hlw_mplh, (sysCfg.value_units) ? " Sec" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"MaxPowerHold\":\"%d%s\"}"), sysCfg.hlw_mplh, (sysCfg.flag.value_units) ? " Sec" : "");
}
else if (!strcmp_P(type,PSTR("MAXPOWERWINDOW"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_mplw = (1 == payload) ? MAX_POWER_WINDOW : payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"MaxPowerWindow\":\"%d%s\"}"), sysCfg.hlw_mplw, (sysCfg.value_units) ? " Sec" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"MaxPowerWindow\":\"%d%s\"}"), sysCfg.hlw_mplw, (sysCfg.flag.value_units) ? " Sec" : "");
}
else if (!strcmp_P(type,PSTR("SAFEPOWER"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_mspl = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"SafePower\":\"%d%s\"}"), sysCfg.hlw_mspl, (sysCfg.value_units) ? " W" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"SafePower\":\"%d%s\"}"), sysCfg.hlw_mspl, (sysCfg.flag.value_units) ? " W" : "");
}
else if (!strcmp_P(type,PSTR("SAFEPOWERHOLD"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_msplh = (1 == payload) ? SAFE_POWER_HOLD : payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"SafePowerHold\":\"%d%s\"}"), sysCfg.hlw_msplh, (sysCfg.value_units) ? " Sec" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"SafePowerHold\":\"%d%s\"}"), sysCfg.hlw_msplh, (sysCfg.flag.value_units) ? " Sec" : "");
}
else if (!strcmp_P(type,PSTR("SAFEPOWERWINDOW"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 1440)) {
sysCfg.hlw_msplw = (1 == payload) ? SAFE_POWER_WINDOW : payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"SafePowerWindow\":\"%d%s\"}"), sysCfg.hlw_msplw, (sysCfg.value_units) ? " Min" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"SafePowerWindow\":\"%d%s\"}"), sysCfg.hlw_msplw, (sysCfg.flag.value_units) ? " Min" : "");
}
else if (!strcmp_P(type,PSTR("MAXENERGY"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 3601)) {
sysCfg.hlw_mkwh = payload;
hlw_mkwh_state = 3;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"MaxEnergy\":\"%d%s\"}"), sysCfg.hlw_mkwh, (sysCfg.value_units) ? " Wh" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"MaxEnergy\":\"%d%s\"}"), sysCfg.hlw_mkwh, (sysCfg.flag.value_units) ? " Wh" : "");
}
else if (!strcmp_P(type,PSTR("MAXENERGYSTART"))) {
if ((data_len > 0) && (payload >= 0) && (payload < 24)) {
sysCfg.hlw_mkwhs = payload;
}
- snprintf_P(svalue, ssvalue, PSTR("{\"MaxEnergyStart\":\"%d%s\"}"), sysCfg.hlw_mkwhs, (sysCfg.value_units) ? " Hr" : "");
+ snprintf_P(svalue, ssvalue, PSTR("{\"MaxEnergyStart\":\"%d%s\"}"), sysCfg.hlw_mkwhs, (sysCfg.flag.value_units) ? " Hr" : "");
}
#endif // FEATURE_POWER_LIMIT
else {
@@ -567,8 +567,8 @@ void hlw_mqttStat(byte option, char* svalue, uint16_t ssvalue)
uint16_t pu;
hlw_readEnergy(option, ped, pe, pw, pu, pi, pc);
- dtostrf((float)sysCfg.hlw_kWhyesterday / 100000000, 1, ENERGY_RESOLUTION &7, stemp0);
- dtostrf(ped, 1, ENERGY_RESOLUTION &7, stemp1);
+ dtostrf((float)sysCfg.hlw_kWhyesterday / 100000000, 1, sysCfg.flag.energy_resolution, stemp0);
+ dtostrf(ped, 1, sysCfg.flag.energy_resolution, stemp1);
dtostrf(pc, 1, 2, stemp2);
dtostrf(pi, 1, 3, stemp3);
snprintf_P(speriod, sizeof(speriod), PSTR(", \"Period\":%d"), pe);
@@ -625,8 +625,8 @@ String hlw_webPresent()
dtostrf(pi, 1, 3, stemp);
dtostrf(pc, 1, 2, stemp2);
- dtostrf(ped, 1, ENERGY_RESOLUTION &7, stemp3);
- dtostrf((float)sysCfg.hlw_kWhyesterday / 100000000, 1, ENERGY_RESOLUTION &7, stemp4);
+ dtostrf(ped, 1, sysCfg.flag.energy_resolution, stemp3);
+ dtostrf((float)sysCfg.hlw_kWhyesterday / 100000000, 1, sysCfg.flag.energy_resolution, stemp4);
snprintf_P(sensor, sizeof(sensor), HTTP_ENERGY_SNS, pu, stemp, pw, stemp2, stemp3, stemp4);
page += sensor;
return page;
diff --git a/sonoff/xsns_htu21.ino b/sonoff/xsns_htu21.ino
index fb943a710..03cf4976e 100644
--- a/sonoff/xsns_htu21.ino
+++ b/sonoff/xsns_htu21.ino
@@ -138,11 +138,6 @@ boolean htu21_init()
return true;
}
-float htu21_convertCtoF(float c)
-{
- return c * 1.8 + 32;
-}
-
float htu21_readHumidity(void)
{
uint8_t checksum = 0;
@@ -179,7 +174,7 @@ float htu21_readHumidity(void)
return humidity;
}
-float htu21_readTemperature(bool S)
+float htu21_readTemperature()
{
uint8_t checksum=0;
uint16_t sensorval=0;
@@ -202,10 +197,7 @@ float htu21_readTemperature(bool S)
return 0.0; // Checksum mismatch
}
- t = (0.002681 * (float)sensorval - 46.85);
- if(S) {
- t = htu21_convertCtoF(t);
- }
+ t = convertTemp(0.002681 * (float)sensorval - 46.85);
return t;
}
@@ -279,11 +271,11 @@ void htu_mqttPresent(char* svalue, uint16_t ssvalue, uint8_t* djson)
char stemp1[10];
char stemp2[10];
- float t = htu21_readTemperature(TEMP_CONVERSION);
+ float t = htu21_readTemperature();
float h = htu21_readHumidity();
h = htu21_compensatedHumidity(h, t);
- dtostrf(t, 1, TEMP_RESOLUTION &3, stemp1);
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, stemp2);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, stemp1);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, stemp2);
snprintf_P(svalue, ssvalue, JSON_SNS_TEMPHUM, svalue, htustype, stemp1, stemp2);
*djson = 1;
#ifdef USE_DOMOTICZ
@@ -299,13 +291,13 @@ String htu_webPresent()
char stemp[10];
char sensor[80];
- float t_htu21 = htu21_readTemperature(TEMP_CONVERSION);
+ float t_htu21 = htu21_readTemperature();
float h_htu21 = htu21_readHumidity();
h_htu21 = htu21_compensatedHumidity(h_htu21, t_htu21);
- dtostrf(t_htu21, 1, TEMP_RESOLUTION &3, stemp);
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, htustype, stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ dtostrf(t_htu21, 1, sysCfg.flag.temperature_resolution, stemp);
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, htustype, stemp, tempUnit());
page += sensor;
- dtostrf(h_htu21, 1, HUMIDITY_RESOLUTION &3, stemp);
+ dtostrf(h_htu21, 1, sysCfg.flag.humidity_resolution, stemp);
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, htustype, stemp);
page += sensor;
}
diff --git a/sonoff/xsns_sht1x.ino b/sonoff/xsns_sht1x.ino
index 7365c2fb9..4937d067f 100644
--- a/sonoff/xsns_sht1x.ino
+++ b/sonoff/xsns_sht1x.ino
@@ -161,9 +161,7 @@ boolean sht_readTempHum(float &t, float &h)
const float t2 = 0.00008;
rhLinear = c1 + c2 * humRaw + c3 * humRaw * humRaw;
h = (t - 25) * (t1 + t2 * humRaw) + rhLinear;
- if (!isnan(t) && TEMP_CONVERSION) {
- t = t * 1.8 + 32;
- }
+ t = convertTemp(t);
return (!isnan(t) && !isnan(h));
}
@@ -173,8 +171,8 @@ boolean sht_readCharTempHum(char* temp, char* hum)
float h;
boolean success = sht_readTempHum(t, h);
- dtostrf(t, 1, TEMP_RESOLUTION &3, temp);
- dtostrf(h, 1, HUMIDITY_RESOLUTION &3, hum);
+ dtostrf(t, 1, sysCfg.flag.temperature_resolution, temp);
+ dtostrf(h, 1, sysCfg.flag.humidity_resolution, hum);
return success;
}
@@ -231,7 +229,7 @@ String sht_webPresent()
if (sht_readCharTempHum(stemp, shum)) {
char sensor[80];
- snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, "SHT1X", stemp, (TEMP_CONVERSION) ? 'F' : 'C');
+ snprintf_P(sensor, sizeof(sensor), HTTP_SNS_TEMP, "SHT1X", stemp, tempUnit());
page += sensor;
snprintf_P(sensor, sizeof(sensor), HTTP_SNS_HUM, "SHT1X", shum);
page += sensor;
|
|---|