diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-08-15 17:08:53 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-08-15 17:08:53 +0300 |
| commit | 5e89aa72250f47be39593c73964f5931713d0152 (patch) | |
| tree | 86f9703538203861432b1de252d22ce397be4851 | |
| parent | 14d68a3e3cb4af05602dc4d0af87778bc523709b (diff) | |
Replaced Gb by GB etc.
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 4 | ||||
| -rw-r--r-- | src/GCodes/GCodes4.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index 31444d61..cb416160 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -1268,14 +1268,14 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx break; case MassStorage::InfoResult::ok: - reply.printf("SD card in slot %" PRIu32 ": capacity %.2fGb, partition size %.2fGb, free space %.2fGb, speed %.2fMBytes/sec, cluster size %" PRIu32 "%s", + reply.printf("SD card in slot %" PRIu32 ": capacity %.2fGB, partition size %.2fGB, free space %.2fGB, speed %.2fMBytes/sec, cluster size %" PRIu32 "%s", slot, (double)((float)returnedInfo.cardCapacity * 1e-9), (double)((float)returnedInfo.partitionSize * 1e-9), (double)((float)returnedInfo.freeSpace * 1e-9), (double)((float)returnedInfo.speed * 1e-6), (returnedInfo.clSize < 1024) ? returnedInfo.clSize : returnedInfo.clSize/1024, - (returnedInfo.clSize < 1024) ? " bytes" : "kb" + (returnedInfo.clSize < 1024) ? " bytes" : "kB" ); break; } diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp index 1b8d0bd0..81d5e0b8 100644 --- a/src/GCodes/GCodes4.cpp +++ b/src/GCodes/GCodes4.cpp @@ -1424,7 +1424,7 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept const uint32_t ms = millis() - timingStartMillis; const float fileMbytes = (float)timingBytesWritten/(float)(1024 * 1024); const float mbPerSec = (fileMbytes * 1000.0)/(float)ms; - platform.MessageF(gb.GetResponseMessageType(), "SD write speed for %.1fMbyte file was %.2fMbytes/sec\n", (double)fileMbytes, (double)mbPerSec); + platform.MessageF(gb.GetResponseMessageType(), "SD write speed for %.1fMByte file was %.2fMBytes/sec\n", (double)fileMbytes, (double)mbPerSec); sdTimingFile->Close(); sdTimingFile = platform.OpenFile(Platform::GetGCodeDir(), TimingFileName, OpenMode::read); @@ -1466,7 +1466,7 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept const float fileMbytes = (float)timingBytesWritten/(float)(1024 * 1024); const float mbPerSec = (fileMbytes * 1000.0)/(float)ms; sdTimingFile->Close(); - reply.printf("SD read speed for %.1fMbyte file was %.2fMbytes/sec", (double)fileMbytes, (double)mbPerSec); + reply.printf("SD read speed for %.1fMByte file was %.2fMBytes/sec", (double)fileMbytes, (double)mbPerSec); platform.Delete(Platform::GetGCodeDir(), TimingFileName); gb.SetState(GCodeState::normal); break; |