Change git comments that make errors

[owTools.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 838b99e..c4e223d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -323,13 +323,6 @@ void continuous(std::vector<owDevice*> *devices,int intervall,int headline,int s
                                //data.push_back(0x44);
                                //owi->Reset();
                                //owi->Communicate(&data, 2, 0);
-=======
-                               std::vector<uint8_t> data;
-                               data.push_back(0xCC);
-                               data.push_back(0x44);
-                               owi->Reset();
-                               owi->Communicate(&data, 2, 0);
->>>>>>> origin/master
                                dev->convertAll();
                                if (owi->log->last()<OWLOG_ERROR) break;
                                owi->log->clear();
@@ -645,15 +638,11 @@ int main(int argc, char *argv[]) {
                        database=1;
                }
 #endif
-<<<<<<< HEAD
                if      ((s=getArg("t")) !="")  {
                        textfile=1;
                        printf("Write values to textfile %s\n",s.c_str());
                        textfilename=s;
                }
-=======
-                       
->>>>>>> origin/master
                
                continuous(&(owi->devices),pause,1,reload);     
        } else 
@@ -728,11 +717,6 @@ int main(int argc, char *argv[]) {
        // --------------------- Memory functions
        //------------------------------------------------------------------------------------------
        
-=======
-       // --------------------- Memory functions
-       //------------------------------------------------------------------------------------------
-       
->>>>>>> origin/master
        if ((s=getArg("m"))!="") {
                int pnr=0;
                std::vector<uint8_t> mem;
@@ -821,11 +805,7 @@ int main(int argc, char *argv[]) {
                                                if (c=='x') br=1;
                                        } else {
                                                if ((c==',')|(c=='}')) {
-<<<<<<< HEAD
                                                        isnum.byte[i]=(uint8_t)strtoull(s, NULL, 16);
-=======
-                                                       isnum.byte[i]=(uint8_t)strtol(s, NULL, 16);
->>>>>>> origin/master
                                                        //printf("%x\n",strtol(s, NULL, 16));
                                                        i++;
                                                        br=0;
@@ -847,11 +827,7 @@ int main(int argc, char *argv[]) {
                        if (s=="1") {
                                snum.num+=256;
                        } else {
-<<<<<<< HEAD
                                unsigned long long l=strtoull(s.c_str(),NULL,16);
-=======
-                               unsigned long long l=strtol(s.c_str(),NULL,16);
->>>>>>> origin/master
                                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);