mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-12 01:53:07 +03:00
Merge branch 'ficeto-esp8266' into esp8266
* ficeto-esp8266: add template methods for stream to stream writes to SD and FS alignment not needed. we use fixed addresses Rework SPIFFS API to be more Arduino like fix missed edits disable automount fix SPIFFS to work pull get/set NoDelay for WiFiClient Add SPIFFS Support export sketch data folder to the build config Revert "Revert "Edit SD Server example to use the new Write(Stream) method"" add template client write Revert "Add WiFiClient.write for Stream" Revert "Edit SD Server example to use the new Write(Stream) method" Edit SD Server example to use the new Write(Stream) method Add WiFiClient.write for Stream make upload callback packets aligned to defined size Conflicts: hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h
This commit is contained in:
@ -123,6 +123,19 @@ void ICACHE_FLASH_ATTR WiFiClient::_err(int8_t err)
|
||||
esp_schedule();
|
||||
}
|
||||
|
||||
|
||||
void ICACHE_FLASH_ATTR WiFiClient::setNoDelay(bool nodelay) {
|
||||
if (!_client)
|
||||
return;
|
||||
_client->setNoDelay(nodelay);
|
||||
}
|
||||
|
||||
bool ICACHE_FLASH_ATTR WiFiClient::getNoDelay() {
|
||||
if (!_client)
|
||||
return false;
|
||||
return _client->getNoDelay();
|
||||
}
|
||||
|
||||
size_t ICACHE_FLASH_ATTR WiFiClient::write(uint8_t b)
|
||||
{
|
||||
return write(&b, 1);
|
||||
|
@ -59,6 +59,30 @@ public:
|
||||
|
||||
IPAddress remoteIP();
|
||||
uint16_t remotePort();
|
||||
bool getNoDelay();
|
||||
void setNoDelay(bool nodelay);
|
||||
|
||||
template<typename T> size_t write(T &src){
|
||||
uint8_t obuf[1460];
|
||||
size_t doneLen = 0;
|
||||
size_t sentLen;
|
||||
int i;
|
||||
|
||||
while (src.available() > 1460){
|
||||
src.read(obuf, 1460);
|
||||
sentLen = write(obuf, 1460);
|
||||
doneLen = doneLen + sentLen;
|
||||
if(sentLen != 1460){
|
||||
return doneLen;
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t leftLen = src.available();
|
||||
src.read(obuf, leftLen);
|
||||
sentLen = write(obuf, leftLen);
|
||||
doneLen = doneLen + sentLen;
|
||||
return doneLen;
|
||||
}
|
||||
|
||||
friend class WiFiServer;
|
||||
|
||||
|
Reference in New Issue
Block a user