diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-17 11:48:18 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-17 11:48:18 +0300 |
| commit | e1b1cd1960f6da4fba50a01b1b6de31c10187ed1 (patch) | |
| tree | 3cbc8d7d6549726bc105b4ab1ecba5064faf2012 /src/Movement | |
| parent | d5086b46ba31e0ae2fa1f78430ba5a59aa8b5758 (diff) | |
Introduced file CANlib/RRF3Common.h
Diffstat (limited to 'src/Movement')
| -rw-r--r-- | src/Movement/StepperDrivers/TMC22xx.cpp | 4 | ||||
| -rw-r--r-- | src/Movement/StepperDrivers/TMC51xx.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Movement/StepperDrivers/TMC22xx.cpp b/src/Movement/StepperDrivers/TMC22xx.cpp index db463770..15720077 100644 --- a/src/Movement/StepperDrivers/TMC22xx.cpp +++ b/src/Movement/StepperDrivers/TMC22xx.cpp @@ -2242,8 +2242,8 @@ StandardDriverStatus SmartDrivers::GetStandardDriverStatus(size_t driver) noexce const uint32_t status = driverStates[driver].ReadLiveStatus(); // The lowest 8 bits of StandardDriverStatus have the same meanings as for the TMC2209 status rslt.all = status & 0x000000FF; - rslt.all |= ((status >> TMC_RR_STST_BIT_POS) & 1u) << StandardDriverStatus::StandstillBitPos; // put the standstill bit in the right place - rslt.all |= ((status >> TMC_RR_SG_BIT_POS) & 1u) << StandardDriverStatus::StallBitPos; // put the stall bit in the right place + rslt.all |= ExtractBit(status, TMC_RR_STST_BIT_POS, StandardDriverStatus::StandstillBitPos); // put the standstill bit in the right place + rslt.all |= ExtractBit(status, TMC_RR_SG_BIT_POS, StandardDriverStatus::StallBitPos); // put the stall bit in the right place } else { diff --git a/src/Movement/StepperDrivers/TMC51xx.cpp b/src/Movement/StepperDrivers/TMC51xx.cpp index 27227916..64976644 100644 --- a/src/Movement/StepperDrivers/TMC51xx.cpp +++ b/src/Movement/StepperDrivers/TMC51xx.cpp @@ -1612,8 +1612,8 @@ StandardDriverStatus SmartDrivers::GetStandardDriverStatus(size_t driver) noexce rslt.all = (status >> (25 - 0)) & (0x0F << 0); // this puts the it, otpw, s2ga and s2gb bits in the right place rslt.all |= (status >> (12 - 4)) & (3u << 4); // put s2vsa and s2vsb in the right place rslt.all |= (status >> (29 - 6)) & (3u << 6); // put ola and olb in the right place - rslt.all |= ((status >> TMC_RR_STST_BIT_POS) & 1u) << StandardDriverStatus::StandstillBitPos; // put the standstill bit in the right place - rslt.all |= ((status >> TMC_RR_SG_BIT_POS) & 1u) << StandardDriverStatus::StallBitPos; // put the stall bit in the right place + rslt.all |= ExtractBit(status, TMC_RR_STST_BIT_POS, StandardDriverStatus::StandstillBitPos); // put the standstill bit in the right place + rslt.all |= ExtractBit(status, TMC_RR_SG_BIT_POS, StandardDriverStatus::StallBitPos); // put the stall bit in the right place } else { |