Extract feedrates of Idler and Selector into config.h

pull/104/head
D.R.racer 2021-08-27 15:21:58 +02:00 committed by DRracer
parent c7f3fae266
commit a58450acb6
3 changed files with 6 additions and 2 deletions

View File

@ -17,6 +17,8 @@ static constexpr U_deg idlerSlotPositions[toolCount + 1] = {
0.0_deg 0.0_deg
}; };
static constexpr U_deg_s idlerFeedrate = 1000._deg_s;
// Selector's setup // Selector's setup
/// slots 0-4 are the real ones, the 5th is the farthest parking positions /// slots 0-4 are the real ones, the 5th is the farthest parking positions
@ -29,6 +31,8 @@ static constexpr U_mm selectorSlotPositions[toolCount + 1] = {
20.0_mm + 5 * 14.0_mm 20.0_mm + 5 * 14.0_mm
}; };
static constexpr U_mm_s selectorFeedrate = 1000._mm_s;
// Printer's filament sensor setup // Printer's filament sensor setup
static constexpr const uint16_t fsensorDebounceMs = 10; static constexpr const uint16_t fsensorDebounceMs = 10;

View File

@ -10,7 +10,7 @@ namespace idler {
Idler idler; Idler idler;
void Idler::PrepareMoveToPlannedSlot() { void Idler::PrepareMoveToPlannedSlot() {
mm::motion.PlanMoveTo<mm::Idler>(SlotPosition(plannedSlot), 1000._I_deg_s); // @@TODO mm::motion.PlanMoveTo<mm::Idler>(SlotPosition(plannedSlot), mm::unitToAxisUnit<mm::I_speed_t>(config::idlerFeedrate));
} }
Idler::OperationResult Idler::Disengage() { Idler::OperationResult Idler::Disengage() {

View File

@ -10,7 +10,7 @@ namespace selector {
Selector selector; Selector selector;
void Selector::PrepareMoveToPlannedSlot() { void Selector::PrepareMoveToPlannedSlot() {
mm::motion.PlanMoveTo<mm::Selector>(SlotPosition(plannedSlot), 1000.0_S_mm_s); // @@TODO mm::motion.PlanMoveTo<mm::Selector>(SlotPosition(plannedSlot), mm::unitToAxisUnit<mm::S_speed_t>(config::selectorFeedrate));
} }
Selector::OperationResult Selector::MoveToSlot(uint8_t slot) { Selector::OperationResult Selector::MoveToSlot(uint8_t slot) {