Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-08-18 09:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #439 from zytra/rc-v0.5.0

Browse Source 
Added pos_abs_ latch in encoder::update()
This commit is contained in:
samuelsadok
2020-07-17 13:18:17 +02:00
committed by GitHub
parent 883dd27a17 bdb935ee99
commit 9bf5a8df85
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/MotorControl/encoder.cpp
+3 -2
View File
@@ -434,6 +434,7 @@ void Encoder::abs_spi_cs_pin_init(){
bool Encoder::update() {
// update internal encoder state.
int32_t delta_enc = 0;
int32_t pos_abs_latched = pos_abs_; //LATCH
switch (mode_) {
case MODE_INCREMENTAL: {
@@ -483,7 +484,7 @@ bool Encoder::update() {
}
abs_spi_pos_updated_ = false;
delta_enc = pos_abs_ - count_in_cpr_;
delta_enc = pos_abs_latched - count_in_cpr_; //LATCH
delta_enc = mod(delta_enc, config_.cpr);
if (delta_enc > config_.cpr/2) {
delta_enc -= config_.cpr;
@@ -501,7 +502,7 @@ bool Encoder::update() {
count_in_cpr_ = mod(count_in_cpr_, config_.cpr);
if(mode_ & MODE_FLAG_ABS)
count_in_cpr_ = pos_abs_;
count_in_cpr_ = pos_abs_latched;
//// run pll (for now pll is in units of encoder counts)
// Predict current pos