From 22e90fdfe217d77cabb7d5f0bba1550c061ed160 Mon Sep 17 00:00:00 2001 From: Alexander Pohl Date: Fri, 4 Sep 2020 18:50:40 +0200 Subject: [PATCH 1/5] initial ATC Mithermometer component --- .../components/atc_mithermometer/__init__.py | 0 .../atc_mithermometer/atc_mithermometer.cpp | 63 +++++++++++++++++++ .../atc_mithermometer/atc_mithermometer.h | 34 ++++++++++ .../components/atc_mithermometer/sensor.py | 39 ++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 esphome/components/atc_mithermometer/__init__.py create mode 100644 esphome/components/atc_mithermometer/atc_mithermometer.cpp create mode 100644 esphome/components/atc_mithermometer/atc_mithermometer.h create mode 100644 esphome/components/atc_mithermometer/sensor.py diff --git a/esphome/components/atc_mithermometer/__init__.py b/esphome/components/atc_mithermometer/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.cpp b/esphome/components/atc_mithermometer/atc_mithermometer.cpp new file mode 100644 index 0000000000..08e1cc3207 --- /dev/null +++ b/esphome/components/atc_mithermometer/atc_mithermometer.cpp @@ -0,0 +1,63 @@ +#include "atc_mithermometer.h" +#include "esphome/core/log.h" + +#ifdef ARDUINO_ARCH_ESP32 + +namespace esphome { +namespace atc_mithermometer { + +static const char *TAG = "atc_mithermometer"; + +void ATCMiThermometer::dump_config() { + ESP_LOGCONFIG(TAG, "ATC MiThermometer"); + LOG_SENSOR(" ", "Temperature", this->temperature_); + LOG_SENSOR(" ", "Humidity", this->humidity_); + LOG_SENSOR(" ", "Battery Level", this->battery_level_); +} + +bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device) { + if (device.address_uint64() != this->address_) { + ESP_LOGVV(TAG, "parse_device(): unknown MAC address."); + return false; + } + ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str()); + + bool success = false; + for (auto &service_data : device.get_service_datas()) { + auto res = xiaomi_ble::parse_xiaomi_header(service_data); + if (!res.has_value()) { + continue; + } + if (res->is_duplicate) { + continue; + } + if (res->has_encryption) { + ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device."); + continue; + } + if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) { + continue; + } + if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) { + continue; + } + if (res->temperature.has_value() && this->temperature_ != nullptr) + this->temperature_->publish_state(*res->temperature); + if (res->humidity.has_value() && this->humidity_ != nullptr) + this->humidity_->publish_state(*res->humidity); + if (res->battery_level.has_value() && this->battery_level_ != nullptr) + this->battery_level_->publish_state(*res->battery_level); + success = true; + } + + if (!success) { + return false; + } + + return true; +} + +} // namespace atc_mithermometer +} // namespace esphome + +#endif diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.h b/esphome/components/atc_mithermometer/atc_mithermometer.h new file mode 100644 index 0000000000..fb3a48d59b --- /dev/null +++ b/esphome/components/atc_mithermometer/atc_mithermometer.h @@ -0,0 +1,34 @@ +#pragma once + +#include "esphome/core/component.h" +#include "esphome/components/sensor/sensor.h" +#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h" +#include "esphome/components/xiaomi_ble/xiaomi_ble.h" + +#ifdef ARDUINO_ARCH_ESP32 + +namespace esphome { +namespace atc_mithermometer { + +class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDeviceListener { + public: + void set_address(uint64_t address) { address_ = address; }; + + bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override; + void dump_config() override; + float get_setup_priority() const override { return setup_priority::DATA; } + void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; } + void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; } + void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; } + + protected: + uint64_t address_; + sensor::Sensor *temperature_{nullptr}; + sensor::Sensor *humidity_{nullptr}; + sensor::Sensor *battery_level_{nullptr}; +}; + +} // namespace atc_mithermometer +} // namespace esphome + +#endif diff --git a/esphome/components/atc_mithermometer/sensor.py b/esphome/components/atc_mithermometer/sensor.py new file mode 100644 index 0000000000..5a6a2039d5 --- /dev/null +++ b/esphome/components/atc_mithermometer/sensor.py @@ -0,0 +1,39 @@ +import esphome.codegen as cg +import esphome.config_validation as cv +from esphome.components import sensor, esp32_ble_tracker +from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \ + UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID + +DEPENDENCIES = ['esp32_ble_tracker'] +AUTO_LOAD = ['xiaomi_ble'] + +atc_mithermometer_ns = cg.esphome_ns.namespace('atc_mithermometer') +ATCMiThermometer = atc_mithermometer_ns.class_('ATCMiThermometer', + esp32_ble_tracker.ESPBTDeviceListener, + cg.Component) + +CONFIG_SCHEMA = cv.Schema({ + cv.GenerateID(): cv.declare_id(ATCMiThermometer), + cv.Required(CONF_MAC_ADDRESS): cv.mac_address, + cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1), + cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0), + cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0), +}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA) + + +def to_code(config): + var = cg.new_Pvariable(config[CONF_ID]) + yield cg.register_component(var, config) + yield esp32_ble_tracker.register_ble_device(var, config) + + cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex)) + + if CONF_TEMPERATURE in config: + sens = yield sensor.new_sensor(config[CONF_TEMPERATURE]) + cg.add(var.set_temperature(sens)) + if CONF_HUMIDITY in config: + sens = yield sensor.new_sensor(config[CONF_HUMIDITY]) + cg.add(var.set_humidity(sens)) + if CONF_BATTERY_LEVEL in config: + sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL]) + cg.add(var.set_battery_level(sens)) From fc0ddc53b816ab23f1e8d98f83ffe8dfd1d94fc1 Mon Sep 17 00:00:00 2001 From: Alexander Pohl Date: Fri, 4 Sep 2020 20:05:49 +0200 Subject: [PATCH 2/5] removed references to xiaomi_ble --- .../atc_mithermometer/atc_mithermometer.cpp | 93 +++++++++++++++++-- .../atc_mithermometer/atc_mithermometer.h | 13 ++- .../components/atc_mithermometer/sensor.py | 1 - 3 files changed, 95 insertions(+), 12 deletions(-) diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.cpp b/esphome/components/atc_mithermometer/atc_mithermometer.cpp index 08e1cc3207..e628f697e6 100644 --- a/esphome/components/atc_mithermometer/atc_mithermometer.cpp +++ b/esphome/components/atc_mithermometer/atc_mithermometer.cpp @@ -24,21 +24,14 @@ bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device bool success = false; for (auto &service_data : device.get_service_datas()) { - auto res = xiaomi_ble::parse_xiaomi_header(service_data); - if (!res.has_value()) { - continue; - } + auto res = parse_header(service_data); if (res->is_duplicate) { continue; } - if (res->has_encryption) { - ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device."); + if (!(parse_message(service_data.data, *res))) { continue; } - if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) { - continue; - } - if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) { + if (!(report_results(res, device.address_str()))) { continue; } if (res->temperature.has_value() && this->temperature_ != nullptr) @@ -57,6 +50,86 @@ bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device return true; } +optional ATCMiThermometer::parse_header(const esp32_ble_tracker::ServiceData &service_data) { + ParseResult result; + if (!service_data.uuid.contains(0x18, 0x1A)) { + ESP_LOGVV(TAG, "parse_header(): no service data UUID magic bytes."); + return {}; + } + + auto raw = service_data.data; + + static uint8_t last_frame_count = 0; + if (last_frame_count == raw[16]) { + ESP_LOGVV(TAG, "parse_xiaomi_header(): duplicate data packet received (%d).", static_cast(last_frame_count)); + result.is_duplicate = true; + return {}; + } + last_frame_count = raw[16]; + result.is_duplicate = false; + + return result; +} + +bool ATCMiThermometer::parse_message(const std::vector &message, ParseResult &result) { + + // Byte 5-10 mac in correct order + // Byte 11-12 Temperature in uint16 + // Byte 13 Humidity in percent + // Byte 14 Battery in percent + // Byte 15-16 Battery in mV uint16_t + // Byte 17 frame packet counter + + const uint8_t *raw = message.data(); + const uint8_t *data = raw + 3; + + if (message.size() != 17) { + ESP_LOGVV(TAG, "parse_message(): payload has wrong size (%d)!", data_length); + return false; + } + + // temperature, 2 bytes, 16-bit signed integer (LE), 0.1 °C + else if (raw[0] == 0x04) { + const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8); + result.temperature = temperature / 10.0f; + } + // humidity, 2 bytes, 16-bit signed integer (LE), 0.1 % + else if (raw[0] == 0x06) { + const int16_t humidity = uint16_t(data[0]) | (uint16_t(data[1]) << 8); + result.humidity = humidity / 10.0f; + } + // battery, 1 byte, 8-bit unsigned integer, 1 % + else if (raw[0] == 0x0A) { + result.battery_level = data[0]; + + } else { + return false; + } + + return true; +} + +bool ATCMiThermometer::report_results(const optional &result, const std::string &address) { + if (!result.has_value()) { + ESP_LOGVV(TAG, "report_results(): no results available."); + return false; + } + + ESP_LOGD(TAG, "Got ATC MiThermometer (%s):", address.c_str()); + + if (result->temperature.has_value()) { + ESP_LOGD(TAG, " Temperature: %.1f°C", *result->temperature); + } + if (result->humidity.has_value()) { + ESP_LOGD(TAG, " Humidity: %.1f%%", *result->humidity); + } + if (result->battery_level.has_value()) { + ESP_LOGD(TAG, " Battery Level: %.0f%%", *result->battery_level); + } + + return true; +} + } // namespace atc_mithermometer } // namespace esphome diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.h b/esphome/components/atc_mithermometer/atc_mithermometer.h index fb3a48d59b..07bdd40ae2 100644 --- a/esphome/components/atc_mithermometer/atc_mithermometer.h +++ b/esphome/components/atc_mithermometer/atc_mithermometer.h @@ -3,13 +3,20 @@ #include "esphome/core/component.h" #include "esphome/components/sensor/sensor.h" #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h" -#include "esphome/components/xiaomi_ble/xiaomi_ble.h" #ifdef ARDUINO_ARCH_ESP32 namespace esphome { namespace atc_mithermometer { +struct ParseResult { + optional temperature; + optional humidity; + optional battery_level; + bool is_duplicate; + int raw_offset; +}; + class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDeviceListener { public: void set_address(uint64_t address) { address_ = address; }; @@ -21,6 +28,10 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; } void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; } + optional parse_header(const esp32_ble_tracker::ServiceData &service_data); + bool parse_message(const std::vector &message, ParseResult &result); + bool report_results(const optional &result, const std::string &address); + protected: uint64_t address_; sensor::Sensor *temperature_{nullptr}; diff --git a/esphome/components/atc_mithermometer/sensor.py b/esphome/components/atc_mithermometer/sensor.py index 5a6a2039d5..c4f2dbb1c1 100644 --- a/esphome/components/atc_mithermometer/sensor.py +++ b/esphome/components/atc_mithermometer/sensor.py @@ -5,7 +5,6 @@ from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, C UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID DEPENDENCIES = ['esp32_ble_tracker'] -AUTO_LOAD = ['xiaomi_ble'] atc_mithermometer_ns = cg.esphome_ns.namespace('atc_mithermometer') ATCMiThermometer = atc_mithermometer_ns.class_('ATCMiThermometer', From 38b7c1588a66ca39a27d42bbf70ba86f7ebfe606 Mon Sep 17 00:00:00 2001 From: Alexander Pohl Date: Sat, 5 Sep 2020 09:36:49 +0200 Subject: [PATCH 3/5] temp, humi and batt in % working, todo: battery in mV --- .../atc_mithermometer/atc_mithermometer.cpp | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.cpp b/esphome/components/atc_mithermometer/atc_mithermometer.cpp index e628f697e6..293133d56e 100644 --- a/esphome/components/atc_mithermometer/atc_mithermometer.cpp +++ b/esphome/components/atc_mithermometer/atc_mithermometer.cpp @@ -52,7 +52,7 @@ bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device optional ATCMiThermometer::parse_header(const esp32_ble_tracker::ServiceData &service_data) { ParseResult result; - if (!service_data.uuid.contains(0x18, 0x1A)) { + if (!service_data.uuid.contains(0x1A, 0x18)) { ESP_LOGVV(TAG, "parse_header(): no service data UUID magic bytes."); return {}; } @@ -60,12 +60,12 @@ optional ATCMiThermometer::parse_header(const esp32_ble_tracker::Se auto raw = service_data.data; static uint8_t last_frame_count = 0; - if (last_frame_count == raw[16]) { + if (last_frame_count == raw[12]) { ESP_LOGVV(TAG, "parse_xiaomi_header(): duplicate data packet received (%d).", static_cast(last_frame_count)); result.is_duplicate = true; return {}; } - last_frame_count = raw[16]; + last_frame_count = raw[12]; result.is_duplicate = false; return result; @@ -80,31 +80,23 @@ bool ATCMiThermometer::parse_message(const std::vector &message, ParseR // Byte 15-16 Battery in mV uint16_t // Byte 17 frame packet counter - const uint8_t *raw = message.data(); - const uint8_t *data = raw + 3; + const uint8_t *data = message.data(); + const int data_length = 13; - if (message.size() != 17) { - ESP_LOGVV(TAG, "parse_message(): payload has wrong size (%d)!", data_length); + if (message.size() != data_length) { + ESP_LOGVV(TAG, "parse_message(): payload has wrong size (%d)!", message.size()); return false; } // temperature, 2 bytes, 16-bit signed integer (LE), 0.1 °C - else if (raw[0] == 0x04) { - const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8); - result.temperature = temperature / 10.0f; - } - // humidity, 2 bytes, 16-bit signed integer (LE), 0.1 % - else if (raw[0] == 0x06) { - const int16_t humidity = uint16_t(data[0]) | (uint16_t(data[1]) << 8); - result.humidity = humidity / 10.0f; - } - // battery, 1 byte, 8-bit unsigned integer, 1 % - else if (raw[0] == 0x0A) { - result.battery_level = data[0]; + const int16_t temperature = uint16_t(data[7]) | (uint16_t(data[6]) << 8); + result.temperature = temperature / 10.0f; - } else { - return false; - } + // humidity, 1 byte, 8-bit unsigned integer, 1 % + result.humidity = data[8]; + + // battery, 1 byte, 8-bit unsigned integer, 1 % + result.battery_level = data[9]; return true; } From b49fa849ac69acf2f3d8bd3a3e8915e92277c581 Mon Sep 17 00:00:00 2001 From: Alexander Pohl Date: Sat, 5 Sep 2020 12:34:28 +0200 Subject: [PATCH 4/5] report battery level in volt --- .../atc_mithermometer/atc_mithermometer.cpp | 25 ++++++++++--------- .../components/atc_mithermometer/sensor.py | 7 +++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.cpp b/esphome/components/atc_mithermometer/atc_mithermometer.cpp index 293133d56e..9e0b9d018b 100644 --- a/esphome/components/atc_mithermometer/atc_mithermometer.cpp +++ b/esphome/components/atc_mithermometer/atc_mithermometer.cpp @@ -73,12 +73,12 @@ optional ATCMiThermometer::parse_header(const esp32_ble_tracker::Se bool ATCMiThermometer::parse_message(const std::vector &message, ParseResult &result) { - // Byte 5-10 mac in correct order - // Byte 11-12 Temperature in uint16 - // Byte 13 Humidity in percent - // Byte 14 Battery in percent - // Byte 15-16 Battery in mV uint16_t - // Byte 17 frame packet counter + // Byte 0-5 mac in correct order + // Byte 6-7 Temperature in uint16 + // Byte 8 Humidity in percent + // Byte 9 Battery in percent + // Byte 10-11 Battery in mV uint16_t + // Byte 12 frame packet counter const uint8_t *data = message.data(); const int data_length = 13; @@ -92,11 +92,12 @@ bool ATCMiThermometer::parse_message(const std::vector &message, ParseR const int16_t temperature = uint16_t(data[7]) | (uint16_t(data[6]) << 8); result.temperature = temperature / 10.0f; - // humidity, 1 byte, 8-bit unsigned integer, 1 % + // humidity, 1 byte, 8-bit unsigned integer, 0.1 % result.humidity = data[8]; - // battery, 1 byte, 8-bit unsigned integer, 1 % - result.battery_level = data[9]; + // battery, 1 byte, 8-bit unsigned integer, 0.001 V + const int16_t battery_level = uint16_t(data[11]) | (uint16_t(data[10]) << 8); + result.battery_level = battery_level / 1.0e3f; return true; } @@ -110,13 +111,13 @@ bool ATCMiThermometer::report_results(const optional &result, const ESP_LOGD(TAG, "Got ATC MiThermometer (%s):", address.c_str()); if (result->temperature.has_value()) { - ESP_LOGD(TAG, " Temperature: %.1f°C", *result->temperature); + ESP_LOGD(TAG, " Temperature: %.1f °C", *result->temperature); } if (result->humidity.has_value()) { - ESP_LOGD(TAG, " Humidity: %.1f%%", *result->humidity); + ESP_LOGD(TAG, " Humidity: %.1f %%", *result->humidity); } if (result->battery_level.has_value()) { - ESP_LOGD(TAG, " Battery Level: %.0f%%", *result->battery_level); + ESP_LOGD(TAG, " Battery Level: %.3f V", *result->battery_level); } return true; diff --git a/esphome/components/atc_mithermometer/sensor.py b/esphome/components/atc_mithermometer/sensor.py index c4f2dbb1c1..3c98c2367c 100644 --- a/esphome/components/atc_mithermometer/sensor.py +++ b/esphome/components/atc_mithermometer/sensor.py @@ -2,7 +2,8 @@ import esphome.codegen as cg import esphome.config_validation as cv from esphome.components import sensor, esp32_ble_tracker from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \ - UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID + UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \ + UNIT_VOLT DEPENDENCIES = ['esp32_ble_tracker'] @@ -15,8 +16,8 @@ CONFIG_SCHEMA = cv.Schema({ cv.GenerateID(): cv.declare_id(ATCMiThermometer), cv.Required(CONF_MAC_ADDRESS): cv.mac_address, cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1), - cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0), - cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0), + cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1), + cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_VOLT, ICON_BATTERY, 3), }).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA) From f67e803af5c5e70c4e7a99b43960f9390e9f9f92 Mon Sep 17 00:00:00 2001 From: Alexander Pohl Date: Sat, 5 Sep 2020 12:57:05 +0200 Subject: [PATCH 5/5] report battery level again in percent --- .../atc_mithermometer/atc_mithermometer.cpp | 15 +++++++++------ esphome/components/atc_mithermometer/sensor.py | 7 +++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.cpp b/esphome/components/atc_mithermometer/atc_mithermometer.cpp index 9e0b9d018b..2016b435d4 100644 --- a/esphome/components/atc_mithermometer/atc_mithermometer.cpp +++ b/esphome/components/atc_mithermometer/atc_mithermometer.cpp @@ -92,12 +92,15 @@ bool ATCMiThermometer::parse_message(const std::vector &message, ParseR const int16_t temperature = uint16_t(data[7]) | (uint16_t(data[6]) << 8); result.temperature = temperature / 10.0f; - // humidity, 1 byte, 8-bit unsigned integer, 0.1 % + // humidity, 1 byte, 8-bit unsigned integer, 1.0 % result.humidity = data[8]; - // battery, 1 byte, 8-bit unsigned integer, 0.001 V - const int16_t battery_level = uint16_t(data[11]) | (uint16_t(data[10]) << 8); - result.battery_level = battery_level / 1.0e3f; + // battery, 1 byte, 8-bit unsigned integer, 1.0 % + result.battery_level = data[9]; + + // battery, 2 bytes, 16-bit unsigned integer, 0.001 V + // const int16_t battery_level = uint16_t(data[11]) | (uint16_t(data[10]) << 8); + // result.battery_level = battery_level / 1.0e3f; return true; } @@ -114,10 +117,10 @@ bool ATCMiThermometer::report_results(const optional &result, const ESP_LOGD(TAG, " Temperature: %.1f °C", *result->temperature); } if (result->humidity.has_value()) { - ESP_LOGD(TAG, " Humidity: %.1f %%", *result->humidity); + ESP_LOGD(TAG, " Humidity: %.0f %%", *result->humidity); } if (result->battery_level.has_value()) { - ESP_LOGD(TAG, " Battery Level: %.3f V", *result->battery_level); + ESP_LOGD(TAG, " Battery Level: %.0f %%", *result->battery_level); } return true; diff --git a/esphome/components/atc_mithermometer/sensor.py b/esphome/components/atc_mithermometer/sensor.py index 3c98c2367c..c4f2dbb1c1 100644 --- a/esphome/components/atc_mithermometer/sensor.py +++ b/esphome/components/atc_mithermometer/sensor.py @@ -2,8 +2,7 @@ import esphome.codegen as cg import esphome.config_validation as cv from esphome.components import sensor, esp32_ble_tracker from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \ - UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \ - UNIT_VOLT + UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID DEPENDENCIES = ['esp32_ble_tracker'] @@ -16,8 +15,8 @@ CONFIG_SCHEMA = cv.Schema({ cv.GenerateID(): cv.declare_id(ATCMiThermometer), cv.Required(CONF_MAC_ADDRESS): cv.mac_address, cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1), - cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1), - cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_VOLT, ICON_BATTERY, 3), + cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0), + cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0), }).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)