From a30ddb743758dd3814702651109f230f18501427 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sat, 10 Oct 2015 12:46:01 +0200 Subject: [PATCH] Fixes #2934: shortened screen-shot file name (screen-2013-01-01-123540.bmp), also affects EEPROM backup which uses same time-stamp generation function. --- radio/releasenotes.txt | 3 ++- radio/src/bmp.cpp | 4 ++-- radio/src/strhelpers.cpp | 14 ++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt index 7f81fc994..d48230088 100644 --- a/radio/releasenotes.txt +++ b/radio/releasenotes.txt @@ -3,7 +3,8 @@ [AVR boards] diff --git a/radio/src/bmp.cpp b/radio/src/bmp.cpp index b72181c4e..7051e4703 100644 --- a/radio/src/bmp.cpp +++ b/radio/src/bmp.cpp @@ -227,7 +227,7 @@ const char *writeScreenshot() { FIL bmpFile; UINT written; - char filename[48]; // /SCREENSHOTS/screenshot-2013-01-01-12-35-40.bmp + char filename[42]; // /SCREENSHOTS/screen-2013-01-01-123540.bmp DIR folder; // check and create folder here @@ -240,7 +240,7 @@ const char *writeScreenshot() return SDCARD_ERROR(result); } - char *tmp = strAppend(&filename[sizeof(SCREENSHOTS_PATH)-1], "/screenshot"); + char *tmp = strAppend(&filename[sizeof(SCREENSHOTS_PATH)-1], "/screen"); tmp = strAppendDate(tmp, true); strcpy(tmp, BITMAPS_EXT); diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index 7074450d8..bd11c1e02 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -245,16 +245,14 @@ char * strAppendDate(char * str, bool time) div_t qr = div(utm.tm_hour, 10); str[13] = '0' + qr.rem; str[12] = '0' + qr.quot; - str[14] = '-'; qr = div(utm.tm_min, 10); - str[16] = '0' + qr.rem; - str[15] = '0' + qr.quot; - str[17] = '-'; + str[15] = '0' + qr.rem; + str[14] = '0' + qr.quot; qr = div(utm.tm_sec, 10); - str[19] = '0' + qr.rem; - str[18] = '0' + qr.quot; - str[20] = '\0'; - return &str[20]; + str[17] = '0' + qr.rem; + str[16] = '0' + qr.quot; + str[18] = '\0'; + return &str[18]; } else { str[11] = '\0';