X-Git-Url: http://git.smho.de/gw/?p=owTools.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=2e7e6556350eaa43ab8c46a59e609c7dcf675cfe;hp=8bc44521eca43b70ababd0dccc3c792c67ea6a00;hb=8ea05adcfa81d2ca574e6dbe37046607ea671a0e;hpb=6cc62e3c72ae861a7d1c7f770e052b7b054d0c7a diff --git a/src/main.cpp b/src/main.cpp index 8bc4452..2e7e655 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,6 +71,12 @@ #define TC "\e(0\x77\e(B" // 203 Top Cross #define VL "\e(0\x78\e(B" // 186 Vertical Line #define SP " " // space string +#define BLUE_B "\033[1;34m" +#define COLOR_E "\033[0m" +#define C2_B "\033[0;36m" +#define C3_B "\033[3;34m" +#define C4_B "\033[1;33m" +#define C5_B "\033[4;33m" #endif #ifdef WIN #define RB " "// 188 Right Bottom corner @@ -85,22 +91,30 @@ #define TC " "// 203 Top Cross #define VL " "// 186 Vertical Line #define SP " " // space string +#define BLUE_B "" +#define C2_B "" +#define C3_B "" +#define C4_B "" +#define COLOR_E "" +#define C5_B "" + + #endif void printhelp() { -printf("owTools - Programm for reading und controlling 1-Wire Devices from www.tm3d.de\n\n"); +printf("owTools - Program for reading and controlling 1-Wire Devices from www.tm3d.de\n\n"); printf("run: owTools -a [COMn|USBn|GPIOn] [options]\n\n"); printf(" COMn -> Adapter DS9097 and compatible (e.g. LinkUSB)\n"); printf(" n=1 -> Windows COM1 -> Linux /dev/ttyS1\n"); printf(" USBn -> Adapter DS2490/DS9490 \n"); printf(" n=1 -> first USB-Adapter \n"); -printf(" GPIOn -> port of Raspberry PI (port Name not Pin number)\n\n"); -printf("options:\n"); +printf(" GPIOn -> port of RaspberrPI (port Name not Pin number)\n\n"); +printf("Options:\n"); printf(" -i interactive mode\n"); printf(" select a device and get information about it\n"); printf(" -c read and print all continuous\n"); printf(" -p time in sec between readings\n"); -printf(" -d [config file] put all Data in mysql Database descripted in Config file\n"); +printf(" -d [config file] put all Data in mysql Database descripted in config file\n"); printf(" Config file: \n"); printf(" [server]\n"); printf(" [port] -> 3306\n"); @@ -108,11 +122,15 @@ printf(" [user] \n"); printf(" [password]\n"); printf(" [database]\n"); printf(" [prefix] -> a prefix of all tables \n\n"); -printf(" -r Search everytime for new Devices\n"); -printf(" -f hexfile Flash new\n"); -printf(" -n change id \n"); +printf(" -r Search every time for new Devices\n"); +printf(" -f [hexfile] flash new\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 Infos (2)\n"); +printf(" -w [1|2] show Warnings (1) or all information (2)\n"); +printf(" -m memory functions\n"); + @@ -215,7 +233,7 @@ void continuous(std::vector *devices,int intervall,int headline,int s if (dev->configstate!=OWDCS_NONE) { for (size_t i=0;i<4;i++) { if (dev->config->getPropertyID((uint8_t)i)!=0) - printf("\033[1;34m%02X.%02X%02X\033[0m\t",dev->getNum().byte[7],dev->getNum().byte[1],dev->getNum().byte[0]); + printf(BLUE_B "%02X.%02X%02X" COLOR_E "\t",dev->getNum().byte[7],dev->getNum().byte[1],dev->getNum().byte[0]); } } } @@ -224,7 +242,7 @@ void continuous(std::vector *devices,int intervall,int headline,int s if (dev->configstate!=OWDCS_NONE) { for (size_t i=0;i<4;i++) { if (dev->config->getPropertyID((uint8_t)i)!=0) - printf("\033[0;36m%s\033[0m\t",dev->config->getQuantity((uint8_t)i).substr(0,7).c_str()); + printf(C2_B "%s" COLOR_E "\t",dev->config->getQuantity((uint8_t)i).substr(0,7).c_str()); } } } @@ -235,7 +253,7 @@ void continuous(std::vector *devices,int intervall,int headline,int s if (dev->config->getPropertyID((uint8_t)i)!=0) { size_t l=utf8_length(dev->config->getUnit((uint8_t)i)); std::string ls=" "; - printf("\033[3;34m[%s]%s\033[0m\t",dev->config->getUnit((uint8_t)i).c_str(),ls.substr(0,5-l).c_str()); + printf(C3_B "[%s]%s" COLOR_E "\t",dev->config->getUnit((uint8_t)i).c_str(),ls.substr(0,5-l).c_str()); } } } @@ -319,7 +337,7 @@ void device_menu(owDevice* d) { for(int i=0;i<70;i++) printf(HL);printf("\n"); printf("Selected Device: "); snum_t snum=d->getNum(); - printf("\033[1;34m%016llX\033[0m",(unsigned long long)snum.num); + printf(BLUE_B "%016llX" COLOR_E,(unsigned long long)snum.num); printf(" \n"); printf("Chip Info: "); std::vector info=d->getFamilyInfo(); @@ -335,7 +353,7 @@ void device_menu(owDevice* d) { printf("\n"); d->convertAll(); for (size_t i=0;ivalues.size();i++) { - printf("\033[1;33m%0.4f %s\033[0m ",d->values[i],d->config->getUnit((uint8_t)i).c_str()); + printf(C4_B "%0.4f %s" COLOR_E,d->values[i],d->config->getUnit((uint8_t)i).c_str()); } printf("\n"); for(int i=0;i<70;i++) printf(HL);printf("\n"); @@ -365,7 +383,7 @@ int selectDevice() { i++; snum_t snum=dev->getNum(); printf("%i) ",i); - printf("\033[1;34m%016llX\033[0m",(unsigned long long)snum.num); + printf(BLUE_B "%016llX" COLOR_E,(unsigned long long)snum.num); printf(" "); for (int j=0;j<4;j++) printf("%s ",dev->config->getQuantity(j).c_str()); @@ -379,7 +397,7 @@ int selectDevice() { dnr=atoi(inp.c_str()); if (dnr<=0) return 0; if (dnr<=i) break; - printf("\033[4;33mSelect a number between 0 and %i\033[0m\n",i); + printf(C5_B "Select a number between 0 and %i" COLOR_E "\n",i); } return dnr; @@ -447,7 +465,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) { @@ -507,7 +525,6 @@ int main(int argc, char *argv[]) { } else if (adapter.find("COM") != std::string::npos) { - printf("USB \n"); owi = new owTMEXWIN(); int port = atoi(adapter.substr(adapter.find("COM") + 3).c_str()); printf("Open Adapter on COM%i\n", port); @@ -576,7 +593,7 @@ int main(int argc, char *argv[]) { owi->Find(); for (owDevice* dev :owi->devices) { snum_t snum=dev->getNum(); - printf("\033[1;34m%016llX\033[0m",(unsigned long long)snum.num); + printf(BLUE_B "%016llX" COLOR_E,(unsigned long long)snum.num); printf("\n"); } @@ -595,7 +612,65 @@ int main(int argc, char *argv[]) { cl.push_back(0x1F); dev->Communicate(&cl,4,0); } else + //------------------------------------------------------------------------------------------ + // --------------------- Memory functions + //------------------------------------------------------------------------------------------ + if ((s=getArg("m"))!="") { + int pnr=0; + std::vector mem; + if(s.find("read")!=std::string::npos) { + size_t cla=s.find_first_of("(",0); + size_t page=s.find_first_of("p=",cla); + size_t epage=s.find_first_of(";",page); + if (epage==std::string::npos) epage=s.find_first_of(")",page); + std::string pn=s.substr(page+2,epage-page-2); + printf("%s Read Memory Page %s of Device:\n",s.c_str(),pn.c_str()); + pnr=atoi(pn.c_str()); + + } else + if(s.find("write")!=std::string::npos) { + size_t cla=s.find("(",0); + size_t page=s.find("p=",cla); + size_t epage=s.find(";",page); + if (epage==std::string::npos) epage=s.find_first_of(")",page); + std::string pn=s.substr(page+2,epage-page-2); + size_t data=s.find("d=",cla); + size_t edata=s.find(";",data); + if (edata==std::string::npos) edata=s.find(")",data); + std::string pd=s.substr(data+2,edata-data-2); + std::istringstream pdss(pd); + //std::cout << pd <>std::hex>>v; + mem.push_back(v); + } + printf("Write "); + for(uint8_t v :mem) printf("%02X ",v); + printf("to Memory Page %s of Device:\n",pn.c_str()); + pnr=atoi(pn.c_str()); + + } else exit(1); + int sel=selectDevice(); + if (sel==0) exit(0); + sel-=1; + //snum_t snum=owi->devices[sel]->getNum(); + owDevice* dev=owi->devices[sel]; + if(s.find("read")!=std::string::npos) { + int r=dev->readMemory(pnr,0,8,&mem); + for(int i=0;iwriteMemory(pnr,0,8,&mem); + r=dev->readMemory(pnr,0,8,&mem); + for(int i=0;idevices[sel]->getNum(); + if ((getArg("g"))=="1") { printf("get ID from Server\n"); char s[255]; @@ -647,12 +723,23 @@ 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); + } + } printf("New ID: "); - printf("\033[1;34m%016llX\033[0m",(unsigned long long)snum.num); + printf(BLUE_B "%016llX" COLOR_E,(unsigned long long)snum.num); printf("\n"); @@ -662,7 +749,7 @@ int main(int argc, char *argv[]) { owi->Find(); for (owDevice* dev :owi->devices) { snum_t snum=dev->getNum(); - printf("\033[1;34m%016llX\033[0m",(unsigned long long)snum.num); + printf(BLUE_B "%016llX" COLOR_E,(unsigned long long)snum.num); printf("\n"); } @@ -673,7 +760,7 @@ int main(int argc, char *argv[]) { for (owDevice* dev :owi->devices) { printf("_______________________________________________________________________\n"); snum_t snum=dev->getNum(); - printf("\033[1;34m%016llX\033[0m ",(unsigned long long)snum.num); + printf(BLUE_B "%016llX " COLOR_E,(unsigned long long)snum.num); switch (dev->configstate) { case OWDCS_16:printf("old Configcode from www.tm3d.de");break; case OWDCS_24:printf("Configcode from www.tm3d.de");break;