Arduino
/
inkplate-6-arduino-library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verbose download debugging.

This commit is contained in:
Thorinair 2020-07-24 14:29:09 +02:00
parent 4107d83bc2
commit 3eb98ff9f4
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Inkplate.cpp
View File

@ -384,7 +384,7 @@ int Inkplate::drawBitmapFromWeb(char* url, int x, int y) {
HTTPClient http; HTTPClient http;
http.getStream().setNoDelay(true); http.getStream().setNoDelay(true);
//http.getStream().setTimeout(1); http.getStream().setTimeout(10);
http.begin(url); http.begin(url);
int httpCode = http.GET(); int httpCode = http.GET();
if (httpCode != 200) return 0; if (httpCode != 200) return 0;
@ -393,8 +393,6 @@ int Inkplate::drawBitmapFromWeb(char* url, int x, int y) {
if (len <= 0) return 0; if (len <= 0) return 0;
WiFiClient * dat = http.getStreamPtr(); WiFiClient * dat = http.getStreamPtr();
//dat->setTimeout(20);
//dat->setNoDelay(true);
return drawBitmapFromWeb(dat, x, y, len); return drawBitmapFromWeb(dat, x, y, len);
} }
@ -923,8 +921,8 @@ int Inkplate::drawGrayscaleBitmap24Web(WiFiClient *s, struct bitmapHeader bmpHea
int h = bmpHeader.height; int h = bmpHeader.height;
char padding = w % 4; char padding = w % 4;
Serial.println(len); //Serial.println(len);
Serial.println(bmpHeader.startRAW); //Serial.println(bmpHeader.startRAW);
int total = len - 34; int total = len - 34;
@ -932,23 +930,36 @@ int Inkplate::drawGrayscaleBitmap24Web(WiFiClient *s, struct bitmapHeader bmpHea
if (buf == NULL) if (buf == NULL)
return 0; return 0;
Serial.println("Starting data read!");
long t_start = millis(); long t_start = millis();
//int i, j; //int i, j;
//size_t read = s->read(buf, len - 34); //size_t read = s->read(buf, len - 34);
//for (i = 0; i < len - 34; i++) //for (i = 0; i < len - 34; i++)
// s->read(); // s->read();
int read; //int read;
int pnt = 0; int pnt = 0;
int cnk = 512; //int cnk = 512;
//while (pnt < total) {
// if (total - pnt < cnk)
// cnk = total - pnt;
// read = s->read(buf+pnt, cnk);
// if (read > 0) {
// pnt += read;
// Serial.println(" Read: " + String(read));
// }
// //delay(10);
//}
while (pnt < total) { while (pnt < total) {
if (total - pnt < cnk) int toread = s->available();
cnk = total - pnt; if (toread > 0) {
read = s->read(buf+pnt, cnk); int read = s->read(buf+pnt, toread);
if (read > 0) { if (read > 0) {
pnt += read; pnt += read;
Serial.println(" Read: " + String(read)); Serial.println(" Read: " + String(read) + " Total: " + String(pnt) + "/" + String(total));
}
} }
//delay(10);
} }
//while (pnt < total) { //while (pnt < total) {
@ -965,7 +976,7 @@ int Inkplate::drawGrayscaleBitmap24Web(WiFiClient *s, struct bitmapHeader bmpHea
//} //}
long t_stop = millis(); long t_stop = millis();
Serial.println("Time: " + String(t_stop - t_start)); Serial.println("Time: " + String((float)(t_stop - t_start)/1000) + "s");
int i, j, k = bmpHeader.startRAW - 34; int i, j, k = bmpHeader.startRAW - 34;
for (j = 0; j < h; j++) { for (j = 0; j < h; j++) {

3
examples/2. Advanced Inkplate Features/10-Inkplate_Download_And_Show/10-Inkplate_Download_And_Show.ino
View File

@ -44,8 +44,9 @@ void setup() {
display.partialUpdate(); display.partialUpdate();
//Connect to the WiFi network. //Connect to the WiFi network.
WiFi.begin(ssid, password); WiFi.mode(WIFI_MODE_STA);
WiFi.setSleep(false); WiFi.setSleep(false);
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED) { while (WiFi.status() != WL_CONNECTED) {
delay(500); delay(500);
Serial.print("."); Serial.print(".");