diff --git a/include/reader/licenceReader.h b/include/reader/licenceReader.h index 24837ab..8b27820 100644 --- a/include/reader/licenceReader.h +++ b/include/reader/licenceReader.h @@ -27,6 +27,7 @@ struct InitStructure struct LicenceInfo { string licenceFileName = ""; + string licenceFilePath = ""; }; class LicenceReader diff --git a/output/licenceGenerator b/output/licenceGenerator deleted file mode 100644 index 3398e60..0000000 Binary files a/output/licenceGenerator and /dev/null differ diff --git a/src/CreateLicence.cpp b/src/CreateLicence.cpp index 98add00..0ae37a0 100644 --- a/src/CreateLicence.cpp +++ b/src/CreateLicence.cpp @@ -9,7 +9,7 @@ /// @param argc /// @param argv parametry pro generování licence /// @return -int main7(int argc, char *argv[]) +int main9(int argc, char *argv[]) { unordered_map arguments = getArguments(argc, argv); try diff --git a/src/ReadLicence.cpp b/src/ReadLicence.cpp index df85dc2..6f8ee6b 100644 --- a/src/ReadLicence.cpp +++ b/src/ReadLicence.cpp @@ -20,7 +20,7 @@ int main() initStructure.licenceType = (int)LicenceType::DRT; initStructure.licenceVersion = 1; initStructure.licenceIndex = 0; - initStructure.licenceFilePath = ""; // cesta k licenčnímu souboru + initStructure.licenceFilePath = "c://_projects//sd_gen//output//"; // cesta k licenčnímu souboru // initStructure.compatibility = 0; v případě kompatibility 0 či nezadané je výstup defaultní. // pro ELC 1 LicenceELC1Info je to isValid, pro ELC 2 strukura { int protocolId = -1; int dataPointsCount = 0; } initStructure.cid_csd_filePath = ""; // cesta k cidu/csd pro načtení a kontrolu licence @@ -69,7 +69,7 @@ int main() cout << "oemID: " << licenceReaderELC2.sdCardInfo.oemID << "\n"; cout << "název licenčního souboru: " << licenceReaderELC2.licInfo.licenceFileName << "\n"; - + cout << "cesta k licenčnímu souboru: " << licenceReaderELC2.licInfo.licenceFilePath << "\n"; // if (initStructure.compatibility == 1) //ukazka kompatibilita 1 @@ -129,6 +129,9 @@ int main() { cout << "Obecna chyba\n"; } + +system("pause"); + return SUCCES; } diff --git a/src/reader/LicenceReader.cpp b/src/reader/LicenceReader.cpp index 77ae6b0..59eda7d 100644 --- a/src/reader/LicenceReader.cpp +++ b/src/reader/LicenceReader.cpp @@ -101,6 +101,7 @@ bool LicenceReader::initread(int elcType, InitStructure &initStructure) this->sdCardInfo.oemID = this->licence2->sdCard.cardData.oemID; this->licInfo.licenceFileName = this->licence2->licFileName; + this->licInfo.licenceFilePath = this->licence2->licenceFilePath; //this->licenceInfo. //this->sdCardInfo.licenceFileName = this->licence2->licFileName; diff --git a/src/reader/licReaderELC2.cpp b/src/reader/licReaderELC2.cpp index a93c571..a66fd4b 100644 --- a/src/reader/licReaderELC2.cpp +++ b/src/reader/licReaderELC2.cpp @@ -28,6 +28,7 @@ namespace Reader string licFilePath = this->licenceFilePath + licFileName; this->licFileName = licFileName; + this->licenceFilePath = licFilePath; vector content {}; if (readFile(licFilePath, content) == false)