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>2021-03-08 23:03:57 +0300
committerDavid Crocker <dcrocker@eschertech.com>2021-03-08 23:03:57 +0300
commit36255c8b56b9e56ffd9e8609cfeddffbf6ca70db (patch)
treee6006c05c8f45fefcd5f1dcbda44da8ea5945df5 /src/Storage/FileInfoParser.cpp
parentcaf4efcc6c823d0cd52e15c2a8afaab43991efea (diff)
Support Matter Control slicer
Diffstat (limited to 'src/Storage/FileInfoParser.cpp')
-rw-r--r--src/Storage/FileInfoParser.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp
index 4e51a650..1395d6e8 100644
--- a/src/Storage/FileInfoParser.cpp
+++ b/src/Storage/FileInfoParser.cpp
@@ -582,14 +582,15 @@ bool FileInfoParser::FindSlicerInfo(const char* bufp) noexcept
{
static const char * const GeneratedByStrings[] =
{
- "generated by ", // slic3r and S3D
- ";Sliced by ", // ideaMaker
"; KISSlicer", // KISSlicer
";Sliced at: ", // Cura (old)
+ ";Fusion version:", // Fusion 360
+ "generated by ", // slic3r and S3D
+ ";Sliced by ", // ideaMaker
";Generated with ", // Cura (new)
"; Generated by ", // kiri:moto
";GENERATOR.NAME:", // Pathio (the version is separate, we don't include that)
- ";Fusion version:" // Fusion 360
+ "; Generated with " // Matter Control
};
size_t index = 0;
@@ -613,16 +614,16 @@ bool FileInfoParser::FindSlicerInfo(const char* bufp) noexcept
pos += strlen(GeneratedByStrings[index]);
break;
- case 2: // KISSlicer
+ case 0: // KISSlicer
pos += 2;
break;
- case 3: // Cura (old)
+ case 1: // Cura (old)
introString = "Cura at ";
pos += strlen(GeneratedByStrings[index]);
break;
- case 7: // Fusion 360
+ case 2: // Fusion 360
pos += 1;
break;
}
@@ -815,7 +816,8 @@ bool FileInfoParser::FindPrintTime(const char* bufp) noexcept
// also KISSSlicer 2 alpha "; Calculated-during-export Build Time: 130.62 minutes"
";Print Time:", // Ideamaker
";PRINT.TIME:", // Patio
- ";Print time:" // Fusion 360
+ ";Print time:", // Fusion 360
+ "; total print time (s) =" // Matter Control
};
for (const char * ptStr : PrintTimeStrings)