Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2020-04-06 22:13:11 +0300
committerDavid Crocker <dcrocker@eschertech.com>2020-04-06 22:13:11 +0300
commit608d3fde68f7a4a3ee56430ee3303b85cfefe231 (patch)
treea9516a4c9147a56678610b77c4c47447195b51f9 /src/Storage
parent6e7705dfe87ace89df8feb76345d2483fd829d01 (diff)
Fix for changed build time format generated by S3D
Diffstat (limited to 'src/Storage')
-rw-r--r--src/Storage/FileInfoParser.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp
index 6e34d16f..17a25a65 100644
--- a/src/Storage/FileInfoParser.cpp
+++ b/src/Storage/FileInfoParser.cpp
@@ -813,10 +813,14 @@ bool FileInfoParser::FindPrintTime(const char* buf, size_t len) noexcept
if (*pos == 'h')
{
hours = secs;
- if (StringStartsWithIgnoreCase(pos, "hours"))
+ if (StringStartsWithIgnoreCase(pos, "hours")) // S3D
{
pos += 5;
}
+ else if (StringStartsWithIgnoreCase(pos, "hour")) // S3D now prints "1 hour 42 minutes"
+ {
+ pos += 4;
+ }
else
{
++pos;