diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-31 22:25:44 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-31 22:25:44 +0300 |
| commit | 97ead36a9b3e8a5ee3019c7a3c1ac6a4289408cc (patch) | |
| tree | 5b6cd088b180c003c9974937b1173459a218f066 /src/Platform | |
| parent | 9b90cdf445b9893eb93c02317ef87965ec60657f (diff) | |
Tidied up for static analysis
Diffstat (limited to 'src/Platform')
| -rw-r--r-- | src/Platform/RepRap.cpp | 12 | ||||
| -rw-r--r-- | src/Platform/TaskPriorities.h | 2 |
2 files changed, 7 insertions, 7 deletions
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; |