diff options
| author | David Crocker <dcrocker@eschertech.com> | 2018-02-04 22:38:29 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2018-02-04 22:38:29 +0300 |
| commit | 1448121041393c9a878c3dd84ddd97dff2a4687f (patch) | |
| tree | 23441e82f7705680779812bba25a953e6e5a2379 /src/Tools | |
| parent | 7dc0079595cab16ebf1563b59c07e24b341c3efa (diff) | |
Towards 1.21RC2
Refactored some string handling
Fixes for Duet 2M
Diffstat (limited to 'src/Tools')
| -rw-r--r-- | src/Tools/Tool.cpp | 4 | ||||
| -rw-r--r-- | src/Tools/Tool.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Tools/Tool.cpp b/src/Tools/Tool.cpp index 0228a129..c7fb4e53 100644 --- a/src/Tools/Tool.cpp +++ b/src/Tools/Tool.cpp @@ -34,7 +34,7 @@ Tool * Tool::freelist = nullptr; // Create a new tool and return a pointer to it. If an error occurs, put an error message in 'reply' and return nullptr. -/*static*/ Tool *Tool::Create(int toolNumber, const char *name, long d[], size_t dCount, long h[], size_t hCount, AxesBitmap xMap, AxesBitmap yMap, FansBitmap fanMap, StringRef& reply) +/*static*/ Tool *Tool::Create(int toolNumber, const char *name, long d[], size_t dCount, long h[], size_t hCount, AxesBitmap xMap, AxesBitmap yMap, FansBitmap fanMap, const StringRef& reply) { const size_t numExtruders = reprap.GetGCodes().GetNumExtruders(); if (dCount > ARRAY_SIZE(Tool::drives)) @@ -151,7 +151,7 @@ Tool * Tool::freelist = nullptr; } } -void Tool::Print(StringRef& reply) const +void Tool::Print(const StringRef& reply) const { reply.printf("Tool %d - ", myNumber); if (name != nullptr) diff --git a/src/Tools/Tool.h b/src/Tools/Tool.h index 776a1587..a2f88e35 100644 --- a/src/Tools/Tool.h +++ b/src/Tools/Tool.h @@ -45,7 +45,7 @@ class Tool { public: - static Tool *Create(int toolNumber, const char *name, long d[], size_t dCount, long h[], size_t hCount, AxesBitmap xMap, AxesBitmap yMap, FansBitmap fanMap, StringRef& reply); + static Tool *Create(int toolNumber, const char *name, long d[], size_t dCount, long h[], size_t hCount, AxesBitmap xMap, AxesBitmap yMap, FansBitmap fanMap, const StringRef& reply); static void Delete(Tool *t); float GetOffset(size_t axis) const pre(axis < MaxAxes); @@ -63,7 +63,7 @@ public: void DefineMix(const float m[]); const float* GetMix() const; float MaxFeedrate() const; - void Print(StringRef& reply) const; + void Print(const StringRef& reply) const; AxesBitmap GetXAxisMap() const { return xMapping; } AxesBitmap GetYAxisMap() const { return yMapping; } FansBitmap GetFanMapping() const { return fanMapping; } |