X-Git-Url: https://git.smho.de/gw/?a=blobdiff_plain;f=src%2FowInterface.h;h=0a568df35b9d275b0e839de83b0d778061807cdd;hb=f7b7cd722492679725b953a41717a3109c81813d;hp=664de858dbff638f7d2fd966ea48a673726853d6;hpb=1e1dd23068b31b807bc926fe3bb6a8a5ad6d0941;p=owTools.git

diff --git a/src/owInterface.h b/src/owInterface.h
old mode 100755
new mode 100644
index 664de85..0a568df
--- a/src/owInterface.h
+++ b/src/owInterface.h
@@ -107,6 +107,8 @@ class owDeviceConfig;
 
 #endif
 
+extern uint8_t owCC_44_Temp;
+
 class owLog {
 	int lcount;
 	std::string logtext;
@@ -231,6 +233,7 @@ public:
 	uint8_t calcCRC8(std::vector<uint8_t> data);
 	uint16_t calcCRC16(std::vector<uint8_t> data);
 	int testCRC16(std::vector<uint8_t> data);
+	int testCRC16(std::vector<uint8_t> data,uint16_t load);
 		
 	void resetFlasher(uint64_t id);
 	void resetID(uint64_t id);
@@ -287,6 +290,7 @@ public:
 	virtual int convertAll() {return 1;}
 	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data) {return 0;};
 	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data) {return 0;};
+	virtual int getPageSize() {return 0;}
 	virtual ~owDevice() {}
 };
 
@@ -296,6 +300,7 @@ public:
 	virtual void setDefaultConfig();
 	int readScratchpad(std::vector<uint8_t> *sp);
 	virtual int convertAll();
+	virtual int getPageSize() {return 8;}
 } ;
 
 
@@ -309,6 +314,7 @@ public:
 	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data);
 	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data);
 	virtual int convertAll();
+	virtual int getPageSize() {return 8;}
 
 } ;
 class owDeviceDS2450:public owDevice {
@@ -317,9 +323,12 @@ public:
 
 	virtual void setDefaultConfig();
 	virtual int convertAll();
-	void readMemory(uint8_t addr,std::vector<uint8_t> *sp);
-	void writeMemory(uint8_t addr,std::vector<uint8_t> *sp);
+	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	void readMemory_int(uint8_t addr,std::vector<uint8_t> *sp);
+	void writeMemory_int(uint8_t addr,std::vector<uint8_t> *sp);
 	void convert(uint8_t mask, uint8_t preset); 
+	virtual int getPageSize() {return 8;}
 
 } ;
 
@@ -331,6 +340,10 @@ public:
 	virtual void setDefaultConfig();
 	virtual int convertAll();
 	uint32_t readCounter(uint8_t page);
+	virtual int readMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	virtual int writeMemory(int page,int start, int count,std::vector<uint8_t> *data);
+	virtual int getPageSize() {return 32;}
+
 
 } ;