Tidied up for static analysis

18 files changed, 46 insertions, 44 deletions

diff --git a/src/Display/Lcd/Lcd.cpp b/src/Display/Lcd/Lcd.cpp
index 303a3bf5..2946d742 100644
--- a/src/Display/Lcd/Lcd.cpp
+++ b/src/Display/Lcd/Lcd.cpp
@@ -503,7 +503,7 @@ void Lcd::Circle(PixelNumber x0, PixelNumber y0, PixelNumber radius, PixelMode m
 }
 
 // Draw a bitmap. x0 and numCols must be divisible by 8.
-void Lcd::Bitmap(PixelNumber x0, PixelNumber y0, PixelNumber width, PixelNumber height, const uint8_t data[]) noexcept
+void Lcd::BitmapImage(PixelNumber x0, PixelNumber y0, PixelNumber width, PixelNumber height, const uint8_t data[]) noexcept
 {
 	for (PixelNumber r = 0; r < height && r + y0 < numRows; ++r)
 	{
diff --git a/src/Display/Lcd/Lcd.h b/src/Display/Lcd/Lcd.h
index f256c5a9..9fdd0fee 100644
--- a/src/Display/Lcd/Lcd.h
+++ b/src/Display/Lcd/Lcd.h
@@ -132,7 +132,7 @@ public:
 	//  width = width of bitmap in pixels. Currently, must be a multiple of 8.
 	//  rows = height of bitmap in pixels
 	//  data = bitmap image, must be ((width/8) * rows) bytes long
-	void Bitmap(PixelNumber top, PixelNumber left, PixelNumber height, PixelNumber width, const uint8_t data[]) noexcept;
+	void BitmapImage(PixelNumber top, PixelNumber left, PixelNumber height, PixelNumber width, const uint8_t data[]) noexcept;
 
 	// Draw a bitmap row
 	//  x0 = x-coordinate of the top left, measured from left hand edge of the display
diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp
index 2dbfbee6..d11db3b7 100644
--- a/src/Display/MenuItem.cpp
+++ b/src/Display/MenuItem.cpp
@@ -622,7 +622,7 @@ bool ValueMenuItem::Adjust_AlterHelper(int clicks) noexcept
 				{
 					currentValue.f = 95.0 - 1.0;
 				}
-				currentValue.f = min<int>(currentValue.f + (float)clicks, reprap.GetHeat().GetHighestTemperatureLimit(reprap.GetTool(itemNumber)->Heater(0)));
+				currentValue.f = min<int>(currentValue.f + (float)clicks, reprap.GetHeat().GetHighestTemperatureLimit(reprap.GetTool(itemNumber)->GetHeater(0)));
 			}
 		}
 		else
diff --git a/src/Endstops/SwitchEndstop.h b/src/Endstops/SwitchEndstop.h
index 89fb98fa..eee094e1 100644
--- a/src/Endstops/SwitchEndstop.h
+++ b/src/Endstops/SwitchEndstop.h
@@ -16,7 +16,7 @@ class SwitchEndstop : public Endstop
 public:
 	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<SwitchEndstop>(); }
 	void operator delete(void* p) noexcept { FreelistManager::Release<SwitchEndstop>(p); }
-	~SwitchEndstop() noexcept override;
+	~SwitchEndstop() override;
 
 	SwitchEndstop(uint8_t p_axis, EndStopPosition pos) noexcept;
 
diff --git a/src/Endstops/ZProbe.h b/src/Endstops/ZProbe.h
index f43ea340..3c45f3ef 100644
--- a/src/Endstops/ZProbe.h
+++ b/src/Endstops/ZProbe.h
@@ -109,7 +109,7 @@ public:
 	void operator delete(void* p) noexcept { FreelistManager::Release<MotorStallZProbe>(p); }
 
 	MotorStallZProbe(unsigned int num) noexcept : ZProbe(num, ZProbeType::zMotorStall) { }
-	~MotorStallZProbe() noexcept override { }
+	~MotorStallZProbe() override { }
 	void SetIREmitter(bool on) const noexcept override { }
 	uint16_t GetRawReading() const noexcept override { return 4000; }
 	bool SetProbing(bool isProbing) noexcept override { return true; }
diff --git a/src/GCodes/GCodeChannel.h b/src/GCodes/GCodeChannel.h
index cc36acca..7ea8434a 100644
--- a/src/GCodes/GCodeChannel.h
+++ b/src/GCodes/GCodeChannel.h
@@ -13,7 +13,9 @@
 
 // The Microchip device library for SAME5x defines USB as the USB peripheral.
 // We can't change the channel name to something else because it breaks compatibility with DSF, so #undef it here
-#undef USB
+#ifdef USB
+# undef USB
+#endif
 
 NamedEnum(GCodeChannel, uint8_t, HTTP, Telnet, File, USB, Aux, Trigger, Queue, LCD, SBC, Daemon, Aux2, Autopause);
 
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp
index 440e981f..bf3d76bb 100644
--- a/src/GCodes/GCodes.cpp
+++ b/src/GCodes/GCodes.cpp
@@ -1711,7 +1711,7 @@ const char * GCodes::LoadExtrusionAndFeedrateFromGCode(GCodeBuffer& gb, bool isP
 					if (thisMix != 0.0)
 					{
 						totalMix += thisMix;
-						const int extruder = tool->Drive(eDrive);
+						const int extruder = tool->GetDrive(eDrive);
 						float extrusionAmount = requestedExtrusionAmount * thisMix;
 						if (gb.LatestMachineState().volumetricExtrusion)
 						{
@@ -1742,7 +1742,7 @@ const char * GCodes::LoadExtrusionAndFeedrateFromGCode(GCodeBuffer& gb, bool isP
 				{
 					for (size_t eDrive = 0; eDrive < mc; eDrive++)
 					{
-						const int extruder = tool->Drive(eDrive);
+						const int extruder = tool->GetDrive(eDrive);
 						float extrusionAmount = gb.ConvertDistance(eMovement[eDrive]);
 						if (extrusionAmount != 0.0)
 						{
@@ -3992,7 +3992,7 @@ GCodeResult GCodes::RetractFilament(GCodeBuffer& gb, bool retract)
 				{
 					for (size_t i = 0; i < tool->DriveCount(); ++i)
 					{
-						moveState.coords[ExtruderToLogicalDrive(tool->Drive(i))] = -currentTool->GetRetractLength();
+						moveState.coords[ExtruderToLogicalDrive(tool->GetDrive(i))] = -currentTool->GetRetractLength();
 					}
 					moveState.feedRate = currentTool->GetRetractSpeed() * tool->DriveCount();
 					moveState.canPauseAfter = false;			// don't pause after a retraction because that could cause too much retraction
@@ -4021,7 +4021,7 @@ GCodeResult GCodes::RetractFilament(GCodeBuffer& gb, bool retract)
 				{
 					for (size_t i = 0; i < tool->DriveCount(); ++i)
 					{
-						moveState.coords[ExtruderToLogicalDrive(tool->Drive(i))] = currentTool->GetRetractLength() + currentTool->GetRetractExtra();
+						moveState.coords[ExtruderToLogicalDrive(tool->GetDrive(i))] = currentTool->GetRetractLength() + currentTool->GetRetractExtra();
 					}
 					moveState.feedRate = currentTool->GetUnRetractSpeed() * tool->DriveCount();
 					moveState.canPauseAfter = true;
@@ -4271,7 +4271,7 @@ bool GCodes::ToolHeatersAtSetTemperatures(const Tool *tool, bool waitWhenCooling
 	{
 		for (size_t i = 0; i < tool->HeaterCount(); ++i)
 		{
-			if (!reprap.GetHeat().HeaterAtSetTemperature(tool->Heater(i), waitWhenCooling, tolerance))
+			if (!reprap.GetHeat().HeaterAtSetTemperature(tool->GetHeater(i), waitWhenCooling, tolerance))
 			{
 				return false;
 			}
@@ -5087,7 +5087,7 @@ int GCodes::GetHeaterNumber(unsigned int itemNumber) const noexcept
 	if (itemNumber < 80)
 	{
 		ReadLockedPointer<Tool> const tool = (itemNumber == 79) ? reprap.GetLockedCurrentTool() : reprap.GetTool(itemNumber);
-		return (tool.IsNotNull() && tool->HeaterCount() != 0) ? tool->Heater(0) : -1;
+		return (tool.IsNotNull() && tool->HeaterCount() != 0) ? tool->GetHeater(0) : -1;
 	}
 	if (itemNumber < 90)
 	{
diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h
index 5724bc6e..0b56edbc 100644
--- a/src/GCodes/GCodes.h
+++ b/src/GCodes/GCodes.h
@@ -368,8 +368,8 @@ private:
 	bool HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException);	// Do an M code
 	bool HandleTcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException);	// Do a T code
 	bool HandleQcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException);	// Do an internal code
-	bool HandleResult(GCodeBuffer& gb, GCodeResult rslt, const StringRef& reply, OutputBuffer *outBuf)
-		pre(outBuf == nullptr || rslt == GCodeResult::ok) noexcept;
+	bool HandleResult(GCodeBuffer& gb, GCodeResult rslt, const StringRef& reply, OutputBuffer *outBuf) noexcept
+		pre(outBuf == nullptr || rslt == GCodeResult::ok);
 
 	void HandleReply(GCodeBuffer& gb, OutputBuffer *reply) noexcept;
 	void HandleReplyPreserveResult(GCodeBuffer& gb, GCodeResult rslt, const char *reply) noexcept;	// Handle G-Code replies
@@ -456,7 +456,7 @@ private:
 	void DoEmergencyStop() noexcept;											// Execute an emergency stop
 
 	void DoPause(GCodeBuffer& gb, PauseReason reason, const char *msg, uint16_t param = 0) noexcept	// Pause the print
-		pre(resourceOwners[movementResource] = &gb);
+		pre(resourceOwners[movementResource] == &gb);
 	void CheckForDeferredPause(GCodeBuffer& gb) noexcept;						// Check if a pause is pending, action it if so
 
 #if HAS_VOLTAGE_MONITOR || HAS_SMART_DRIVERS
diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp
index fa1cc47d..bb8292b3 100644
--- a/src/GCodes/GCodes4.cpp
+++ b/src/GCodes/GCodes4.cpp
@@ -1395,7 +1395,7 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
 				reprap.GetMove().GetCurrentUserPosition(moveState.coords, 0, tool);
 				for (size_t i = 0; i < tool->DriveCount(); ++i)
 				{
-					moveState.coords[ExtruderToLogicalDrive(tool->Drive(i))] = tool->GetRetractLength() + tool->GetRetractExtra();
+					moveState.coords[ExtruderToLogicalDrive(tool->GetDrive(i))] = tool->GetRetractLength() + tool->GetRetractExtra();
 				}
 				moveState.feedRate = tool->GetUnRetractSpeed() * tool->DriveCount();
 				moveState.filePos = (&gb == fileGCode) ? gb.GetFilePosition() : noFilePosition;
diff --git a/src/Heating/Heat.cpp b/src/Heating/Heat.cpp
index f07ffb31..2b2f361b 100644
--- a/src/Heating/Heat.cpp
+++ b/src/Heating/Heat.cpp
@@ -973,7 +973,7 @@ GCodeResult Heat::TuneHeater(GCodeBuffer& gb, const StringRef& reply) THROWS(GCo
 		}
 		else
 		{
-			heaterNumber = tool->Heater(0);
+			heaterNumber = tool->GetHeater(0);
 		}
 		fans = tool->GetFanMapping();
 	}
diff --git a/src/Heating/Heat.h b/src/Heating/Heat.h
index 11418186..05232da5 100644
--- a/src/Heating/Heat.h
+++ b/src/Heating/Heat.h
@@ -106,7 +106,7 @@ public:
 		return lastStandbyTools[heater];
 	}
 
-	bool IsHeaterEnabled(size_t heater)	const noexcept;					// Is this heater enabled?
+	bool IsHeaterEnabled(size_t heater)	const noexcept					// Is this heater enabled?
 	pre(heater < MaxHeaters);
 
 	float GetActiveTemperature(int heater) const noexcept;
diff --git a/src/Movement/BedProbing/Grid.h b/src/Movement/BedProbing/Grid.h
index 0bcafb16..b7366d32 100644
--- a/src/Movement/BedProbing/Grid.h
+++ b/src/Movement/BedProbing/Grid.h
@@ -31,7 +31,7 @@ public:
 
 	uint32_t NumAxisPoints(size_t axis) const noexcept pre(axis < 2) { return nums[axis]; }
 	uint32_t NumPoints() const noexcept { return nums[0] * nums[1]; }
-	float GetCoordinate(size_t axis, size_t coordinateIndex) pre(axis < 2) const noexcept { return mins[axis] + (coordinateIndex * spacings[axis]); }
+	float GetCoordinate(size_t axis, size_t coordinateIndex) const noexcept pre(axis < 2) { return mins[axis] + (coordinateIndex * spacings[axis]); }
 	bool IsInRadius(float x, float y) const noexcept;
 	bool IsValid() const noexcept { return isValid; }
 
diff --git a/src/Movement/Move.cpp b/src/Movement/Move.cpp
index 08f167e0..718da83d 100644
--- a/src/Movement/Move.cpp
+++ b/src/Movement/Move.cpp
@@ -239,7 +239,7 @@ void Move::Init() noexcept
 	longestGcodeWaitInterval = 0;
 	bedLevellingMoveAvailable = false;
 
-	moveTask.Create(MoveStart, "Move", this, TaskPriority::Move);
+	moveTask.Create(MoveStart, "Move", this, TaskPriority::MovePriority);
 }
 
 void Move::Exit() noexcept
diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h
index 5a6749e4..744e9a50 100644
--- a/src/ObjectModel/ObjectModel.h
+++ b/src/ObjectModel/ObjectModel.h
@@ -303,11 +303,11 @@ public:
 	void ReportAsJson(OutputBuffer *buf, const char *filter, const char *reportFlags, bool wantArrayLength) const THROWS(GCodeException);
 
 	// Get the value of an object via the table
-	ExpressionValue GetObjectValueUsingTableNumber(ObjectExplorationContext& context, const ObjectModelClassDescriptor * null classDescriptor, const char *idString, uint8_t tableNumber) const THROWS(GCodeException);
+	ExpressionValue GetObjectValueUsingTableNumber(ObjectExplorationContext& context, const ObjectModelClassDescriptor * null classDescriptor, const char *_ecv_array idString, uint8_t tableNumber) const THROWS(GCodeException);
 
 	// Function to report a value or object as JSON. This does not need to handle 'var' or 'global' because those are checked for before this is called.
 	void ReportItemAsJson(OutputBuffer *buf, ObjectExplorationContext& context, const ObjectModelClassDescriptor *classDescriptor,
-							const ExpressionValue& val, const char *filter) const THROWS(GCodeException);
+							const ExpressionValue& val, const char *_ecv_array filter) const THROWS(GCodeException);
 
 	// Skip the current element in the ID or filter string
 	static const char* GetNextElement(const char *id) noexcept;
@@ -315,16 +315,16 @@ public:
 protected:
 	// Construct a JSON representation of those parts of the object model requested by the user
 	// Overridden in class GlobalVariables
-	virtual void ReportAsJson(OutputBuffer *buf, ObjectExplorationContext& context, const ObjectModelClassDescriptor * null classDescriptor, uint8_t tableNumber, const char *filter) const THROWS(GCodeException);
+	virtual void ReportAsJson(OutputBuffer *buf, ObjectExplorationContext& context, const ObjectModelClassDescriptor * null classDescriptor, uint8_t tableNumber, const char *_ecv_array filter) const THROWS(GCodeException);
 
 	// Report an entire array as JSON
-	void ReportArrayAsJson(OutputBuffer *buf, ObjectExplorationContext& context, const ObjectModelClassDescriptor *classDescriptor, const ObjectModelArrayDescriptor *omad, const char *filter) const THROWS(GCodeException);
+	void ReportArrayAsJson(OutputBuffer *buf, ObjectExplorationContext& context, const ObjectModelClassDescriptor *classDescriptor, const ObjectModelArrayDescriptor *omad, const char *_ecv_array filter) const THROWS(GCodeException);
 
 	// Get the value of an object that we hold
-	ExpressionValue GetObjectValue(ObjectExplorationContext& context, const ObjectModelClassDescriptor *classDescriptor, const ExpressionValue& val, const char *idString) const THROWS(GCodeException);
+	ExpressionValue GetObjectValue(ObjectExplorationContext& context, const ObjectModelClassDescriptor *classDescriptor, const ExpressionValue& val, const char *_ecv_array idString) const THROWS(GCodeException);
 
 	// Get the object model table entry for the current level object in the query
-	const ObjectModelTableEntry *FindObjectModelTableEntry(const ObjectModelClassDescriptor *classDescriptor, uint8_t tableNumber, const char *idString) const noexcept;
+	const ObjectModelTableEntry *FindObjectModelTableEntry(const ObjectModelClassDescriptor *classDescriptor, uint8_t tableNumber, const char *_ecv_array idString) const noexcept;
 
 	virtual const ObjectModelClassDescriptor *GetObjectModelClassDescriptor() const noexcept = 0;
 
@@ -360,7 +360,7 @@ class ObjectModelTableEntry
 public:
 	// Type declarations
 	// Type of the function pointer in the table entry, that returns the data
-	typedef ExpressionValue(*DataFetchPtr_t)(const ObjectModel*, ObjectExplorationContext&) noexcept;
+	typedef ExpressionValue(*DataFetchPtr_t)(const ObjectModel *_ecv_from, ObjectExplorationContext&) noexcept;
 
 	// Member data. This must be public so that we can brace-initialise table entries.
 	const char *_ecv_array name;		// name of this field
diff --git a/src/Platform/RepRap.cpp b/src/Platform/RepRap.cpp
index 57bfca22..86317c53 100644
--- a/src/Platform/RepRap.cpp
+++ b/src/Platform/RepRap.cpp
@@ -1070,7 +1070,7 @@ void RepRap::DeleteTool(int toolNumber) noexcept
 			// Switch off any associated heaters
 			for (size_t i = 0; i < tool->HeaterCount(); i++)
 			{
-				heat->SwitchOff(tool->Heater(i));
+				heat->SwitchOff(tool->GetHeater(i));
 			}
 
 			break;
@@ -1190,7 +1190,7 @@ bool RepRap::IsHeaterAssignedToTool(int8_t heater) const noexcept
 	{
 		for (size_t i = 0; i < tool->HeaterCount(); i++)
 		{
-			if (tool->Heater(i) == heater)
+			if (tool->GetHeater(i) == heater)
 			{
 				// It's already in use by some tool
 				return true;
@@ -1234,7 +1234,7 @@ void RepRap::ReportToolTemperatures(const StringRef& reply, const Tool *tool, bo
 		char sep = ':';
 		for (size_t i = 0; i < tool->HeaterCount(); ++i)
 		{
-			const int heater = tool->Heater(i);
+			const int heater = tool->GetHeater(i);
 			reply.catf("%c%.1f /%.1f", sep, (double)heat.GetHeaterTemperature(heater), (double)heat.GetTargetTemperature(heater));
 			sep = ' ';
 		}
@@ -1717,11 +1717,11 @@ OutputBuffer *RepRap::GetStatusResponse(uint8_t type, ResponseSource source) con
 				}
 
 				// Heaters
-				AppendIntArray(response, "heaters", tool->HeaterCount(), [tool](size_t heater) noexcept { return tool->Heater(heater); });
+				AppendIntArray(response, "heaters", tool->HeaterCount(), [tool](size_t heater) noexcept { return tool->GetHeater(heater); });
 
 				// Extruder drives
 				response->cat(',');
-				AppendIntArray(response, "drives", tool->DriveCount(), [tool](size_t drive) noexcept { return tool->Drive(drive); });
+				AppendIntArray(response, "drives", tool->DriveCount(), [tool](size_t drive) noexcept { return tool->GetDrive(drive); });
 
 				// Axis mapping
 				response->cat(",\"axisMap\":[[");
@@ -2613,7 +2613,7 @@ unsigned int RepRap::GetProhibitedExtruderMovements(unsigned int extrusions, uns
 	unsigned int result = 0;
 	for (size_t driveNum = 0; driveNum < tool->DriveCount(); driveNum++)
 	{
-		const unsigned int extruderDrive = (unsigned int)(tool->Drive(driveNum));
+		const unsigned int extruderDrive = (unsigned int)(tool->GetDrive(driveNum));
 		const unsigned int mask = 1 << extruderDrive;
 		if (extrusions & mask)
 		{
diff --git a/src/Platform/TaskPriorities.h b/src/Platform/TaskPriorities.h
index 7a876799..b86bf381 100644
--- a/src/Platform/TaskPriorities.h
+++ b/src/Platform/TaskPriorities.h
@@ -21,7 +21,7 @@ namespace TaskPriority
     //EMAC priority = 3 defined in FreeRTOSIPConfig.h
 #endif
     constexpr unsigned int HeatPriority = 3;
-	constexpr unsigned int Move = 4;
+	constexpr unsigned int MovePriority = 4;
 	constexpr unsigned int TmcPriority = 4;
 	constexpr unsigned int AinPriority = 4;
 	constexpr unsigned int HeightFollowingPriority = 4;
diff --git a/src/RepRapFirmware.pdp b/src/RepRapFirmware.pdp
index 18d7fddb..411fe08b 100644
--- a/src/RepRapFirmware.pdp
+++ b/src/RepRapFirmware.pdp
diff --git a/src/Tools/Tool.h b/src/Tools/Tool.h
index 5ff3da34..f08c8a94 100644
--- a/src/Tools/Tool.h
+++ b/src/Tools/Tool.h
@@ -51,7 +51,7 @@ public:
 
 	static Tool *Create(
 			unsigned int toolNumber,
-			const char *toolName,
+			const char *_ecv_array toolName,
 			int32_t d[], size_t dCount,
 			int32_t h[], size_t hCount,
 			AxesBitmap xMap,
@@ -70,21 +70,21 @@ public:
 	void SetOffset(size_t axis, float offs, bool byProbing) noexcept pre(axis < MaxAxes);
 	AxesBitmap GetAxisOffsetsProbed() const noexcept { return axisOffsetsProbed; }
 	size_t DriveCount() const noexcept;
-	int Drive(size_t driveNumber) const noexcept;
+	int GetDrive(size_t driveNumber) const noexcept pre(driverNumber < DriveCount());
 	bool ToolCanDrive(bool extrude) noexcept;
 	size_t HeaterCount() const noexcept;
-	int Heater(size_t heaterNumber) const noexcept;
-	const char *GetName() const noexcept;
+	int GetHeater(size_t heaterNumber) const noexcept pre(heaterNumber < HeaterCount());
+	const char *_ecv_array GetName() const noexcept;
 	int Number() const noexcept;
 	void DefineMix(const float m[]) noexcept;
-	const float* GetMix() const noexcept;
+	const float *_ecv_array GetMix() const noexcept;
 	void Print(const StringRef& reply) const noexcept;
 	AxesBitmap GetXAxisMap() const noexcept { return axisMapping[0]; }
 	AxesBitmap GetYAxisMap() const noexcept { return axisMapping[1]; }
 	FansBitmap GetFanMapping() const noexcept { return fanMapping; }
 	Filament *GetFilament() const noexcept { return filament; }
 	const char *GetFilamentName() const noexcept;
-	Tool *Next() const noexcept { return next; }
+	Tool *null Next() const noexcept { return next; }
 	ToolState GetState() const noexcept { return state; }
 
 	bool IsRetracted() const noexcept { return isRetracted; }
@@ -151,10 +151,10 @@ private:
 
 	static void ToolUpdated() noexcept { reprap.ToolsUpdated(); }	// call this whenever we change a variable that is reported in the OM as non-live
 
-	Tool* next;
+	Tool* null next;
 	Filament *filament;
 	int filamentExtruder;
-	const char *name;
+	const char *_ecv_array name;
 	float offset[MaxAxes];
 	float mix[MaxExtrudersPerTool];
 	float activeTemperatures[MaxHeatersPerTool];
@@ -186,7 +186,7 @@ private:
 	volatile bool displayColdExtrudeWarning;
 };
 
-inline int Tool::Drive(size_t driveNumber) const noexcept
+inline int Tool::GetDrive(size_t driveNumber) const noexcept
 {
 	return drives[driveNumber];
 }
@@ -196,7 +196,7 @@ inline size_t Tool::HeaterCount() const noexcept
 	return heaterCount;
 }
 
-inline int Tool::Heater(size_t heaterNumber) const noexcept
+inline int Tool::GetHeater(size_t heaterNumber) const noexcept
 {
 	return heaters[heaterNumber];
 }