picloud data send and receive, not tested

This commit is contained in:
2021-04-07 17:19:58 +03:00
parent fd2e0b2eed
commit 21e00e7176
5 changed files with 25 additions and 8 deletions

View File

@@ -71,14 +71,14 @@ bool PICloudServer::closeDevice() {
int PICloudServer::readDevice(void * read_to, int max_size) {
piCoutObj << "readDevice";
//piCoutObj << "readDevice";
piMSleep(eth.readTimeout());
return -1;
}
int PICloudServer::writeDevice(const void * data, int max_size) {
piCoutObj << "writeDevice";
//piCoutObj << "writeDevice";
return -1;
}
@@ -94,23 +94,37 @@ int PICloudServer::sendData(const PIByteArray & data, uint client_id) {
PICloudServer::Client::Client(PICloudServer * srv, uint id) : server(srv), client_id(id) {
is_connected = true;
}
PICloudServer::Client::~Client() {
if (is_connected) {
is_connected = false;
cond_buff.notifyOne();
}
close();
}
bool PICloudServer::Client::openDevice() {
return true;
return is_connected;
}
bool PICloudServer::Client::closeDevice() {
server->clientDisconnect(client_id);
if (is_connected) {
is_connected = false;
cond_buff.notifyOne();
}
return true;
}
int PICloudServer::Client::readDevice(void * read_to, int max_size) {
//piCoutObj << "readDevice";
if (!is_connected) return -1;
mutex_buff.lock();
cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty();});
int sz = piMini(max_size, buff.size());
@@ -127,6 +141,7 @@ int PICloudServer::Client::writeDevice(const void * data, int size) {
void PICloudServer::Client::pushBuffer(const PIByteArray & ba) {
if (!is_connected) return;
mutex_buff.lock();
buff.append(ba);
cond_buff.notifyOne();