diff --git a/interface/src/api/mqtt.ts b/interface/src/api/mqtt.ts index 31a68dc88..36cf6e0bb 100644 --- a/interface/src/api/mqtt.ts +++ b/interface/src/api/mqtt.ts @@ -11,6 +11,6 @@ export function readMqttSettings(): AxiosPromise { return AXIOS.get('/mqttSettings'); } -export function updateMqttSettings(ntpSettings: MqttSettings): AxiosPromise { - return AXIOS.post('/mqttSettings', ntpSettings); +export function updateMqttSettings(mqttSettings: MqttSettings): AxiosPromise { + return AXIOS.post('/mqttSettings', mqttSettings); } diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 251dafdd4..7571f7def 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -912,6 +912,7 @@ void Mqtt::publish_ha_sensor_config(DeviceValue & dv, const std::string & model, dev_json["mf"] = brand; dev_json["mdl"] = model; dev_json["via_device"] = "ems-esp"; + free(cap_name); } // calculate the min and max diff --git a/src/telegram.h b/src/telegram.h index cafa60b42..710558f57 100644 --- a/src/telegram.h +++ b/src/telegram.h @@ -250,11 +250,7 @@ class RxService : public EMSbus { if (telegram_error_count_ == 0) { return 100; // all good, 100% } - if (telegram_error_count_ >= telegram_count_) { - return 100; - } - uint8_t q = ((float)telegram_error_count_ / telegram_count_ * 100); - + uint8_t q = (telegram_error_count_ * 100 / (telegram_count_ + telegram_error_count_)); return (q <= EMS_BUS_QUALITY_RX_THRESHOLD ? 100 : 100 - q); }