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>2018-04-02 15:46:58 +0300
committerDavid Crocker <dcrocker@eschertech.com>2018-04-02 15:46:58 +0300
commitae14f93f92cc2079802f32aad4cb66998d984674 (patch)
treec5a2370498c0706c5f15ee3a54c9e5986b388b14 /src/Storage
parent97e7b46202b9f71075101ed86b6967904f87fa98 (diff)
More RTOS work
Got rid of the global scratchString Rationalised some String and StringRef functions Bug fix: if a motor stall triggered a pause, the driver numbers were not listed in the message Fixed possible race conditions in TMC2660 driver,
Diffstat (limited to 'src/Storage')
-rw-r--r--src/Storage/MassStorage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp
index 1aa083ce..7b058948 100644
--- a/src/Storage/MassStorage.cpp
+++ b/src/Storage/MassStorage.cpp
@@ -95,7 +95,7 @@ void MassStorage::Init()
if (reply.strlen() != 0)
{
delay(3000); // Wait a few seconds so users have a chance to see this
- reprap.GetPlatform().MessageF(UsbMessage, "%s\n", reply.Pointer());
+ reprap.GetPlatform().MessageF(UsbMessage, "%s\n", reply.c_str());
}
}
@@ -731,8 +731,8 @@ MassStorage::InfoResult MassStorage::GetCardInfo(size_t slot, uint64_t& capacity
capacity = (uint64_t)sd_mmc_get_capacity(slot) * 1024;
speed = sd_mmc_get_interface_speed(slot);
- String<10> path;
- path.GetRef().printf("%u:/", slot);
+ String<ShortScratchStringLength> path;
+ path.printf("%u:/", slot);
uint32_t freeClusters;
FATFS *fs;
const FRESULT fr = f_getfree(path.c_str(), &freeClusters, &fs);