oprava #define direktiv

include/common/SDCard.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef SDCARD_H_
 #define SDCARD_H_
 
+#include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #define CID_LENGTH 32
 #define CSD_LENGTH 32
 

include/common/licConnector.h

@@ -0,0 +1,10 @@
+#ifndef LICCONNECTOR_H_INCLUDED
+#define LICCONNECTOR_H_INCLUDED
+
+#include "lic_config.h"
+
+//#include "../../_src/_main/Ez_automaincfg.h"
+
+//#define EZ_APPLICATION_LICENCE_DISABLE
+
+#endif  // LICCONNECTOR_H_INCLUDED

include/common/lic_config.h

@@ -0,0 +1,7 @@
+#ifndef LIC_CONFIG_H_INCLUDED
+#define LIC_CONFIG_H_INCLUDED
+
+//#define EZ_LIC_DEBUG //zapíná debug pro windows. Pro produkci je potřeba nechat zakomentované
+//#define EZ_LIC_DEBUG_SHOW_DETAILS //zapíná detailní výpis při čtení licene. Pro produkci je potřeba nechat zakomentované
+
+#endif

include/common/licenceCommon.h

@@ -1,10 +1,11 @@
+#ifndef LICENCE_COMMON_H_
+#define LICENCE_COMMON_H_
+
+#include "licConnector.h"
 #ifndef EZ_APPLICATION_LICENCE_DISABLE
 
 #define CRC = 1
 
-#ifndef LICENCE_COMMON_H_
-#define LICENCE_COMMON_H_
-
 //---------------- společná hlavička pro všechny licence ----------------
 
 #include <cstring>

include/common/licenceELC1.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef PLC_LICENCE1_COMMON_H
 #define PLC_LICENCE1_COMMON_H
 
+#include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include <vector>
 #include "licenceCommon.h"
 #include "SDCard.h"

include/common/licenceELC2.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef PLC_LICENCE2_COMMON_H
 #define PLC_LICENCE2_COMMON_H
 
+#include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include <vector>
 #include "licenceCommon.h"
 #include "SDCard.h"

include/common/licenceELC3.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef PLC_LICENCE3_COMMON_H
 #define PLC_LICENCE3_COMMON_H
 
+#include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #define UID_LENGTH 32
 
 #include <vector>

include/common/utils.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef UTILS_H_
 #define UTILS_H_
 
+#include "licConnector.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include <iostream>
 #include <fstream>
 #include <unordered_map>

include/generator/licenceGenerator.h

@@ -1,3 +1,5 @@
+#include "licenceCommon.h"
+
 #ifndef LICENCE_GENERATOR_H_
 #define LICENCE_GENERATOR_H_
 
@@ -8,7 +10,6 @@
 #include <stdio.h>
 #include <stdint.h>
 #include "pugixml.hpp"
-#include "licenceCommon.h"
 
 #include "licGenELC1.h"
 #include "licGenELC2.h"

include/reader/licReaderELC1.h

@@ -1,9 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef ELC1_READER__H
 #define ELC1_READER__H
 
 #include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include "licenceCommon.h"
 #include "licenceELC1.h"
 #include "SDCard.h"

include/reader/licReaderELC2.h

@@ -1,8 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
 #ifndef ELC2_READER_H
 #define ELC2_READER_H
 
 #include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include "licenceCommon.h"
 #include "licenceELC2.h"
 #include "SDCard.h"

include/reader/licReaderELC3.h

@@ -1,9 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef ELC3_READER__H
 #define ELC3_READER__H
 
 #include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include "licenceCommon.h"
 #include "licenceELC3.h"
 

include/reader/licenceReader.h

@@ -1,9 +1,9 @@
-#ifndef EZ_APPLICATION_LICENCE_DISABLE
-
 #ifndef LICENCE_READER_H_
 #define LICENCE_READER_H_
 
 #include "utils.h"
+#ifndef EZ_APPLICATION_LICENCE_DISABLE
+
 #include "SDCard.h"
 #include "licReaderELC1.h"
 #include "licReaderELC2.h"