Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve motion::unitToAxisUnit template parameter names

pull/71/head
Yuri D'Elia 2021-07-26 01:28:29 +02:00
parent 051bce9098
commit 5928ade6be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/axisunit.h
View File

@ -95,11 +95,11 @@ static constexpr AxisScale axisScale[config::NUM_AXIS] = {
/// Convert a unit::Unit to AxisUnit. /// Convert a unit::Unit to AxisUnit.
/// The scaling factor is stored with the pair config::AxisConfig::uSteps and /// The scaling factor is stored with the pair config::AxisConfig::uSteps and
/// config::AxisConfig::stepsPerUnit (one per-axis). /// config::AxisConfig::stepsPerUnit (one per-axis).
template <typename T, typename U> template <typename AU, typename U>
static constexpr T unitToAxisUnit(U v) { static constexpr AU unitToAxisUnit(U v) {
static_assert(T::unit == U::unit, "incorrect unit type conversion"); static_assert(AU::unit == U::unit, "incorrect unit type conversion");
static_assert(U::base == axisScale[T::axis].base, "incorrect unit base conversion"); static_assert(U::base == axisScale[AU::axis].base, "incorrect unit base conversion");
return { (typename T::type_t)(v.v * axisScale[T::axis].stepsPerUnit) }; return { (typename AU::type_t)(v.v * axisScale[AU::axis].stepsPerUnit) };
} }
/// Convert an unit::Unit to a steps type (pos_t or steps_t). /// Convert an unit::Unit to a steps type (pos_t or steps_t).