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:
Diffstat (limited to 'src/Movement/DDA.h')
-rw-r--r--src/Movement/DDA.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Movement/DDA.h b/src/Movement/DDA.h
index 290c6d69..c4ce6b34 100644
--- a/src/Movement/DDA.h
+++ b/src/Movement/DDA.h
@@ -51,14 +51,16 @@ struct PrepParams
float initialSpeedFraction, finalSpeedFraction;
#endif
+#if SUPPORT_LINEAR_DELTA
// Parameters used only for delta moves
float initialX, initialY;
-#if SUPPORT_CAN_EXPANSION
+# if SUPPORT_CAN_EXPANSION
float finalX, finalY;
float zMovement;
-#endif
+# endif
const LinearDeltaKinematics *dparams;
float a2plusb2; // sum of the squares of the X and Y movement fractions
+#endif
// Set up the parameters from the DDA, excluding steadyClocks because that may be affected by input shaping
void SetFromDDA(const DDA& dda) noexcept;
@@ -272,8 +274,10 @@ private:
{
struct
{
- uint16_t endCoordinatesValid : 1, // True if endCoordinates can be relied on
+ uint16_t endCoordinatesValid : 1, // True if endCoordinates can be relied
+#if SUPPORT_LINEAR_DELTA
isDeltaMovement : 1, // True if this is a delta printer movement
+#endif
canPauseAfter : 1, // True if we can pause at the end of this move
isPrintingMove : 1, // True if this move includes XY movement and extrusion
usePressureAdvance : 1, // True if pressure advance should be applied to any forward extrusion
@@ -340,7 +344,7 @@ private:
static_assert(MaxAxesPlusExtruders <= DriversBitmap::MaxBits());
#endif
// These are used only in delta calculations
-#if !MS_USE_FPU
+#if SUPPORT_LINEAR_DELTA && !MS_USE_FPU
int32_t cKc; // The Z movement fraction multiplied by Kc and converted to integer
#endif
} afterPrepare;