Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-03 20:24:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Add USE checks

Browse source
This commit is contained in:
Hareesh M U 2023-11-05 20:47:01 +00:00
parent 89f9d2bd1b
commit fed899b486
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
esphome/components/ld2450/ld2450.cpp
View file

@ -20,8 +20,10 @@ LD2450Component::LD2450Component() {}
void LD2450Component::setup() { void LD2450Component::setup() {
ESP_LOGCONFIG(TAG, "Setting up HLK-LD2450"); ESP_LOGCONFIG(TAG, "Setting up HLK-LD2450");
#ifdef USE_NUMBER
this->pref_ = global_preferences->make_preference<float>(this->presence_timeout_number_->get_object_id_hash()); this->pref_ = global_preferences->make_preference<float>(this->presence_timeout_number_->get_object_id_hash());
this->set_presence_timeout(); this->set_presence_timeout();
#endif
this->read_all_info(); this->read_all_info();
ESP_LOGCONFIG(TAG, "Mac Address : %s", const_cast<char *>(this->mac_.c_str())); ESP_LOGCONFIG(TAG, "Mac Address : %s", const_cast<char *>(this->mac_.c_str()));
ESP_LOGCONFIG(TAG, "Firmware Version : %s", const_cast<char *>(this->version_.c_str())); ESP_LOGCONFIG(TAG, "Firmware Version : %s", const_cast<char *>(this->version_.c_str()));
@ -387,9 +389,8 @@ void LD2450Component::handle_periodic_data_(uint8_t *buffer, int len) {
#endif #endif
} // End loop thru targets } // End loop thru targets
still_target_count = target_count - moving_target_count;
#ifdef USE_SENSOR #ifdef USE_SENSOR
still_target_count = target_count - moving_target_count;
// Target Count // Target Count
if (this->target_count_sensor_ != nullptr) { if (this->target_count_sensor_ != nullptr) {
if (this->target_count_sensor_->get_state() != target_count) { if (this->target_count_sensor_->get_state() != target_count) {
@ -444,6 +445,7 @@ void LD2450Component::handle_periodic_data_(uint8_t *buffer, int len) {
} }
} }
#endif #endif
#ifdef USE_SENSOR
// For presence timeout check // For presence timeout check
if (target_count > 0) { if (target_count > 0) {
this->presence_millis_ = millis(); this->presence_millis_ = millis();
@ -454,6 +456,7 @@ void LD2450Component::handle_periodic_data_(uint8_t *buffer, int len) {
if (still_target_count > 0) { if (still_target_count > 0) {
this->still_presence_millis_ = millis(); this->still_presence_millis_ = millis();
} }
#endif
} }
const char VERSION_FMT[] = "%u.%02X.%02X%02X%02X%02X"; const char VERSION_FMT[] = "%u.%02X.%02X%02X%02X%02X";
@ -708,6 +711,8 @@ void LD2450Component::set_move_distance_sensor(int target, sensor::Sensor *s) {
void LD2450Component::set_move_resolution_sensor(int target, sensor::Sensor *s) { void LD2450Component::set_move_resolution_sensor(int target, sensor::Sensor *s) {
this->move_resolution_sensors_[target] = s; this->move_resolution_sensors_[target] = s;
} }
#endif
#ifdef USE_TEXT_SENSOR
void LD2450Component::set_direction_text_sensor(int target, text_sensor::TextSensor *s) { void LD2450Component::set_direction_text_sensor(int target, text_sensor::TextSensor *s) {
this->direction_text_sensors_[target] = s; this->direction_text_sensors_[target] = s;
} }
@ -751,7 +756,6 @@ void LD2450Component::set_presence_timeout() {
} }
} }
} }
#endif
// Save Presence Timeout to flash // Save Presence Timeout to flash
void LD2450Component::save_to_flash_(float value) { this->pref_.save(&value); } void LD2450Component::save_to_flash_(float value) { this->pref_.save(&value); }
@ -764,6 +768,7 @@ float LD2450Component::restore_from_flash_() {
} }
return value; return value;
} }
#endif
} // namespace ld2450 } // namespace ld2450
} // namespace esphome } // namespace esphome

2
esphome/components/ld2450/ld2450.h
View file

@ -248,7 +248,7 @@ class LD2450Component : public Component, public uart::UARTDevice {
int32_t still_presence_millis_ = 0; int32_t still_presence_millis_ = 0;
int32_t moving_presence_millis_ = 0; int32_t moving_presence_millis_ = 0;
uint16_t throttle_; uint16_t throttle_;
uint16_t timeout_; uint16_t timeout_ = 5;
uint8_t zone_type_ = 0; uint8_t zone_type_ = 0;
std::string version_; std::string version_;
std::string mac_; std::string mac_;

2
esphome/components/ld2450/number/__init__.py
View file

@ -26,7 +26,7 @@ ZoneCoordinateNumber = ld2450_ns.class_("ZoneCoordinateNumber", number.Number)
CONFIG_SCHEMA = cv.Schema( CONFIG_SCHEMA = cv.Schema(
{ {
cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component),
cv.Optional(CONF_PRESENCE_TIMEOUT): number.number_schema( cv.Required(CONF_PRESENCE_TIMEOUT): number.number_schema(
PresenceTimeoutNumber, PresenceTimeoutNumber,
unit_of_measurement=UNIT_SECOND, unit_of_measurement=UNIT_SECOND,
entity_category=ENTITY_CATEGORY_CONFIG, entity_category=ENTITY_CATEGORY_CONFIG,