mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-17 22:23:10 +03:00
Fix bug on client.available() to retrun the number of bytes available
This commit is contained in:
@ -122,7 +122,7 @@ uint8_t ServerDrv::getClientState(uint8_t sock)
|
|||||||
return _data;
|
return _data;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t ServerDrv::availData(uint8_t sock)
|
uint16_t ServerDrv::availData(uint8_t sock)
|
||||||
{
|
{
|
||||||
WAIT_FOR_SLAVE_SELECT();
|
WAIT_FOR_SLAVE_SELECT();
|
||||||
// Send Command
|
// Send Command
|
||||||
@ -133,19 +133,14 @@ uint8_t ServerDrv::availData(uint8_t sock)
|
|||||||
SpiDrv::waitForSlaveReady();
|
SpiDrv::waitForSlaveReady();
|
||||||
|
|
||||||
// Wait for reply
|
// Wait for reply
|
||||||
uint8_t _data = 0;
|
|
||||||
uint8_t _dataLen = 0;
|
uint8_t _dataLen = 0;
|
||||||
if (!SpiDrv::waitResponseCmd(AVAIL_DATA_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
|
uint16_t len = 0;
|
||||||
{
|
|
||||||
WARN("error waitResponse");
|
SpiDrv::waitResponseCmd(AVAIL_DATA_TCP_CMD, PARAM_NUMS_1, (uint8_t*)&len, &_dataLen);
|
||||||
}
|
|
||||||
SpiDrv::spiSlaveDeselect();
|
SpiDrv::spiSlaveDeselect();
|
||||||
|
|
||||||
if (_dataLen!=0)
|
return len;
|
||||||
{
|
|
||||||
return (_data == 1);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ServerDrv::getData(uint8_t sock, uint8_t *data, uint8_t peek)
|
bool ServerDrv::getData(uint8_t sock, uint8_t *data, uint8_t peek)
|
||||||
|
@ -31,7 +31,7 @@ public:
|
|||||||
|
|
||||||
static bool sendUdpData(uint8_t sock);
|
static bool sendUdpData(uint8_t sock);
|
||||||
|
|
||||||
static uint8_t availData(uint8_t sock);
|
static uint16_t availData(uint8_t sock);
|
||||||
|
|
||||||
static uint8_t checkDataSent(uint8_t sock);
|
static uint8_t checkDataSent(uint8_t sock);
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user