Skip to content

Unify used numeric primitives for analog soil moisture sensor #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dshil merged 1 commit into from
Dec 8, 2025
Merged

Unify used numeric primitives for analog soil moisture sensor #514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions components/ocs_sensor/soil/analog_sensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ double AnalogSensor::calculate_moisture_(int raw) const {
return 0;
}

const int range = config_.get_max() - config_.get_min();
const int offset = raw - config_.get_min();
const uint16_t range = config_.get_max() - config_.get_min();
const uint16_t offset = static_cast<uint16_t>(raw) - config_.get_min();

const double loss = static_cast<double>(offset) / range;
const double remain = 1 - loss;
Expand All @@ -119,8 +119,8 @@ SoilStatus AnalogSensor::calculate_status_(int raw) const {
return SoilStatus::Error;
}

const auto offset = raw - config_.get_min();
const auto status_index = offset / get_status_len_();
const uint16_t offset = static_cast<uint16_t>(raw) - config_.get_min();
const uint16_t status_index = offset / get_status_len_();

return statuses_[status_index];
}
Expand All @@ -130,9 +130,9 @@ double AnalogSensor::calculate_status_progress_(int raw) const {
return 0;
}

const int offset = raw - config_.get_min();
const int status_index = offset / get_status_len_();
const int status_pos = offset - (get_status_len_() * status_index);
const uint16_t offset = static_cast<uint16_t>(raw) - config_.get_min();
const uint16_t status_index = offset / get_status_len_();
const uint16_t status_pos = offset - (get_status_len_() * status_index);

const double progress = 100 * (static_cast<double>(status_pos) / get_status_len_());

Expand Down