andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix sensor output on error

Browse Source
This commit is contained in:
MichaelDvP
2020-10-22 12:05:05 +02:00
parent 28f989ef36
commit 16300b6070
3 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/project/EMSESPtypes.ts
View File

@@ -45,7 +45,7 @@ export interface Device {
export interface Sensor { export interface Sensor {
no: number; no: number;
id: string; id: string;
temp: number; temp: string;
} }
export interface EMSESPDevices { export interface EMSESPDevices {

3
src/EMSESPDevicesService.cpp
View File

@@ -65,11 +65,12 @@ void EMSESPDevicesService::all_devices(AsyncWebServerRequest * request) {
JsonArray sensors = root.createNestedArray("sensors"); JsonArray sensors = root.createNestedArray("sensors");
if (!EMSESP::sensor_devices().empty()) { if (!EMSESP::sensor_devices().empty()) {
uint8_t i = 1; uint8_t i = 1;
char s[8];
for (const auto & sensor : EMSESP::sensor_devices()) { for (const auto & sensor : EMSESP::sensor_devices()) {
JsonObject obj = sensors.createNestedObject(); JsonObject obj = sensors.createNestedObject();
obj["no"] = i++; obj["no"] = i++;
obj["id"] = sensor.to_string(); obj["id"] = sensor.to_string();
obj["temp"] = (float)(sensor.temperature_c) / 10; obj["temp"] = Helpers::render_value(s, sensor.temperature_c, 10);
} }
} }

36
src/sensor.cpp
View File

@@ -295,13 +295,13 @@ bool Sensor::export_values(JsonObject & output) {
} }
uint8_t i = 1; // sensor count uint8_t i = 1; // sensor count
for (const auto & device : devices_) { for (const auto & device : devices_) {
char s[7];
char sensorID[10]; // sensor{1-n} char sensorID[10]; // sensor{1-n}
snprintf_P(sensorID, 10, PSTR("sensor%d"), i); snprintf_P(sensorID, 10, PSTR("sensor%d"), i++);
JsonObject dataSensor = output.createNestedObject(sensorID); JsonObject dataSensor = output.createNestedObject(sensorID);
dataSensor["id"] = device.to_string(); dataSensor["id"] = device.to_string();
dataSensor["temp"] = Helpers::render_value(s, device.temperature_c, 10); if (Helpers::hasValue(device.temperature_c)) {
i++; dataSensor["temp"] = (float)(device.temperature_c) / 10;
}
} }
return true; return true;
@@ -316,43 +316,31 @@ void Sensor::publish_values() {
return; return;
} }
uint8_t mqtt_format_ = Mqtt::mqtt_format();
/*
// single mode as one topic per sensor e.g. ems-esp/sensor_data1 = 20.2
if (mqtt_format_ == Mqtt::Format::SINGLE) {
uint8_t i = 1;
for (const auto & device : devices_) {
char topic[20];
snprintf_P(topic, 20, PSTR("sensor_data%d"), i);
char s[7]; // to support -55.00 to 125.00
Mqtt::publish(topic, Helpers::render_value(s, device.temperature_c, 10));
i++;
}
return;
}
*/
DynamicJsonDocument doc(100 * num_devices); DynamicJsonDocument doc(100 * num_devices);
uint8_t sensor_no = 1; // sensor count uint8_t sensor_no = 1; // sensor count
uint8_t mqtt_format_ = Mqtt::mqtt_format();
for (const auto & device : devices_) { for (const auto & device : devices_) {
char sensorID[10]; // sensor{1-n} char sensorID[10]; // sensor{1-n}
snprintf_P(sensorID, 10, PSTR("sensor%d"), sensor_no); snprintf_P(sensorID, 10, PSTR("sensor%d"), sensor_no);
if (mqtt_format_ == Mqtt::Format::SINGLE) { if (mqtt_format_ == Mqtt::Format::SINGLE) {
// e.g. sensor_data = {"sensor1":23.3,"sensor2":24.0} // e.g. sensor_data = {"sensor1":23.3,"sensor2":24.0}
// doc[sensorID] = Helpers::render_value(s, device.temperature_c, 10); if (Helpers::hasValue(device.temperature_c)) {
doc[sensorID] = (float)(device.temperature_c) / 10; doc[sensorID] = (float)(device.temperature_c) / 10;
}
} else if (mqtt_format_ == Mqtt::Format::NESTED) { } else if (mqtt_format_ == Mqtt::Format::NESTED) {
// e.g. sensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":"23.3"},"sensor2":{"id":"28-233D-9497-0C03","temp":"24.0"}} // e.g. sensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":"23.3"},"sensor2":{"id":"28-233D-9497-0C03","temp":"24.0"}}
JsonObject dataSensor = doc.createNestedObject(sensorID); JsonObject dataSensor = doc.createNestedObject(sensorID);
dataSensor["id"] = device.to_string(); dataSensor["id"] = device.to_string();
// dataSensor["temp"] = Helpers::render_value(s, device.temperature_c, 10); if (Helpers::hasValue(device.temperature_c)) {
dataSensor["temp"] = (float)(device.temperature_c) / 10; dataSensor["temp"] = (float)(device.temperature_c) / 10;
}
} else if (mqtt_format_ == Mqtt::Format::HA) { } else if (mqtt_format_ == Mqtt::Format::HA) {
// e.g. sensor_data = {"28-EA41-9497-0E03":23.3,"28-233D-9497-0C03":24.0} // e.g. sensor_data = {"sensor1":{"id":"28-EA41-9497-0E03","temp":"23.3"},"sensor2":{"id":"28-233D-9497-0C03","temp":"24.0"}}
// doc[device.to_string()] = Helpers::render_value(s, device.temperature_c, 10);
JsonObject dataSensor = doc.createNestedObject(sensorID); JsonObject dataSensor = doc.createNestedObject(sensorID);
dataSensor["id"] = device.to_string(); dataSensor["id"] = device.to_string();
if (Helpers::hasValue(device.temperature_c)) {
dataSensor["temp"] = (float)(device.temperature_c) / 10; dataSensor["temp"] = (float)(device.temperature_c) / 10;
}
// create the config if this hasn't already been done // create the config if this hasn't already been done
// to e.g. homeassistant/sensor/ems-esp/dallas_28-233D-9497-0C03/config // to e.g. homeassistant/sensor/ems-esp/dallas_28-233D-9497-0C03/config
if (!(registered_ha_[sensor_no - 1])) { if (!(registered_ha_[sensor_no - 1])) {