v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Showing only changes of commit 7f51ffc8fb - Show all commits

View File

@ -173,8 +173,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
static const size_t SIZE_IMAGE_PART = 1024; static const size_t SIZE_IMAGE_PART = 1024;
static const uint32_t FLASH_REGION_SIZE = 0x20000; static const uint32_t FLASH_REGION_SIZE = 0x20000;
class ImageDownload { struct ImageDownload {
public:
static const uint32_t LAST_POSITION = 4095; static const uint32_t LAST_POSITION = 4095;
}; };
@ -199,15 +198,13 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
BinarySemaphore semaphore; BinarySemaphore semaphore;
class UploadImage { struct UploadImage {
public:
// Name including absolute path of image to upload // Name including absolute path of image to upload
std::string uploadFile; std::string uploadFile;
}; };
UploadImage uploadImage; UploadImage uploadImage;
class DownloadImage { struct DownloadImage {
public:
// Path where the downloaded image will be stored // Path where the downloaded image will be stored
std::string path; std::string path;
// Default name of downloaded image, can be changed via command // Default name of downloaded image, can be changed via command
@ -215,8 +212,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
}; };
DownloadImage downloadImage; DownloadImage downloadImage;
class FlashWrite { struct FlashWrite {
public:
// File which contains data to write when executing the flash write command // File which contains data to write when executing the flash write command
std::string fullname; std::string fullname;
// The first region to write to // The first region to write to
@ -229,8 +225,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
}; };
FlashWrite flashWrite; FlashWrite flashWrite;
class FlashRead { struct FlashRead {
public:
// Path where the file containing the read data will be stored // Path where the file containing the read data will be stored
std::string path = ""; std::string path = "";
// Default name of file containing the data read from flash, can be changed via command // Default name of file containing the data read from flash, can be changed via command