Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 09:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

chore(mr60fda2): utility functions to static methods

Browse source
This commit is contained in:
Spencer Yan 2024-10-22 15:46:36 +08:00
parent 675bae3345
commit c3df520380
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
esphome/components/seeed_mr60fda2/seeed_mr60fda2.cpp
View file

@ -73,7 +73,7 @@ void MR60FDA2Component::loop() {
* @param len The length of the byte array. * @param len The length of the byte array.
* @return The calculated checksum. * @return The calculated checksum.
*/ */
uint8_t MR60FDA2Component::calculate_checksum_(const uint8_t *data, size_t len) { static uint8_t calculate_checksum_(const uint8_t *data, size_t len) {
uint8_t checksum = 0; uint8_t checksum = 0;
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
checksum ^= data[i]; checksum ^= data[i];
@ -93,11 +93,11 @@ uint8_t MR60FDA2Component::calculate_checksum_(const uint8_t *data, size_t len)
* @param expected_checksum The expected checksum. * @param expected_checksum The expected checksum.
* @return True if the checksum is valid, false otherwise. * @return True if the checksum is valid, false otherwise.
*/ */
bool MR60FDA2Component::validate_checksum_(const uint8_t *data, size_t len, uint8_t expected_checksum) { static bool validate_checksum_(const uint8_t *data, size_t len, uint8_t expected_checksum) {
return calculate_checksum_(data, len) == expected_checksum; return calculate_checksum_(data, len) == expected_checksum;
} }
uint8_t MR60FDA2Component::find_nearest_index_(float value, const float *arr, int size) { static uint8_t find_nearest_index_(float value, const float *arr, int size) {
int nearest_index = 0; int nearest_index = 0;
float min_diff = std::abs(value - arr[0]); float min_diff = std::abs(value - arr[0]);
for (int i = 1; i < size; ++i) { for (int i = 1; i < size; ++i) {
@ -183,7 +183,7 @@ void MR60FDA2Component::split_frame_(uint8_t buffer) {
} }
break; break;
case LOCATE_HEAD_CKSUM_FRAME: case LOCATE_HEAD_CKSUM_FRAME:
if (this->validate_checksum_(this->current_frame_buf_, this->current_frame_len_, buffer)) { if (validate_checksum_(this->current_frame_buf_, this->current_frame_len_, buffer)) {
this->current_frame_len_++; this->current_frame_len_++;
this->current_frame_buf_[this->current_frame_len_ - 1] = buffer; this->current_frame_buf_[this->current_frame_len_ - 1] = buffer;
this->current_frame_locate_++; this->current_frame_locate_++;
@ -207,7 +207,7 @@ void MR60FDA2Component::split_frame_(uint8_t buffer) {
} }
break; break;
case LOCATE_DATA_CKSUM_FRAME: case LOCATE_DATA_CKSUM_FRAME:
if (this->validate_checksum_(this->current_data_buf_, this->current_data_frame_len_, buffer)) { if (validate_checksum_(this->current_data_buf_, this->current_data_frame_len_, buffer)) {
this->current_frame_len_++; this->current_frame_len_++;
this->current_frame_buf_[this->current_frame_len_ - 1] = buffer; this->current_frame_buf_[this->current_frame_len_ - 1] = buffer;
this->current_frame_locate_++; this->current_frame_locate_++;

3
esphome/components/seeed_mr60fda2/seeed_mr60fda2.h
View file

@ -88,14 +88,11 @@ class MR60FDA2Component : public Component,
uint8_t current_sensitivity_; uint8_t current_sensitivity_;
uint8_t select_index_; uint8_t select_index_;
bool validate_checksum_(const uint8_t *data, size_t len, uint8_t expected_checksum);
uint8_t calculate_checksum_(const uint8_t *data, size_t len);
void split_frame_(uint8_t buffer); void split_frame_(uint8_t buffer);
void process_frame_(); void process_frame_();
void send_query_(uint8_t *query, size_t string_length); void send_query_(uint8_t *query, size_t string_length);
void float_to_bytes_(float value, unsigned char *bytes); void float_to_bytes_(float value, unsigned char *bytes);
void int_to_bytes_(uint32_t value, unsigned char *bytes); void int_to_bytes_(uint32_t value, unsigned char *bytes);
uint8_t find_nearest_index_(float value, const float *arr, int size);
public: public:
float get_setup_priority() const override { return esphome::setup_priority::LATE; } float get_setup_priority() const override { return esphome::setup_priority::LATE; }