Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2021-12-13 14:03:32 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-12-13 14:03:32 +0300
commit3fc462d20571ed97e05e43aa187cc43088d57468 (patch)
treee1cca75a6025653d9a43a13a067903471ee8da01
parent71ffc1ed37f53fb0d3c94bba75d230d9c8ac5655 (diff)
Removed unused Kinematics functions
-rw-r--r--src/Movement/Kinematics/FiveBarScaraKinematics.h1
-rw-r--r--src/Movement/Kinematics/HangprinterKinematics.h2
-rw-r--r--src/Movement/Kinematics/Kinematics.h6
-rw-r--r--src/Movement/Kinematics/LinearDeltaKinematics.h1
-rw-r--r--src/Movement/Kinematics/PolarKinematics.h1
-rw-r--r--src/Movement/Kinematics/RotaryDeltaKinematics.h1
-rw-r--r--src/Movement/Kinematics/ScaraKinematics.cpp20
-rw-r--r--src/Movement/Kinematics/ScaraKinematics.h2
8 files changed, 0 insertions, 34 deletions
diff --git a/src/Movement/Kinematics/FiveBarScaraKinematics.h b/src/Movement/Kinematics/FiveBarScaraKinematics.h
index 83ba44f7..7c20a9ca 100644
--- a/src/Movement/Kinematics/FiveBarScaraKinematics.h
+++ b/src/Movement/Kinematics/FiveBarScaraKinematics.h
@@ -33,7 +33,6 @@ public:
bool IsReachable(float axesCoords[MaxAxes], AxesBitmap axes) const noexcept override;
LimitPositionResult LimitPosition(float coords[], const float * null initialCoords, size_t numVisibleAxes, AxesBitmap axesToLimit, bool isCoordinated, bool applyM208Limits) const noexcept override;
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
- const char* HomingButtonNames() const noexcept override { return "PDZUVWABC"; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;
diff --git a/src/Movement/Kinematics/HangprinterKinematics.h b/src/Movement/Kinematics/HangprinterKinematics.h
index 751d39f9..6a64977d 100644
--- a/src/Movement/Kinematics/HangprinterKinematics.h
+++ b/src/Movement/Kinematics/HangprinterKinematics.h
@@ -29,8 +29,6 @@ public:
#endif
LimitPositionResult LimitPosition(float finalCoords[], const float * null initialCoords, size_t numAxes, AxesBitmap axesToLimit, bool isCoordinated, bool applyM208Limits) const noexcept override;
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
- size_t NumHomingButtons(size_t numVisibleAxes) const noexcept override { return 0; }
- const char* HomingButtonNames() const noexcept override { return "ABCD"; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;
diff --git a/src/Movement/Kinematics/Kinematics.h b/src/Movement/Kinematics/Kinematics.h
index 995c1a76..16ab6d6f 100644
--- a/src/Movement/Kinematics/Kinematics.h
+++ b/src/Movement/Kinematics/Kinematics.h
@@ -155,12 +155,6 @@ public:
// Override this one if any axes do not use the linear motion code (e.g. for segmentation-free delta motion)
virtual MotionType GetMotionType(size_t axis) const noexcept { return MotionType::linear; }
- // Override this if the number of homing buttons (excluding the home all button) is not the same as the number of visible axes (e.g. on a delta printer)
- virtual size_t NumHomingButtons(size_t numVisibleAxes) const noexcept { return numVisibleAxes; }
-
- // Override this if the homing buttons are not named after the axes (e.g. SCARA printer)
- virtual const char* HomingButtonNames() const noexcept { return "XYZUVWABC"; }
-
// This function is called when a request is made to home the axes in 'toBeHomed' and the axes in 'alreadyHomed' have already been homed.
// If we can't proceed because other axes need to be homed first, return those axes.
// If we can proceed with homing some axes, set 'filename' to the name of the homing file to be called and return 0. Optionally, update 'alreadyHomed' to indicate
diff --git a/src/Movement/Kinematics/LinearDeltaKinematics.h b/src/Movement/Kinematics/LinearDeltaKinematics.h
index f00d63de..0132c33e 100644
--- a/src/Movement/Kinematics/LinearDeltaKinematics.h
+++ b/src/Movement/Kinematics/LinearDeltaKinematics.h
@@ -36,7 +36,6 @@ public:
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
AxesBitmap AxesToHomeBeforeProbing() const noexcept override { return XyzAxes; }
MotionType GetMotionType(size_t axis) const noexcept override;
- size_t NumHomingButtons(size_t numVisibleAxes) const noexcept override { return 0; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;
diff --git a/src/Movement/Kinematics/PolarKinematics.h b/src/Movement/Kinematics/PolarKinematics.h
index f4652745..60483b38 100644
--- a/src/Movement/Kinematics/PolarKinematics.h
+++ b/src/Movement/Kinematics/PolarKinematics.h
@@ -23,7 +23,6 @@ public:
bool IsReachable(float axesCoords[MaxAxes], AxesBitmap axes) const noexcept override;
LimitPositionResult LimitPosition(float finalCoords[], const float * null initialCoords, size_t numAxes, AxesBitmap axesToLimit, bool isCoordinated, bool applyM208Limits) const noexcept override;
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
- const char* HomingButtonNames() const noexcept override { return "RTZUVWABC"; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;
diff --git a/src/Movement/Kinematics/RotaryDeltaKinematics.h b/src/Movement/Kinematics/RotaryDeltaKinematics.h
index 4b3de297..b0361fdb 100644
--- a/src/Movement/Kinematics/RotaryDeltaKinematics.h
+++ b/src/Movement/Kinematics/RotaryDeltaKinematics.h
@@ -30,7 +30,6 @@ public:
LimitPositionResult LimitPosition(float finalCoords[], const float * null initialCoords, size_t numVisibleAxes, AxesBitmap axesToLimit, bool isCoordinated, bool applyM208Limits) const noexcept override;
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
AxesBitmap AxesToHomeBeforeProbing() const noexcept override { return XyzAxes; }
- size_t NumHomingButtons(size_t numVisibleAxes) const noexcept override { return 0; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;
diff --git a/src/Movement/Kinematics/ScaraKinematics.cpp b/src/Movement/Kinematics/ScaraKinematics.cpp
index 9ec01ac9..c6c95e30 100644
--- a/src/Movement/Kinematics/ScaraKinematics.cpp
+++ b/src/Movement/Kinematics/ScaraKinematics.cpp
@@ -371,26 +371,6 @@ AxesBitmap ScaraKinematics::MustBeHomedAxes(AxesBitmap axesMoving, bool disallow
return axesMoving;
}
-size_t ScaraKinematics::NumHomingButtons(size_t numVisibleAxes) const noexcept
-{
-#if HAS_MASS_STORAGE
- const Platform& platform = reprap.GetPlatform();
- if (!platform.SysFileExists(HomeProximalFileName))
- {
- return 0;
- }
- if (!platform.SysFileExists(HomeDistalFileName))
- {
- return 1;
- }
- if (!platform.SysFileExists("homez.g"))
- {
- return 2;
- }
-#endif
- return numVisibleAxes;
-}
-
// This function is called when a request is made to home the axes in 'toBeHomed' and the axes in 'alreadyHomed' have already been homed.
// If we can proceed with homing some axes, return the name of the homing file to be called.
// If we can't proceed because other axes need to be homed first, return nullptr and pass those axes back in 'mustBeHomedFirst'.
diff --git a/src/Movement/Kinematics/ScaraKinematics.h b/src/Movement/Kinematics/ScaraKinematics.h
index 6dee145d..2a6920bf 100644
--- a/src/Movement/Kinematics/ScaraKinematics.h
+++ b/src/Movement/Kinematics/ScaraKinematics.h
@@ -33,8 +33,6 @@ public:
bool IsReachable(float axesCoords[MaxAxes], AxesBitmap axes) const noexcept override;
LimitPositionResult LimitPosition(float finalCoords[], const float * null initialCoords, size_t numAxes, AxesBitmap axesToLimit, bool isCoordinated, bool applyM208Limits) const noexcept override;
void GetAssumedInitialPosition(size_t numAxes, float positions[]) const noexcept override;
- size_t NumHomingButtons(size_t numVisibleAxes) const noexcept override;
- const char* HomingButtonNames() const noexcept override { return "PDZUVWABC"; }
HomingMode GetHomingMode() const noexcept override { return HomingMode::homeIndividualMotors; }
AxesBitmap AxesAssumedHomed(AxesBitmap g92Axes) const noexcept override;
AxesBitmap MustBeHomedAxes(AxesBitmap axesMoving, bool disallowMovesBeforeHoming) const noexcept override;