From 09cb47d427fb11025508ef7119612b8b141c7575 Mon Sep 17 00:00:00 2001 From: Spencer Yan Date: Tue, 22 Oct 2024 15:51:23 +0800 Subject: [PATCH] refactor(mr60fda2): utilize encode_uint32 function to compress --- esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp b/esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp index 5970ca7a94..411c31e118 100644 --- a/esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp +++ b/esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp @@ -281,22 +281,19 @@ void MR60FDA2Component::process_frame_() { // this->current_data_buf_[6], this->current_data_buf_[7], this->current_data_buf_[8], // this->current_data_buf_[9], this->current_data_buf_[10], this->current_data_buf_[11]); this->current_install_height_int_ = - (static_cast(current_data_buf_[3]) << 24) | (static_cast(current_data_buf_[2]) << 16) | - (static_cast(current_data_buf_[1]) << 8) | static_cast(current_data_buf_[0]); + encode_uint32(current_data_buf_[3], current_data_buf_[2], current_data_buf_[1], current_data_buf_[0]); float install_height_float; memcpy(&install_height_float, ¤t_install_height_int_, sizeof(float)); select_index_ = find_nearest_index_(install_height_float, INSTALL_HEIGHT, 7); this->install_height_select_->publish_state(INSTALL_HEIGHT_STR[select_index_]); this->current_height_threshold_int_ = - (static_cast(current_data_buf_[7]) << 24) | (static_cast(current_data_buf_[6]) << 16) | - (static_cast(current_data_buf_[5]) << 8) | static_cast(current_data_buf_[4]); + encode_uint32(current_data_buf_[7], current_data_buf_[6], current_data_buf_[5], current_data_buf_[4]); float height_threshold_float; memcpy(&height_threshold_float, ¤t_height_threshold_int_, sizeof(float)); select_index_ = find_nearest_index_(height_threshold_float, HEIGHT_THRESHOLD, 7); this->height_threshold_select_->publish_state(HEIGHT_THRESHOLD_STR[select_index_]); this->current_sensitivity_ = - (static_cast(current_data_buf_[11]) << 24) | (static_cast(current_data_buf_[10]) << 16) | - (static_cast(current_data_buf_[9]) << 8) | static_cast(current_data_buf_[8]); + encode_uint32(current_data_buf_[11], current_data_buf_[10], current_data_buf_[9], current_data_buf_[8]); select_index_ = find_nearest_index_(this->current_sensitivity_, SENSITIVITY, 3); this->sensitivity_select_->publish_state(SENSITIVITY_STR[select_index_]); ESP_LOGD(TAG, "Mounting height: %.2f, Height threshold: %.2f, Sensitivity: %u", install_height_float,