oddeleni a lazeni ELC1

include/reader/licReaderELC1.h

@@ -1,9 +1,31 @@
 #ifndef ELC1_READER__H
 #define ELC1_READER__H
 
+#include "utils.h"
+#include "licenceCommon.h"
+#include "licenceELC1.h"
+#include "SDCard.h"
+
+using namespace std;
+
 namespace Reader
 {
-  
+  class Licence1 : public LicenceELC1
+  {
+  public:
+    
+    LicenceInfo21 licenceInfo;
+    
+    Licence1();
+    ~Licence1();
+    Licence1(LicenceIdentification &licIdentification);
+
+    bool readLicence(LicenceInfoGeneral *licences);
+    bool getLicenceInfo(void *ptr);
+    bool getLicenceItemInfo(int protocolId, void *returnItemStructure);
+    void getLicenceItems();
+
+  };
 }
 
 #endif

include/reader/licenceReader.h

@@ -2,8 +2,6 @@
 #define LICENCE_READER_H_
 
 #include "utils.h"
-#include "licenceELC11.h"
-#include "licenceELC31.h"
 
 #include "licReaderELC1.h"
 #include "licReaderELC2.h"
@@ -31,9 +29,9 @@ public:
   string operationErrors = "";
   bool argumentsCorrect = false;
   ErrorMessage error;
-  LicenceELC11 *licence11;
-  LicenceELC31 *licence31;
   Licence2 *licence2;
+  Licence1 *licence1;
+
 
   LicenceReader();
   ~LicenceReader();