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>2019-10-19 13:56:21 +0300
committerDavid Crocker <dcrocker@eschertech.com>2019-10-19 13:56:21 +0300
commit285b457264b9c852cc744ff258010986c8f401c4 (patch)
treebf8d71d510bb590c921a0681aa479813bab8610e
parent2af0feba89833b8631dac6a3e662d4fc13f40410 (diff)
Release 2.04RC42.04RC4
Fix to UploadingNetworkResponder
-rw-r--r--src/Networking/UploadingNetworkResponder.cpp1
-rw-r--r--src/Storage/FileInfoParser.cpp2
-rw-r--r--src/Tools/Tool.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Networking/UploadingNetworkResponder.cpp b/src/Networking/UploadingNetworkResponder.cpp
index 3c0d5f14..aa8a72b4 100644
--- a/src/Networking/UploadingNetworkResponder.cpp
+++ b/src/Networking/UploadingNetworkResponder.cpp
@@ -99,7 +99,6 @@ void UploadingNetworkResponder::FinishUpload(uint32_t fileLength, time_t fileLas
{
String<MaxFilenameLength> origFilename;
origFilename.catn(uploadFilename, filenameBeingProcessed.GetRef().strlen() - strlen(UPLOAD_EXTENSION));
- (void)GetPlatform().GetMassStorage()->SetLastModifiedTime(filenameBeingProcessed.c_str(), fileLastModified);
// Delete possibly existing files with that name (i.e. prepare "overwrite")
GetPlatform().GetMassStorage()->Delete(origFilename.c_str());
diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp
index 9b526667..422008e6 100644
--- a/src/Storage/FileInfoParser.cpp
+++ b/src/Storage/FileInfoParser.cpp
@@ -773,7 +773,7 @@ bool FileInfoParser::FindPrintTime(const char* buf, size_t len)
" estimated printing time (normal mode)", // slic3r PE later versions "; estimated printing time (normal mode) = 1h 5m 24s"
" estimated printing time", // slic3r PE older versions "; estimated printing time = 1h 5m 24s"
";TIME", // Cura ";TIME:38846"
- " Build time", // S3D "; Build time: 0 hours 42 minutes",
+ " Build time", // S3D "; Build time: 0 hours 42 minutes"
" Build Time" // KISSlicer "; Estimated Build Time: 332.83 minutes"
// also KISSSlicer 2 alpha "; Calculated-during-export Build Time: 130.62 minutes"
};
diff --git a/src/Tools/Tool.cpp b/src/Tools/Tool.cpp
index 91a25618..8fd40684 100644
--- a/src/Tools/Tool.cpp
+++ b/src/Tools/Tool.cpp
@@ -384,7 +384,7 @@ void Tool::DefineMix(const float m[])
}
}
-// Write the tool's settings to file returning true if successful. the settings written kleave the tool selected unless it is off.
+// Write the tool's settings to file returning true if successful. The settings written leave the tool selected unless it is off.
bool Tool::WriteSettings(FileStore *f) const
{
String<StringLength40> buf;