diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-02-21 13:47:41 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-02-21 13:47:41 +0300 |
| commit | 9491f2a733454aa8fadd489a2cd001e9657ee8fa (patch) | |
| tree | 13f2fd033ff76a9bae326b536de14592adba99ae /src/Storage/MassStorage.cpp | |
| parent | 957ac8fb2dac18d83aeda33d8e0772cb1fb9b54d (diff) | |
Various
Fixed error in reported seconds of file time stamps
Increased maximum macro stack depth from 5 to 7
Abort all containing macro and print files if macro stack overflow
occurs
Bug fix: setting a standby temperature using G10 could incorrectly
change the temperature of the heater if it was active for the current
tool
Added code to determine Duet 3 board type, report board version, and
allow for different Vref wiring between versions
Diffstat (limited to 'src/Storage/MassStorage.cpp')
| -rw-r--r-- | src/Storage/MassStorage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp index 52a94e0b..ff92c539 100644 --- a/src/Storage/MassStorage.cpp +++ b/src/Storage/MassStorage.cpp @@ -94,7 +94,7 @@ static time_t ConvertTimeStamp(uint16_t fdate, uint16_t ftime) noexcept timeInfo.tm_mday = max<int>(fdate & 0x1F, 1); timeInfo.tm_hour = (ftime >> 11) & 0x1F; timeInfo.tm_min = (ftime >> 5) & 0x3F; - timeInfo.tm_sec = ftime & 0x1F; + timeInfo.tm_sec = (ftime & 0x1F) * 2; timeInfo.tm_isdst = 0; return mktime(&timeInfo); } |