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

Merge pull request #685 from MichaelDvP/dev

Browse Source 
small fixes
This commit is contained in:
Proddy
2022-10-14 16:52:37 +02:00
committed by GitHub
parent e5e058672d 42f6bf6182
commit 52a8c7288d
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interface/src/api/mqtt.ts
View File

@@ -11,6 +11,6 @@ export function readMqttSettings(): AxiosPromise<MqttSettings> {
return AXIOS.get('/mqttSettings'); return AXIOS.get('/mqttSettings');
} }
export function updateMqttSettings(ntpSettings: MqttSettings): AxiosPromise<MqttSettings> { export function updateMqttSettings(mqttSettings: MqttSettings): AxiosPromise<MqttSettings> {
return AXIOS.post('/mqttSettings', ntpSettings); return AXIOS.post('/mqttSettings', mqttSettings);
} }

1
src/mqtt.cpp
View File

@@ -912,6 +912,7 @@ void Mqtt::publish_ha_sensor_config(DeviceValue & dv, const std::string & model,
dev_json["mf"] = brand; dev_json["mf"] = brand;
dev_json["mdl"] = model; dev_json["mdl"] = model;
dev_json["via_device"] = "ems-esp"; dev_json["via_device"] = "ems-esp";
free(cap_name);
} }
// calculate the min and max // calculate the min and max

6
src/telegram.h
View File

@@ -250,11 +250,7 @@ class RxService : public EMSbus {
if (telegram_error_count_ == 0) { if (telegram_error_count_ == 0) {
return 100; // all good, 100% return 100; // all good, 100%
} }
if (telegram_error_count_ >= telegram_count_) { uint8_t q = (telegram_error_count_ * 100 / (telegram_count_ + telegram_error_count_));
return 100;
}
uint8_t q = ((float)telegram_error_count_ / telegram_count_ * 100);
return (q <= EMS_BUS_QUALITY_RX_THRESHOLD ? 100 : 100 - q); return (q <= EMS_BUS_QUALITY_RX_THRESHOLD ? 100 : 100 - q);
} }