PICloud connect/disconnect

libs/cloud/picloudclient.cpp

@@ -21,7 +21,7 @@
 #include "picloudtcp.h"
 
 
-PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
+PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
 	tcp.setRole(PICloud::TCP::Client);
 	setName("cloud_client");
 }
@@ -39,28 +39,49 @@ void PICloudClient::setServerName(const PIString & server_name) {
 }
 
 
+void PICloudClient::setKeepConnection(bool on) {
+	eth.setParameter(PIEthernet::KeepConnection, on);
+}
+
+
 bool PICloudClient::openDevice() {
 	piCout << "PICloudClient open device" << path();
 	bool op = eth.connect(path(), false);
 	if (op) {
-		CONNECTL(&eth, disconnected, [this](bool){opened_ = false;});
+		CONNECTL(&eth, connected, [this](){tcp.sendStart(&eth);});
 		CONNECTU(&eth, threadedReadEvent, this, readed);
+		CONNECTL(&eth, disconnected, [this](bool){
+			opened_ = false;
+			eth.close();
+			piCoutObj << "disconnected";// << !isOpened() << isClosed();
+			piMSleep(100);
+		});
 		eth.startThreadedRead();
 		tcp.sendStart(&eth);
 		return true;
+	} else {
+		eth.close();
+		return false;
 	}
-	eth.close();
-	return false;
 }
 
 
 bool PICloudClient::closeDevice() {
-	return eth.close();
+	eth.stop();
+	eth.close();
+	return true;
 }
 
 
 int PICloudClient::readDevice(void * read_to, int max_size) {
-	return eth.read(read_to, max_size);
+	piCoutObj << "readDevice";
+	mutex_buff.lock();
+	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty();});
+	int sz = piMini(max_size, buff.size());
+	memcpy(read_to, buff.data(), sz);
+	buff.remove(0, sz);
+	mutex_buff.unlock();
+	return sz;
 }
 
 
@@ -70,5 +91,15 @@ int PICloudClient::writeDevice(const void * data, int max_size) {
 
 
 void PICloudClient::readed(uchar *data, int size) {
-
+	PIByteArray ba(data, size);
+	mutex_buff.lock();
+	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
+	if (hdr.second == tcp.role()) {
+		piCoutObj << "readed" << ba.toHex();
+		buff.append(data, size);
+		cond_buff.notifyOne();
+	}
+	mutex_buff.unlock();
+	while (buff.size() > threadedReadBufferSize()) piMSleep(100);
 }
+