resolve merge conflict

pico-tcp-service/pico-tcp-client/main.cpp

@@ -5,10 +5,6 @@
 #include "picofunctions.h"
 #include "pugiconfig.hpp"
 #include "pugixml.hpp"
-<<<<<<< HEAD
-#include "simplecout.hpp"
-=======
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
 #include "parser.hpp"
 #include "src/ActiveSocket.h"
 
@@ -19,15 +15,6 @@ using namespace std;
 std::vector<std::string> split(const std::string& s, const std::string& delimiter) {
     std::vector<std::string> tokens;
     size_t pos = 0;
-<<<<<<< HEAD
-    std::string token;
-    while ((pos = s.find(delimiter)) != std::string::npos) {
-        token = s.substr(0, pos);
-        tokens.push_back(token);
-        s.erase(0, pos + delimiter.length());
-    }
-    tokens.push_back(s);
-=======
     std::string temp = s;
     std::string token;
     while ((pos = temp.find(delimiter)) != std::string::npos) {
@@ -36,7 +23,6 @@ std::vector<std::string> split(const std::string& s, const std::string& delimite
         temp.erase(0, pos + delimiter.length());
     }
     tokens.push_back(temp);
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
 
     return tokens;
 }
@@ -64,11 +50,7 @@ class PicoLocalClient
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -77,11 +59,7 @@ class PicoLocalClient
             uint32_t bytes_received = socket->GetBytesReceived();
 
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -107,11 +85,7 @@ class PicoLocalClient
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xC1)
             {
@@ -136,11 +110,7 @@ class PicoLocalClient
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -149,11 +119,7 @@ class PicoLocalClient
             uint32_t bytes_received = socket->GetBytesReceived();
 
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -179,11 +145,7 @@ class PicoLocalClient
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xC2)
             {
@@ -192,11 +154,7 @@ class PicoLocalClient
             }
 
             cout << "Pico device configured" << endl;
-<<<<<<< HEAD
-            return 0;            
-=======
             return 0;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
         }
 
         int pico_set_params(uint32_t* apoints, uint32_t* times, uint32_t sample_rate, uint32_t number_channels, uint32_t size)
@@ -214,26 +172,15 @@ class PicoLocalClient
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-=======
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -280,11 +227,7 @@ class PicoLocalClient
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -292,271 +235,7 @@ class PicoLocalClient
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-                cerr << "Server disconnected" << endl;
-                return -1;
-            }
-            if(bytes_received < 2)
-            {
-                cerr << "Invalid buffer size" << endl;
-                return -1;
-            }
-            if(rcvbuf[0] != 0xAA)
-            {
-                cerr << "Invalid magic number" << endl;
-                return -1;
-            }
-
-            if(rcvbuf[1] == 0xFF)
-            {
-                if(bytes_received < 7)
-                {
-                    cerr << "Invalid buffer size" << endl;
-                    return -1;
-                }
-
-                cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
-                memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
-                memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-            }
-            else if(rcvbuf[1] != 0xC3)
-            {
-                cerr << "Invalid command callback" << endl;
-                return -1;
-            }
-
-            cout << "Pico device closed" << endl;
-            return 0;
-        }
-
-        int pico_get_current_params()
-        {
-            sndbuf[0] = 0xAA;
-            sndbuf[1] = 0x04;
-            if(socket->Send(sndbuf, 2) == -1)
-            {
-                cerr << "Failed to send data to socket" << endl;
-                return -1;
-            }
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-            {
-                cerr << "Failed to receive data from socket" << endl;
-                return -1;
-            }
-
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-                cerr << "Server disconnected" << endl;
-                return -1;
-            }
-            if(bytes_received < 2)
-            {
-                cerr << "Invalid buffer size" << endl;
-                return -1;
-            }
-            if(rcvbuf[0] != 0xAA)
-            {
-                cerr << "Invalid magic number" << endl;
-                return -1;
-            }
-
-            if(rcvbuf[1] == 0xFF)
-            {
-                if(bytes_received < 7)
-                {
-                    cerr << "Invalid buffer size" << endl;
-                    return -1;
-                }
-
-                cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
-                memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
-                memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-            }
-            else if(rcvbuf[1] != 0xC4)
-            {
-                cerr << "Invalid command callback" << endl;
-                return -1;
-            }
-
-            if(bytes_received < 18)
-            {
-                cerr << "Invalid buffer size" << endl;
-                return -1;
-            }
-
-            uint32_t size;
-            memcpy(&size, rcvbuf + 2, sizeof(uint32_t));
-            if(size < 1)
-            {
-                cerr << "Invalid data size" << endl;
-                return -1;
-            }
-
-            uint32_t* apoints = new uint32_t[size];
-            memcpy(apoints, rcvbuf + 6, size * sizeof(uint32_t));
-            for(uint32_t i = 0; i < size; ++i)
             {
-                cout << "apoints[" << i << "] = " << std::dec << apoints[i] << endl;
-            }
-            uint32_t* atimes = new uint32_t[size];
-            memcpy(atimes, rcvbuf + 6 + size * sizeof(uint32_t), size * sizeof(uint32_t));
-            for(uint32_t i = 0; i < size; ++i)
-            {
-                cout << "atimes[" << i << "] = " << std::dec << atimes[i] << endl;
-            }
-
-            uint32_t sample_rate = 0;
-            memcpy(&sample_rate, rcvbuf + 6 + 2 * size * sizeof(uint32_t), sizeof(uint32_t));
-            cout << "sample_rate = " << std::dec << sample_rate << endl;
-
-            uint32_t number_channels = 0;
-            memcpy(&number_channels, rcvbuf + 10 + 2 * size * sizeof(uint32_t), sizeof(uint32_t));
-            cout << "number_channels = " << std::dec << number_channels << endl;
-
-            cout << "Pico device parameters retrieved" << endl;
-            return 0;
-        }
-
-        int pico_probe()
-        {
-            sndbuf[0] = 0xAA;
-            sndbuf[1] = 0x05;
-            if(socket->Send(sndbuf, 2) == -1)
-            {
-                cerr << "Failed to send data to socket" << endl;
-                return -1;
-            }
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-            {
-                cerr << "Failed to receive data from socket" << endl;
-                return -1;
-            }
-
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-                cerr << "Server disconnected" << endl;
-                return -1;
-            }
-            if(bytes_received < 2)
-            {
-                cerr << "Invalid buffer size" << endl;
-                return -1;
-            }
-            if(rcvbuf[0] != 0xAA)
-            {
-                cerr << "Invalid magic number" << endl;
-                return -1;
-            }
-
-            if(rcvbuf[1] == 0xFF)
-            {
-                if(bytes_received < 7)
-                {
-                    cerr << "Invalid buffer size" << endl;
-                    return -1;
-                }
-
-                cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
-                memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
-                memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-            }
-            else if(rcvbuf[1] != 0xC5)
-            {
-                cerr << "Invalid command callback" << endl;
-                return -1;
-            }
-
-            cout << "Pico device probe completed" << endl;
-            return 0;            
-        }
-
-        int pico_set_points(uint32_t* points, uint32_t size)
-        {
-            sndbuf[0] = 0xAA;
-            sndbuf[1] = 0x06;
-            memcpy(sndbuf + 2, &size, sizeof(uint32_t));
-            memcpy(sndbuf + 6, points, size * sizeof(uint32_t));
-
-            if(socket->Send(sndbuf, size * sizeof(uint32_t) + 6) == -1)
-            {
-                cerr << "Failed to send data to socket" << endl;
-                return -1;
-            }
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-            {
-                cerr << "Failed to receive data from socket" << endl;
-                return -1;
-            }
-
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-                cerr << "Server disconnected" << endl;
-                return -1;
-            }
-            if(bytes_received < 2)
-            {
-                cerr << "Invalid buffer size" << endl;
-                return -1;
-            }
-            if(rcvbuf[0] != 0xAA)
-            {
-                cerr << "Invalid magic number" << endl;
-                return -1;
-            }
-
-            if(rcvbuf[1] == 0xFF)
-            {
-                if(bytes_received < 7)
-                {
-                    cerr << "Invalid buffer size" << endl;
-                    return -1;
-                }
-
-                cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
-                memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
-                memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-            }
-            else if(rcvbuf[1] != 0xC6)
-            {
-                cerr << "Invalid command callback" << endl;
-                return -1;
-            }
-
-            cout << "Pico device points set" << endl;
-            return 0;
-        }
-
-        int pico_set_sample_rate(uint32_t sample_rate)
-        {
-            sndbuf[0] = 0xAA;
-            sndbuf[1] = 0x07;
-            memcpy(sndbuf + 2, &sample_rate, sizeof(uint32_t));
-
-            if(socket->Send(sndbuf, sizeof(uint32_t) + 6) == -1)
-            {
-                cerr << "Failed to send data to socket" << endl;
-                return -1;
-            }
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-            {
-                cerr << "Failed to receive data from socket" << endl;
-                return -1;
-            }
-
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-=======
-            {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -583,33 +262,13 @@ class PicoLocalClient
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
-<<<<<<< HEAD
-return 0;                
-            }
-            else if(rcvbuf[1] != 0xC7)
-=======
             }
             else if(rcvbuf[1] != 0xC3)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Invalid command callback" << endl;
                 return -1;
             }
 
-<<<<<<< HEAD
-            cout << "Pico device sample rate set" << endl;
-            return 0;            
-        }
-
-        int pico_set_times(uint32_t* times, uint32_t size)
-        {
-            sndbuf[0] = 0xAA;
-            sndbuf[1] = 0x08;
-            memcpy(sndbuf + 2, &size, sizeof(uint32_t));
-            memcpy(sndbuf + 6, times, size * sizeof(uint32_t));
-
-            if(socket->Send(sndbuf, size * sizeof(uint32_t) + 6) == -1)
-=======
             cout << "Pico device closed" << endl;
             return 0;
         }
@@ -619,16 +278,11 @@ return 0;
             sndbuf[0] = 0xAA;
             sndbuf[1] = 0x04;
             if(socket->Send(sndbuf, 2) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -636,11 +290,7 @@ return 0;
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -666,9 +316,6 @@ return 0;
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
             }
             else if(rcvbuf[1] != 0xC4)
@@ -934,7 +581,6 @@ return 0;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xC8)
             {
@@ -943,11 +589,7 @@ return 0;
             }
 
             cout << "Pico device times set" << endl;
-<<<<<<< HEAD
-            return 0;            
-=======
             return 0;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
         }
 
         int pico_configure_channels(const uint32_t number_channels, uint8_t trigger_channel, int32_t direction, uint16_t threshold, int16_t autoTrigger_ms)
@@ -965,11 +607,7 @@ return 0;
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -977,11 +615,7 @@ return 0;
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -1007,11 +641,7 @@ return 0;
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xC9)
             {
@@ -1020,11 +650,7 @@ return 0;
             }
 
             cout << "Pico device channels configured" << endl;
-<<<<<<< HEAD
-            return 0;            
-=======
             return 0;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
         }
 
         int pico_begin_measurement()
@@ -1037,26 +663,15 @@ return 0;
                 return -1;
             }
 
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            
-            uint32_t bytes_received = socket->GetBytesReceived();
-            if(bytes_received == 0)
-            {  
-=======
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -1082,11 +697,7 @@ return 0;
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xCA)
             {
@@ -1096,27 +707,17 @@ return 0;
             cout << "Pico device measurement started" << endl;
             cout << "Measurement in progress..." << endl;
 
-<<<<<<< HEAD
-            while(rcvbuf[1] != 0xCB)
-            {
-                if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             bool end_of_data = false;
             while(!end_of_data)
             {
                 if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 {
                     cerr << "Failed to receive data from socket" << endl;
                     return -1;
                 }
                 bytes_received = socket->GetBytesReceived();
                 if(bytes_received == 0)
-<<<<<<< HEAD
-                {  
-=======
                 {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                     cerr << "Server disconnected" << endl;
                     return -1;
                 }
@@ -1142,11 +743,6 @@ return 0;
                     cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                     memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                     memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                    cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-                }
-                else if(rcvbuf[1] != 0xCA)
-=======
                     cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
                 }
 
@@ -1160,7 +756,6 @@ return 0;
                     cout << "Measurement in progress..." << endl;
                 }
                 else
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 {
                     cerr << "Invalid command callback" << endl;
                     return -1;
@@ -1182,11 +777,7 @@ return 0;
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -1194,11 +785,7 @@ return 0;
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -1212,11 +799,6 @@ return 0;
                 cerr << "Invalid magic number" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            
-=======
-
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             if(rcvbuf[1] == 0xFF)
             {
                 if(bytes_received < 7)
@@ -1228,11 +810,7 @@ return 0;
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xCE)
             {
@@ -1253,11 +831,7 @@ return 0;
                 cerr << "Failed to send data to socket" << endl;
                 return -1;
             }
-<<<<<<< HEAD
-            if(socket->Receive(rcvbuf, sizeof(rcvbuf)) == -1)
-=======
             if(socket->Receive(MAX_PACKET, rcvbuf) == -1)
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             {
                 cerr << "Failed to receive data from socket" << endl;
                 return -1;
@@ -1265,11 +839,7 @@ return 0;
 
             uint32_t bytes_received = socket->GetBytesReceived();
             if(bytes_received == 0)
-<<<<<<< HEAD
-            {  
-=======
             {
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 cerr << "Server disconnected" << endl;
                 return -1;
             }
@@ -1295,11 +865,7 @@ return 0;
                 cerr << "Error at ADC: " << std::hex << rcvbuf[2] << endl;
                 memcpy(&error_state, rcvbuf + 2, sizeof(uint8_t));
                 memcpy(&error_code, rcvbuf + 3, sizeof(uint32_t));
-<<<<<<< HEAD
-                cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;                
-=======
                 cerr << "Error code: " << std::hex << error_code << " " << return_fun(error_code) << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
             }
             else if(rcvbuf[1] != 0xCD)
             {
@@ -1313,43 +879,27 @@ return 0;
 
         int get_command()
         {
-<<<<<<< HEAD
-            if(socket->Receive(sndbuf, sizeof(sndbuf)) != 0)
-            {
-                std::getline(std::cin, line_edit);
-=======
             if(true)
             {
                 cout << "cmd$ ";
                 std::getline(std::cin, line_edit);
                 cout << endl;
 
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 tokens = split(line_edit, " ");
 
                 if(tokens.size() < 1)
                 {
                     cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-                    return -1;
-                }
-
-                if(tokens[0] = "open")
-=======
                     cout << endl;
                     return -1;
                 }
 
                 if(tokens[0] == "open")
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                 {
                     if(pico_open() != 0)
                     {
                         cerr << "Failed to open pico device" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1358,19 +908,13 @@ return 0;
                     if(tokens.size() < 2)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     if(pico_xml_config(tokens[1]) != 0)
                     {
                         cerr << "Failed to configure pico device" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1379,25 +923,12 @@ return 0;
                     if(tokens.size() < 5)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
 
                     std::vector<uint32_t> points;
                     std::vector<uint32_t> times;
-<<<<<<< HEAD
-                    uint32_t sample_rate = std::stoi(tokens[2]);
-                    uint32_t number_channels = std::stoi(tokens[3]);
-                    uint32_t size = std::stoi(tokens[4]);
-                    points = string_to_vector(points);
-                    times = string_to_vector(times);
-                    if(points.size() != size || times.size() != size)
-                    {
-                        cerr << "Invalid data size" << endl;
-=======
 
                     points = string_to_vector(tokens[1]);
                     times = string_to_vector(tokens[2]);
@@ -1409,16 +940,12 @@ return 0;
                     {
                         cerr << "Invalid data size" << endl;
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     if(pico_set_params(points.data(), times.data(), sample_rate, number_channels, size) != 0)
                     {
                         cerr << "Failed to set pico device parameters" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     return 0;
@@ -1428,10 +955,7 @@ return 0;
                     if(pico_close() != 0)
                     {
                         cerr << "Failed to close pico device" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1440,10 +964,7 @@ return 0;
                     if(pico_exit() != 0)
                     {
                         cerr << "Failed to exit pico device" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
 
@@ -1454,10 +975,7 @@ return 0;
                     if(pico_get_current_params() != 0)
                     {
                         cerr << "Failed to get pico device parameters" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1466,10 +984,7 @@ return 0;
                     if(pico_probe() != 0)
                     {
                         cerr << "Failed to probe pico device" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1478,16 +993,6 @@ return 0;
                     if(tokens.size() < 3)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-                        return -1;
-                    }
-
-                    uint32_t size = std::stoi(tokens[2]);
-                    std::vector<uint32_t> points = string_to_vector(points);
-                    if(points.size() != size)
-                    {
-                        cerr << "Invalid data size" << endl;
-=======
                         cout << endl;
                         return -1;
                     }
@@ -1499,16 +1004,12 @@ return 0;
                     {
                         cerr << "Invalid data size" << endl;
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     if(pico_set_points(points.data(), size) != 0)
                     {
                         cerr << "Failed to set pico device points" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1517,10 +1018,7 @@ return 0;
                     if(tokens.size() < 2)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
 
@@ -1528,10 +1026,7 @@ return 0;
                     if(pico_set_sample_rate(sample_rate) != 0)
                     {
                         cerr << "Failed to set pico device sample rate" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1540,16 +1035,6 @@ return 0;
                     if(tokens.size() < 3)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-                        return -1;
-                    }
-
-                    uint32_t size = std::stoi(tokens[2]);
-                    std::vector<uint32_t> times = string_to_vector(times);
-                    if(times.size() != size)
-                    {
-                        cerr << "Invalid data size" << endl;
-=======
                         cout << endl;
                         return -1;
                     }
@@ -1560,16 +1045,12 @@ return 0;
                     {
                         cerr << "Invalid data size" << endl;
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     if(pico_set_times(times.data(), size) != 0)
                     {
                         cerr << "Failed to set pico device times" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1578,10 +1059,7 @@ return 0;
                     if(tokens.size() < 6)
                     {
                         cerr << "Invalid command" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                     uint32_t number_channels = std::stoi(tokens[1]); // number of channels (1-8)
@@ -1592,10 +1070,7 @@ return 0;
                     if(pico_configure_channels(number_channels, trigger_channel, direction, threshold, autoTrigger_ms) != 0)
                     {
                         cerr << "Failed to configure pico device channels" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1604,10 +1079,7 @@ return 0;
                     if(pico_begin_measurement() != 0)
                     {
                         cerr << "Failed to begin pico device measurement" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1616,10 +1088,7 @@ return 0;
                     if(pico_stop() != 0)
                     {
                         cerr << "Failed to stop pico device measurement" << endl;
-<<<<<<< HEAD
-=======
                         cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                         return -1;
                     }
                 }
@@ -1647,72 +1116,26 @@ return 0;
                 else
                 {
                     cerr << "Unknown command" << endl;
-<<<<<<< HEAD
-=======
                     cout << endl;
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
                     return -1;
                 }
             }
 
-<<<<<<< HEAD
-            return 0;
-        }
-}
-=======
             cout << endl;
 
             return 0;
         }
 };
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
 
 int main()
 {
     cout << "Open socket" << endl;
-<<<<<<< HEAD
-    CPassiveSocket SocketPassive(CSimpleSocket::CSocketType::SocketTypeTcp);
-    if (!SocketPassive.Initialize())
-=======
     CActiveSocket SocketActive(CSimpleSocket::CSocketType::SocketTypeTcp);
     if (!SocketActive.Initialize())
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
     {
         cerr << "Socket initialization failed" << endl;
         return -1;
     }
-<<<<<<< HEAD
-    if(!SocketPassive.Listen("localhost", 5002))
-    {
-        cerr << "Socket listening failed" << endl;
-        return -1;
-    }
-
-    CActiveSocket* ClientSocket;
-
-    while(true)
-    {
-        if ((ClientSocket = SocketPassive.Accept()) != nullptr)
-        {
-            cerr << "Socket accept failed" << endl;
-            return -1;
-        }
-
-        cout << LogPref::Flag(INFO) << "Client connected" << endl;
-        pico_service = new PicoLocalService(ClientSocket);
-
-        while(pico_service->get_request() != 0)
-        {
-            cout << LogPref::Flag(INFO) << "Request received" << endl;
-        }
-
-        cout << LogPref::Flag(INFO) << "Request processing finished" << endl;
-        delete pico_service;
-        pico_service = nullptr;
-
-        delete ClientSocket;
-        ClientSocket = nullptr;
-=======
     if(!SocketActive.Open("127.0.0.1", 5003))
     {
         cerr << "Socket opening failed" << endl;
@@ -1723,7 +1146,6 @@ int main()
 
     while(pico_client.get_command() != 1) {
         // empty
->>>>>>> 6a0c5e06dc737368566c8c5b45d8073a39148b99
     }
 
     return 0;