Increased MaxExtruders to 8 on Duet 3 Mini

Also removed NumDefaultExtruders

7 files changed, 3 insertions, 14 deletions

diff --git a/src/Duet3Mini/Pins_Duet3Mini.h b/src/Duet3Mini/Pins_Duet3Mini.h
index 3c5d3a2b..5f879b2a 100644
--- a/src/Duet3Mini/Pins_Duet3Mini.h
+++ b/src/Duet3Mini/Pins_Duet3Mini.h
@@ -97,13 +97,11 @@ constexpr size_t MinAxes = 3;						// The minimum and default number of axes
 constexpr size_t MaxAxes = 10;						// The maximum number of movement axes in the machine
 constexpr size_t MaxDriversPerAxis = 4;				// The maximum number of stepper drivers assigned to one axis
 
-constexpr size_t MaxExtruders = 5;					// The maximum number of extruders
-constexpr size_t NumDefaultExtruders = 0;			// The number of drivers that we configure as extruders by default
-
+constexpr size_t MaxExtruders = 8;					// The maximum number of extruders
 constexpr size_t MaxAxesPlusExtruders = 12;
 
 constexpr size_t MaxHeatersPerTool = 2;
-constexpr size_t MaxExtrudersPerTool = 5;
+constexpr size_t MaxExtrudersPerTool = 8;
 
 constexpr unsigned int MaxTriggers = 16;			// Maximum number of triggers
 
diff --git a/src/Duet3_V06/Pins_Duet3_V06.h b/src/Duet3_V06/Pins_Duet3_V06.h
index 37e8c2a3..ce5e2b7f 100644
--- a/src/Duet3_V06/Pins_Duet3_V06.h
+++ b/src/Duet3_V06/Pins_Duet3_V06.h
@@ -80,8 +80,6 @@ constexpr size_t MaxAxes = 15;						// The maximum number of movement axes in th
 constexpr size_t MaxDriversPerAxis = 8;				// The maximum number of stepper drivers assigned to one axis
 
 constexpr size_t MaxExtruders = 16;					// The maximum number of extruders
-constexpr size_t NumDefaultExtruders = 0;			// The number of drivers that we configure as extruders by default
-
 constexpr size_t MaxAxesPlusExtruders = 25;			// May be <= MaxAxes + MaxExtruders
 
 constexpr size_t MaxHeatersPerTool = 8;
diff --git a/src/DuetM/Pins_DuetM.h b/src/DuetM/Pins_DuetM.h
index 5a35ab0a..eb5318b9 100644
--- a/src/DuetM/Pins_DuetM.h
+++ b/src/DuetM/Pins_DuetM.h
@@ -77,8 +77,6 @@ constexpr size_t MaxAxes = 6;						// The maximum number of movement axes in the
 constexpr size_t MaxDriversPerAxis = 4;				// The maximum number of stepper drivers assigned to one axis
 
 constexpr size_t MaxExtruders = 4;					// The maximum number of extruders
-constexpr size_t NumDefaultExtruders = 0;			// The number of drivers that we configure as extruders by default
-
 constexpr size_t MaxAxesPlusExtruders = 7;
 
 constexpr size_t MaxHeatersPerTool = 2;
diff --git a/src/DuetNG/Pins_DuetNG.h b/src/DuetNG/Pins_DuetNG.h
index e01a5b9e..ff675125 100644
--- a/src/DuetNG/Pins_DuetNG.h
+++ b/src/DuetNG/Pins_DuetNG.h
@@ -130,8 +130,6 @@ constexpr size_t MaxAxes = 10;						// The maximum number of movement axes in th
 constexpr size_t MaxDriversPerAxis = 5;				// The maximum number of stepper drivers assigned to one axis
 
 constexpr size_t MaxExtruders = 7;					// The maximum number of extruders
-constexpr size_t NumDefaultExtruders = 0;			// The number of drivers that we configure as extruders by default
-
 constexpr size_t MaxAxesPlusExtruders = 12;
 
 constexpr size_t MaxHeatersPerTool = 8;
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp
index 8f922941..ff28a27c 100644
--- a/src/GCodes/GCodes.cpp
+++ b/src/GCodes/GCodes.cpp
@@ -158,7 +158,7 @@ void GCodes::Init() noexcept
 	axisLetters[1] = 'Y';
 	axisLetters[2] = 'Z';
 
-	numExtruders = NumDefaultExtruders;
+	numExtruders = 0;
 
 	Reset();
 
diff --git a/src/Pccb/Pins_Pccb.h b/src/Pccb/Pins_Pccb.h
index fff78afa..1ca556ff 100644
--- a/src/Pccb/Pins_Pccb.h
+++ b/src/Pccb/Pins_Pccb.h
@@ -107,8 +107,6 @@ constexpr size_t MaxAxes = 6;						// The maximum number of movement axes in the
 constexpr size_t MaxDriversPerAxis = 4;				// The maximum number of stepper drivers assigned to one axis
 
 constexpr size_t MaxExtruders = 3;					// The maximum number of extruders
-constexpr size_t NumDefaultExtruders = 0;			// The number of drivers that we configure as extruders by default
-
 constexpr size_t MaxAxesPlusExtruders = NumDirectDrivers;
 
 constexpr size_t MaxHeatersPerTool = 2;
diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h
index 769de336..fbe2f588 100644
--- a/src/RepRapFirmware.h
+++ b/src/RepRapFirmware.h
@@ -455,7 +455,6 @@ constexpr size_t U_AXIS = 3;										// The assumed index of the U axis when ex
 constexpr size_t NO_AXIS = 0x3F;									// A value to represent no axis, must fit in 6 bits (see EndstopHitDetails and RemoteInputHandle) and not be a valid axis number
 
 static_assert(MaxAxesPlusExtruders <= MaxAxes + MaxExtruders);
-static_assert(MaxAxesPlusExtruders >= MinAxes + NumDefaultExtruders);
 
 #if SUPPORT_CAN_EXPANSION
 constexpr size_t MaxTotalDrivers = NumDirectDrivers + MaxCanDrivers;