X-Git-Url: http://git.smho.de/gw/?a=blobdiff_plain;f=src%2Fmain.cpp;h=de1707876324104f47fa816468481ab58e7c7073;hb=791db69fd31de80c17c4faccfb8392770ee6397c;hp=9a998e2bcbec5a49aa0b634852bdeeb014fae912;hpb=454e68c45f69b41c7785e852cb75eaf5f32f8bc7;p=owTools.git

diff --git a/src/main.cpp b/src/main.cpp
index 9a998e2..de17078 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -124,7 +124,9 @@ printf("            [database]\n");
 printf("            [prefix] -> a prefix of all tables \n\n");
 printf("      -r Search every time for new Devices\n");
 printf("   -f [hexfile]    flash new\n");
-printf("   -n change id   \n");
+printf("   -n [\"id as 64bit Hex\"] change id   \n");
+printf("		example: -n \"5D02160084D9A220\" \n");
+printf("		no argument increments id by 256 (keep family code) \n");
 printf("      -g get from server\n");
 printf("   -w [1|2] show Warnings (1) or all information (2)\n");
 printf("   -m memory functions\n");
@@ -282,6 +284,11 @@ void continuous(std::vector<owDevice*> *devices,int intervall,int headline,int s
 		printf("%d-%02d-%02d %02d:%02d:%02d\t", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
 		for (owDevice* dev :*devices) {
 			for(int k=0;k<owi->maxrepeat;k++){
+				std::vector<uint8_t> data;
+				data.push_back(0xCC);
+				data.push_back(0x44);
+				owi->Reset();
+				owi->Communicate(&data, 2, 0);
 				dev->convertAll();
 				if (owi->log->last()<OWLOG_ERROR) break;
 				owi->log->clear();
@@ -463,7 +470,7 @@ int main(int argc, char *argv[]) {
 	if(adapter.find("COM")!=std::string::npos) {
 		owi=new owCOMInterface();
 		int port=atoi(adapter.substr(adapter.find("COM")+3).c_str());
-		printf("Open /dev/ttyS%i\n",port);
+		printf("Open /dev/ttyUSB%i\n",port);
 		owi->InitAdapter(port);
 	} else 
 	if(adapter.find("USB")!=std::string::npos) {
@@ -676,6 +683,7 @@ int main(int argc, char *argv[]) {
 		sel-=1;
 		
 		snum_t snum=owi->devices[sel]->getNum();
+		
 		if ((getArg("g"))=="1") {
 			printf("get ID from Server\n");
 			char s[255];
@@ -720,7 +728,18 @@ int main(int argc, char *argv[]) {
 				snum.num=isnum.num;
 			} else (printf("ERROR %i\n",err));
 		} else {
-			snum.num+=256;
+			if (s=="1") {
+				snum.num+=256;
+			} else {
+				unsigned long long l=strtol(s.c_str(),NULL,16);
+				if ((snum.num&0xFF)!=(l&0xFF)) {
+					printf("ERROR: Family of Device 0x%02X->0x%02X can not be changed\n",(int)(snum.num&0xFF),(int)(l&0xFF));
+					exit(1);
+				}
+				snum.num=l;
+				//printf("->%016llX\n",(unsigned long long)l);
+			}
+			
 		}