PulseGen: cleanup AxisData initialization

pull/47/head
Yuri D'Elia 2021-07-06 16:09:05 +02:00
parent 16cf02726b
commit bd8ae62211
1 changed files with 11 additions and 15 deletions

View File

@ -132,23 +132,19 @@ private:
pulse_gen::PulseGen ctrl; ///< Motor controller pulse_gen::PulseGen ctrl; ///< Motor controller
}; };
/// Helper to initialize AxisData members
static AxisData DataForAxis(Axis axis) {
return {
.drv = { axisParams[axis].params, axisParams[axis].currents, axisParams[axis].mode },
.ctrl = { axisParams[axis].jerk, axisParams[axis].accel },
};
}
/// Dynamic axis data /// Dynamic axis data
AxisData axisData[NUM_AXIS] = { AxisData axisData[NUM_AXIS] = {
// Idler DataForAxis(Idler),
{ DataForAxis(Pulley),
.drv = { axisParams[Idler].params, axisParams[Idler].currents, axisParams[Idler].mode }, DataForAxis(Selector),
.ctrl = { axisParams[Idler].jerk, axisParams[Idler].accel },
},
// Pulley
{
.drv = { axisParams[Pulley].params, axisParams[Pulley].currents, axisParams[Pulley].mode },
.ctrl = { axisParams[Pulley].jerk, axisParams[Pulley].accel },
},
// Selector
{
.drv = { axisParams[Selector].params, axisParams[Selector].currents, axisParams[Selector].mode },
.ctrl = { axisParams[Selector].jerk, axisParams[Selector].accel },
}
}; };
}; };