Quick fixes

Quick fixes
This commit is contained in:
Theo Arends 2018-10-29 11:30:36 +01:00
parent 06a068dc6b
commit ac00e6541a

View File

@ -541,17 +541,17 @@ void Bmp2xShow(boolean json)
name,
temperature,
(bmp2x_sensors[bmp2x_idx].bmp_model >= 2) ? json_humidity : "",
pressure, (Settings.altitude != 0) ? json_sealevel : "",
pressure,
(Settings.altitude != 0) ? json_sealevel : "",
(bmp2x_sensors[bmp2x_idx].bmp_model >= 3) ? json_gas : ""
);
#else
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"" D_JSON_TEMPERATURE "\":%s%s,\"" D_JSON_PRESSURE "\":%s%s}"),
mqtt_data, name, temperature, (bmp2x_sensors[bmp2x_idx].bmp_model >= 2) ? json_humidity : "", pressure, (Settings.altitude != 0) ? json_sealevel : "");
#endif // USE_BME680
#ifdef USE_DOMOTICZ
if (0 == tele_period) {
if ((0 == tele_period) && (0 == bmp2x_idx)) { // We want the same first sensor to report to Domoticz in case a read is missed
DomoticzTempHumPressureSensor(temperature, humidity, pressure);
#ifdef USE_BME680
if (bmp2x_sensors[bmp2x_idx].bmp_model >= 3) { DomoticzSensor(DZ_AIRQUALITY, (uint32_t)bmp2x_sensors[bmp2x_idx].bmp_gas_resistance); }