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/RepRap.h | |
| parent | 7dc0079595cab16ebf1563b59c07e24b341c3efa (diff) | |
Towards 1.21RC2
Refactored some string handling
Fixes for Duet 2M
Diffstat (limited to 'src/RepRap.h')
| -rw-r--r-- | src/RepRap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/RepRap.h b/src/RepRap.h index d4877310..54e5a520 100644 --- a/src/RepRap.h +++ b/src/RepRap.h @@ -70,7 +70,7 @@ public: unsigned int GetNumberOfContiguousTools() const; unsigned int GetProhibitedExtruderMovements(unsigned int extrusions, unsigned int retractions); - void PrintTool(int toolNumber, StringRef& reply) const; + void PrintTool(int toolNumber, const StringRef& reply) const; void FlagTemperatureFault(int8_t dudHeater); void ClearTemperatureFault(int8_t wasDudHeater); @@ -159,15 +159,15 @@ private: bool resetting; bool processingConfig; - char password[PASSWORD_LENGTH + 1]; - char myName[MACHINE_NAME_LENGTH + 1]; + String<PASSWORD_LENGTH> password; + String<MACHINE_NAME_LENGTH> myName; int beepFrequency, beepDuration; - char message[MESSAGE_LENGTH + 1]; + char message[MaxMessageLength + 1]; // Message box data bool displayMessageBox; - char boxMessage[MESSAGE_LENGTH + 1], boxTitle[MESSAGE_LENGTH + 1]; + String<MaxMessageLength> boxMessage, boxTitle; int boxMode; uint32_t boxSeq; uint32_t boxTimer, boxTimeout; |