Skip to content

fix(AS5600): convert static variables to instance members #571

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
finger563 merged 4 commits into from
Dec 11, 2025
Merged

fix(AS5600): convert static variables to instance members #571

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d9a7ec
fix: convert static variables to instance members to enable supportin…
rahgirrafi Dec 9, 2025
2d65174
fix(as5600): initialize prev_count_ to prevent incorrect first diff
rahgirrafi Dec 9, 2025
e16c745
refactor(as5600): align implementation with MT6701 encoder
rahgirrafi Dec 10, 2025
e4a496a
Fix (AS5600): Used read_counts() instead of non-existant read() metho…
rahgirrafi Dec 10, 2025
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
18 changes: 10 additions & 8 deletions components/as5600/include/as5600.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,10 @@ class As5600 : public BasePeripheral<> {
return;
}
count_.store(count);
static int prev_count = count_;
// compute diff
int diff = count_ - prev_count;
// compute diff
int diff = count_ - prev_count_;
// update prev_count
prev_count = count_;
prev_count_ = count_;
// check for zero crossing
if (diff > COUNTS_PER_REVOLUTION / 2) {
// we crossed zero going clockwise (1 -> 359)
Expand All @@ -199,11 +198,10 @@ class As5600 : public BasePeripheral<> {
// update accumulator
accumulator_ += diff;
logger_.debug("CDA: {}, {}, {}", count_, diff, accumulator_);
// update velocity (filtering it)
static auto prev_time = std::chrono::high_resolution_clock::now();
// update velocity (filtering it)
auto now = std::chrono::high_resolution_clock::now();
float elapsed = std::chrono::duration<float>(now - prev_time).count();
prev_time = now;
float elapsed = std::chrono::duration<float>(now - prev_time_).count();
prev_time_ = now;
float seconds = elapsed ? elapsed : update_period_.count();
float raw_velocity = (float)(diff) / COUNTS_PER_REVOLUTION_F / seconds * SECONDS_PER_MINUTE;
velocity_rpm_ = velocity_filter_ ? velocity_filter_(raw_velocity) : raw_velocity;
Expand Down Expand Up @@ -235,6 +233,7 @@ class As5600 : public BasePeripheral<> {
std::lock_guard<std::recursive_mutex> lock(base_mutex_);
// initialize the accumulator to have the current angle
auto count = read_count(ec);
prev_count_ = count;
if (ec) {
return;
}
Expand Down Expand Up @@ -298,5 +297,8 @@ class As5600 : public BasePeripheral<> {
std::atomic<int> accumulator_{0};
std::atomic<float> velocity_rpm_{0};
std::unique_ptr<Task> task_;
// Instance-specific variables (not static) to support multiple AS5600 sensors
int prev_count_{0};
std::chrono::high_resolution_clock::time_point prev_time_{std::chrono::high_resolution_clock::now()};
};
} // namespace espp
Loading