eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

applied clang formatting

Browse Source
This commit is contained in:
Jakob Meier
2022-02-27 15:48:42 +01:00
parent dfd817d27b
commit f88674ed59
13 changed files with 595 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
linux/devices/startracker/StrHelper.cpp
View File

@ -168,13 +168,9 @@ ReturnValue_t StrHelper::startFlashRead(std::string path, uint8_t startRegion, u
return RETURN_OK;
}
void StrHelper::disableTimestamping() {
timestamping = false;
}
void StrHelper::disableTimestamping() { timestamping = false; }
void StrHelper::enableTimestamping() {
timestamping = true;
}
void StrHelper::enableTimestamping() { timestamping = true; }
ReturnValue_t StrHelper::performImageDownload() {
ReturnValue_t result;
@ -426,8 +422,8 @@ ReturnValue_t StrHelper::performFlashRead() {
bytesRead += req.length;
req.address += req.length;
if (req.address >= FLASH_REGION_SIZE) {
req.address = 0;
req.region++;
req.address = 0;
req.region++;
}
retries = 0;
#if OBSW_DEBUG_STARTRACKER == 1
@ -580,13 +576,12 @@ ReturnValue_t StrHelper::unlockAndEraseRegions(uint32_t from, uint32_t to) {
}
std::string StrHelper::makeFullFilename(std::string path, std::string filename) {
std::string image;
Timestamp timestamp;
if (timestamping) {
image = path + "/" + timestamp.str() + filename;
}
else {
image = path + "/" + filename;
}
return image;
std::string image;
Timestamp timestamp;
if (timestamping) {
image = path + "/" + timestamp.str() + filename;
} else {
image = path + "/" + filename;
}
return image;
}