From 4ab07d627a15798533ce9f77f65a4d23292bd918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 22 Dec 2024 01:28:30 +0000 Subject: [PATCH] optimisation: compare uint16_t against uint16_t AxisDistance returns uint16_t type and is currently compared with long double axis length. The axis lengths fit easily into uint16_t: selectorLimits.lenght = 75 idlerLimits.lenght = 225 Change in memory: Flash: -122 bytes SRAM: 0 bytes --- src/modules/idler.cpp | 2 +- src/modules/selector.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/idler.cpp b/src/modules/idler.cpp index 64c67fa..1539a3d 100644 --- a/src/modules/idler.cpp +++ b/src/modules/idler.cpp @@ -39,7 +39,7 @@ void Idler::PlanHomingMoveBack() { bool Idler::FinishHomingAndPlanMoveToParkPos() { // check the axis' length if (AxisDistance(mm::axisUnitToTruncatedUnit(mm::motion.CurPosition())) - < (config::idlerLimits.lenght.v - 10)) { //@@TODO is 10 degrees ok? + < uint16_t(config::idlerLimits.lenght.v - 10)) { //@@TODO is 10 degrees ok? return false; // we couldn't home correctly, we cannot set the Idler's position } diff --git a/src/modules/selector.cpp b/src/modules/selector.cpp index 2e1ebad..56514da 100644 --- a/src/modules/selector.cpp +++ b/src/modules/selector.cpp @@ -35,7 +35,7 @@ void Selector::PlanHomingMoveBack() { bool Selector::FinishHomingAndPlanMoveToParkPos() { // check the axis' length - if (AxisDistance(mm::axisUnitToTruncatedUnit(mm::motion.CurPosition())) < (config::selectorLimits.lenght.v - 3)) { //@@TODO is 3mm ok? + if (AxisDistance(mm::axisUnitToTruncatedUnit(mm::motion.CurPosition())) < uint16_t(config::selectorLimits.lenght.v - 3)) { //@@TODO is 3mm ok? return false; // we couldn't home correctly, we cannot set the Selector's position }