From 4ae8a6d631d532409dde5ea35af03bccbb62974f Mon Sep 17 00:00:00 2001 From: ficeto Date: Wed, 13 May 2015 12:09:34 +0300 Subject: [PATCH] Edit SD Server example to use the new Write(Stream) method --- .../examples/SDWebServer/SDWebServer.ino | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino index d9e230c77..dcb3a9d6e 100644 --- a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino +++ b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino @@ -111,23 +111,10 @@ bool loadFromSdCard(String path){ dataType = 0; path = 0; - uint8_t obuf[WWW_BUF_SIZE]; - - while (dataFile.available() > WWW_BUF_SIZE){ - dataFile.read(obuf, WWW_BUF_SIZE); - if(client.write(obuf, WWW_BUF_SIZE) != WWW_BUF_SIZE){ - DBG_OUTPUT_PORT.println("Sent less data than expected!"); - dataFile.close(); - return true; - } - } - uint16_t leftLen = dataFile.available(); - dataFile.read(obuf, leftLen); - if(client.write(obuf, leftLen) != leftLen){ + if(client.write(dataFile) != dataFile.size()){ DBG_OUTPUT_PORT.println("Sent less data than expected!"); - dataFile.close(); - return true; } + dataFile.close(); client.stop(); return true;