čištění a další upravy

This commit is contained in:
2023-12-08 10:30:44 +01:00
parent f92b2c708f
commit 892ae13bf2
26 changed files with 294 additions and 72 deletions

View File

@@ -106,6 +106,10 @@ struct LicenceIdentification
uint8_t licCompatibility = 1; // identikator hlavního ELC
uint16_t licItemsCount = 0;
string cid_cds_path = "";
string licenceFilePath = "";
};
struct LicData
@@ -165,17 +169,14 @@ struct LicenceInfo11
class LicenceException : public std::exception
{
public:
// Constructor with int and string parameters
LicenceException(int errorCode, const std::string &errorMessage)
: errorCode_(errorCode), errorMessage_(errorMessage) {}
// Override the what() function to provide a description of the exception
const char *what() const noexcept override
{
return errorMessage_.c_str();
}
// Getter functions for the exception members
int getErrorCode() const
{
return errorCode_;

View File

@@ -230,8 +230,7 @@ class LicenceELC11
private:
SDCard sdCard;
const string cid_cdsPath = ""; //"c:\\_projects\\LicenceGenerator\\output\\"; ///sys/block/mmcblk0/device/
const string licenceFilePath = ""; //"c:\\_projects\\LicenceGenerator\\output\\";
string cidString = "";
char cid[32] = {};
string csdString = "";
@@ -266,6 +265,8 @@ public:
string operationErrors = "";
ErrorMessage errorMessage;
string cid_cdsPath = ""; //"c:\\_projects\\LicenceGenerator\\output\\"; ///sys/block/mmcblk0/device/
string licenceFilePath = ""; //"c:\\_projects\\LicenceGenerator\\output\\";
LicenceELC11();
~LicenceELC11();

View File

@@ -13,8 +13,7 @@ using namespace std;
class LicenceELC21
{
const string cid_cdsPath = ""; //"c:\\_projects\\LicenceGenerator\\output\\"; ///sys/block/mmcblk0/device/
const string licenceFilePath = ""; //"c:\\_projects\\LicenceGenerator\\output\\";
enum class Error21
{
@@ -88,6 +87,7 @@ class LicenceELC21
};
private:
int licItemCount = 0;
LicenceBody licBody;
LicenceIdentification lIdentification;
@@ -107,6 +107,8 @@ class LicenceELC21
ErrorMessage errorMessage;
LicenceInfo21 licenceInfo;
string cid_cdsPath = ""; //"c:\\_projects\\LicenceGenerator\\output\\"; ///sys/block/mmcblk0/device/
string licenceFilePath = ""; //"c:\\_projects\\LicenceGenerator\\output\\";
LicenceELC21();
~LicenceELC21();

View File

@@ -26,13 +26,12 @@ using namespace std;
int licenceIndex = 0;
int compatibility = 0;
string licenceFilePath = "";
string cid_csd_filePath = "";
};
class LicenceGenerator
{
public:
int elcSwitchType;
string operationErrors = "";