first commit
This commit is contained in:
@@ -0,0 +1,865 @@
|
||||
// GxEPD_WiFi_Example : Display Library example for SPI e-paper panels from Dalian Good Display and boards from Waveshare.
|
||||
// Requires HW SPI and Adafruit_GFX. Caution: these e-papers require 3.3V supply AND data lines!
|
||||
//
|
||||
// Display Library based on Demo Example from Good Display: http://www.e-paper-display.com/download_list/downloadcategoryid=34&isMode=false.html
|
||||
//
|
||||
// BMP handling code extracts taken from: https://github.com/prenticedavid/MCUFRIEND_kbv/tree/master/examples/showBMP_kbv_Uno
|
||||
//
|
||||
// Author: Jean-Marc Zingg
|
||||
//
|
||||
// Version: see library.properties
|
||||
//
|
||||
// Library: https://github.com/ZinggJM/GxEPD
|
||||
|
||||
// Supporting Arduino Forum Topics:
|
||||
// Waveshare e-paper displays with SPI: http://forum.arduino.cc/index.php?topic=487007.0
|
||||
// Good Dispay ePaper for Arduino : https://forum.arduino.cc/index.php?topic=436411.0
|
||||
|
||||
// mapping suggestion from Waveshare SPI e-Paper to Wemos D1 mini
|
||||
// BUSY -> D2, RST -> D4, DC -> D3, CS -> D8, CLK -> D5, DIN -> D7, GND -> GND, 3.3V -> 3.3V
|
||||
|
||||
// mapping suggestion from Waveshare SPI e-Paper to generic ESP8266
|
||||
// BUSY -> GPIO4, RST -> GPIO2, DC -> GPIO0, CS -> GPIO15, CLK -> GPIO14, DIN -> GPIO13, GND -> GND, 3.3V -> 3.3V
|
||||
|
||||
// mapping of Waveshare e-Paper ESP8266 Driver Board
|
||||
// BUSY -> GPIO16, RST -> GPIO5, DC -> GPIO4, CS -> GPIO15, CLK -> GPIO14, DIN -> GPIO13, GND -> GND, 3.3V -> 3.3V
|
||||
|
||||
// mapping suggestion for ESP32, e.g. LOLIN32, see .../variants/.../pins_arduino.h for your board
|
||||
// NOTE: there are variants with different pins for SPI ! CHECK SPI PINS OF YOUR BOARD
|
||||
// BUSY -> 4, RST -> 16, DC -> 17, CS -> SS(5), CLK -> SCK(18), DIN -> MOSI(23), GND -> GND, 3.3V -> 3.3V
|
||||
|
||||
// new mapping suggestion for STM32F1, e.g. STM32F103C8T6 "BluePill"
|
||||
// BUSY -> A1, RST -> A2, DC -> A3, CS-> A4, CLK -> A5, DIN -> A7
|
||||
|
||||
// mapping suggestion for AVR, UNO, NANO etc.
|
||||
// BUSY -> 7, RST -> 9, DC -> 8, CS-> 10, CLK -> 13, DIN -> 11
|
||||
//
|
||||
|
||||
// mapping suggestion for Arduino MEGA
|
||||
// BUSY -> 7, RST -> 9, DC -> 8, CS-> 53, CLK -> 52, DIN -> 51
|
||||
|
||||
// mapping suggestion for Arduino DUE
|
||||
// BUSY -> 7, RST -> 9, DC -> 8, CS-> 77, CLK -> 76, DIN -> 75
|
||||
// SPI pins are also on 6 pin 2x3 SPI header
|
||||
|
||||
// include library, include base class, make path known
|
||||
#include <GxEPD.h>
|
||||
|
||||
// select the display class to use, only one
|
||||
//#include <GxDEPG0150BN/GxDEPG0150BN.h> // 1.50" b/w
|
||||
//#include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w
|
||||
//#include <GxGDEH0154D67/GxGDEH0154D67.h> // 1.54" b/w 200x200, SSD1681
|
||||
//#include <GxGDEW0154T8/GxGDEW0154T8.h> // 1.54" b/w 152x152 UC8151 (IL0373)
|
||||
//#include <GxGDEW0154M09/GxGDEW0154M09.h> // 1.54" b/w 200x200 JD79653A
|
||||
//#include <GxGDEW0154M10/GxGDEW0154M10.h> // 1.54" b/w 152x152 UC8151D
|
||||
//#include <GxGDEW0154Z04/GxGDEW0154Z04.h> // 1.54" b/w/r 200x200
|
||||
//#include <GxGDEW0154Z17/GxGDEW0154Z17.h> // 1.54" b/w/r 152x152
|
||||
//#include <GxGDEH0154Z90/GxGDEH0154Z90.h> // 1.54" b/w/r 200x200 SSD1681
|
||||
//#include <GxGDEW0213I5F/GxGDEW0213I5F.h> // 2.13" b/w 104x212 flexible
|
||||
//#include <GxGDE0213B1/GxGDE0213B1.h> // 2.13" b/w
|
||||
//#include <GxGDEH0213B72/GxGDEH0213B72.h> // 2.13" b/w new panel
|
||||
//#include <GxGDEH0213B73/GxGDEH0213B73.h> // 2.13" b/w newer panel
|
||||
//#include <GxGDEM0213B74/GxGDEM0213B74.h> // 2.13" b/w 128x250 SSD1680
|
||||
//#include <GxGDEW0213Z16/GxGDEW0213Z16.h> // 2.13" b/w/r
|
||||
//#include <GxGDEH0213Z19/GxGDEH0213Z19.h> // 2.13" b/w/r UC8151D
|
||||
//#include <GxGDEW0213T5D/GxGDEW0213T5D.h> // 2.13" b/w 104x212 UC8151D
|
||||
//#include <GxDEPG0213BN/GxDEPG0213BN.h> // 2.13" b/w 128x250, SSD1680, TTGO T5 V2.4.1, V2.3.1
|
||||
//#include <GxGDEH029A1/GxGDEH029A1.h> // 2.9" b/w
|
||||
//#include <GxGDEW029T5/GxGDEW029T5.h> // 2.9" b/w UC8151 (IL0373)
|
||||
//#include <GxGDEW029T5D/GxGDEW029T5D.h> // 2.9" b/w UC8151D
|
||||
//#include <GxGDEM029T94/GxGDEM029T94.h> // 2.9" b/w
|
||||
//#include <GxDEPG0290BS/GxDEPG0290BS.h> // 2.9" b/w Waveshare variant, TTGO T5 V2.4.1 2.9"
|
||||
//#include <GxGDEW029Z10/GxGDEW029Z10.h> // 2.9" b/w/r
|
||||
//#include <GxGDEH029Z13/GxGDEH029Z13.h> // 2.9" b/w/r UC8151D
|
||||
//#include <GxGDEW026T0/GxGDEW026T0.h> // 2.6" b/w
|
||||
//#include <GxDEPG0266BN/GxDEPG0266BN.h> // 2.66" b/w 152x296, SSD1680, TTGO T5 V2.66, TTGO T5 V2.4.1
|
||||
//#include <GxGDEW027C44/GxGDEW027C44.h> // 2.7" b/w/r
|
||||
//#include <GxGDEW027W3/GxGDEW027W3.h> // 2.7" b/w
|
||||
//#include <GxGDEY027T91/GxGDEY027T91.h> // 2.7" b/w
|
||||
//#include <GxGDEW0371W7/GxGDEW0371W7.h> // 3.7" b/w
|
||||
//#include <GxGDEW042T2/GxGDEW042T2.h> // 4.2" b/w
|
||||
//#include <GxGDEW042Z15/GxGDEW042Z15.h> // 4.2" b/w/r
|
||||
//#include <GxGDEW0583T7/GxGDEW0583T7.h> // 5.83" b/w
|
||||
//#include <GxGDEW075T8/GxGDEW075T8.h> // 7.5" b/w
|
||||
//#include <GxGDEW075T7/GxGDEW075T7.h> // 7.5" b/w 800x480
|
||||
//#include <GxGDEW075Z09/GxGDEW075Z09.h> // 7.5" b/w/r
|
||||
//#include <GxGDEW075Z08/GxGDEW075Z08.h> // 7.5" b/w/r 800x480
|
||||
|
||||
#include <GxIO/GxIO_SPI/GxIO_SPI.h>
|
||||
#include <GxIO/GxIO.h>
|
||||
|
||||
#if defined(ESP8266)
|
||||
|
||||
// for SPI pin definitions see e.g.:
|
||||
// C:\Users\xxx\AppData\Local\Arduino15\packages\esp8266\hardware\esp8266\2.4.2\variants\generic\common.h
|
||||
|
||||
GxIO_Class io(SPI, /*CS=D8*/ SS, /*DC=D3*/ 0, /*RST=D4*/ 2); // arbitrary selection of D3(=0), D4(=2), selected for default of GxEPD_Class
|
||||
GxEPD_Class display(io /*RST=D4*/ /*BUSY=D2*/); // default selection of D4(=2), D2(=4)
|
||||
// Heltec E-Paper 1.54" b/w without RST, BUSY
|
||||
//GxEPD_Class display(io, /*RST=D4*/ -1, /*BUSY=D2*/ -1); // no RST, no BUSY
|
||||
|
||||
#elif defined(ESP32)
|
||||
|
||||
// for SPI pin definitions see e.g.:
|
||||
// C:\Users\xxx\Documents\Arduino\hardware\espressif\esp32\variants\lolin32\pins_arduino.h
|
||||
|
||||
GxIO_Class io(SPI, /*CS=5*/ SS, /*DC=*/ 17, /*RST=*/ 16); // arbitrary selection of 17, 16
|
||||
GxEPD_Class display(io, /*RST=*/ 16, /*BUSY=*/ 4); // arbitrary selection of (16), 4
|
||||
// for LILYGO® TTGO T5 2.66 board uncomment next two lines instead of previous two lines
|
||||
//GxIO_Class io(SPI, /*CS=5*/ SS, /*DC=*/ 19, /*RST=*/ 4); // LILYGO® TTGO T5 2.66
|
||||
//GxEPD_Class display(io, /*RST=*/ 4, /*BUSY=*/ 34); // LILYGO® TTGO T5 2.66
|
||||
|
||||
#endif
|
||||
|
||||
#if defined (ESP8266)
|
||||
#include <ESP8266WiFi.h>
|
||||
#define USE_BearSSL true
|
||||
#endif
|
||||
|
||||
#include <WiFiClient.h>
|
||||
#include <WiFiClientSecure.h>
|
||||
|
||||
const char* ssid = "........";
|
||||
const char* password = "........";
|
||||
const int httpPort = 80;
|
||||
const int httpsPort = 443;
|
||||
const char* fp_api_github_com = "df b2 29 c6 a6 38 1a 59 9d c9 ad 92 2d 26 f5 3c 83 8f a5 87"; // as of 25.11.2020
|
||||
const char* fp_github_com = "5f 3f 7a c2 56 9f 50 a4 66 76 47 c6 a1 8c a0 07 aa ed bb 8e"; // as of 25.11.2020
|
||||
//const char* fp_rawcontent = "70 94 de dd e6 c4 69 48 3a 92 70 a1 48 56 78 2d 18 64 e0 b7"; // as of 25.11.2020
|
||||
const char* fp_rawcontent = "8F 0E 79 24 71 C5 A7 D2 A7 46 76 30 C1 3C B7 2A 13 B0 01 B2"; // as of 29.7.2022
|
||||
|
||||
// how to find the certificate was not easy. finally I found it using Mozilla Firefox.
|
||||
// opened one of the bitmaps, e.g. https://raw.githubusercontent.com/ZinggJM/GxEPD2/master/extras/bitmaps/logo200x200.bmp
|
||||
// clicked the lock symbol, Connection secure clicked >, show connection details, clicked More Information, clicked View Certificate, clicked Download PEM (chain),
|
||||
// selected Open with Notepad. Copied the middle certificate and editted to the following format:
|
||||
// the number of characters per line is of no importance, but the 3 \n are needed
|
||||
|
||||
// Validity
|
||||
// Not Before Fri, 18 Mar 2022 00:00:00 GMT
|
||||
// Not After Tue, 21 Mar 2023 23:59:59 GMT
|
||||
const char* certificate_rawcontent =
|
||||
"-----BEGIN CERTIFICATE-----\n"
|
||||
"MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh"
|
||||
"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3"
|
||||
"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD"
|
||||
"QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT"
|
||||
"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS"
|
||||
"U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC"
|
||||
"AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a"
|
||||
"qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn"
|
||||
"g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW"
|
||||
"raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB"
|
||||
"Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r"
|
||||
"eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB"
|
||||
"/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU"
|
||||
"A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG"
|
||||
"CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG"
|
||||
"GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh"
|
||||
"Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV"
|
||||
"HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH"
|
||||
"bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB"
|
||||
"MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB"
|
||||
"AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z"
|
||||
"ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h"
|
||||
"qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC"
|
||||
"EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6"
|
||||
"ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E"
|
||||
"A7sKPPcw7+uvTPyLNhBzPvOk\n"
|
||||
"-----END CERTIFICATE-----\n";
|
||||
|
||||
|
||||
const char* host_rawcontent = "raw.githubusercontent.com";
|
||||
const char* path_rawcontent = "/ZinggJM/GxEPD2/master/extras/bitmaps/";
|
||||
const char* path_prenticedavid = "/prenticedavid/MCUFRIEND_kbv/master/extras/bitmaps/";
|
||||
const char* path_waveshare_c = "/waveshare/e-Paper/master/RaspberryPi_JetsonNano/c/pic/";
|
||||
const char* path_waveshare_py = "/waveshare/e-Paper/master/RaspberryPi_JetsonNano/python/pic/";
|
||||
|
||||
void showBitmapFrom_HTTP(const char* host, const char* path, const char* filename, int16_t x, int16_t y, bool with_color = true);
|
||||
void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filename, const char* fingerprint, int16_t x, int16_t y, bool with_color = true,
|
||||
const char* certificate = certificate_rawcontent);
|
||||
|
||||
void setup()
|
||||
{
|
||||
Serial.begin(115200);
|
||||
Serial.println();
|
||||
Serial.println("GxEPD_WiFi_Example");
|
||||
|
||||
display.init(115200);
|
||||
|
||||
#ifdef RE_INIT_NEEDED
|
||||
WiFi.persistent(true);
|
||||
WiFi.mode(WIFI_STA); // switch off AP
|
||||
WiFi.setAutoConnect(true);
|
||||
WiFi.setAutoReconnect(true);
|
||||
WiFi.disconnect();
|
||||
#endif
|
||||
|
||||
if (!WiFi.getAutoConnect() || ( WiFi.getMode() != WIFI_STA) || ((WiFi.SSID() != ssid) && String(ssid) != "........"))
|
||||
{
|
||||
Serial.println();
|
||||
Serial.print("WiFi.getAutoConnect()=");
|
||||
Serial.println(WiFi.getAutoConnect());
|
||||
Serial.print("WiFi.SSID()=");
|
||||
Serial.println(WiFi.SSID());
|
||||
WiFi.mode(WIFI_STA); // switch off AP
|
||||
Serial.print("Connecting to ");
|
||||
Serial.println(ssid);
|
||||
WiFi.begin(ssid, password);
|
||||
}
|
||||
int ConnectTimeout = 30; // 15 seconds
|
||||
while (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
delay(500);
|
||||
Serial.print(".");
|
||||
Serial.print(WiFi.status());
|
||||
if (--ConnectTimeout <= 0)
|
||||
{
|
||||
Serial.println();
|
||||
Serial.println("WiFi connect timeout");
|
||||
return;
|
||||
}
|
||||
}
|
||||
Serial.println();
|
||||
Serial.println("WiFi connected");
|
||||
|
||||
// Print the IP address
|
||||
Serial.println(WiFi.localIP());
|
||||
|
||||
drawBitmaps_200x200();
|
||||
drawBitmaps_other();
|
||||
|
||||
//drawBitmaps_test();
|
||||
//drawBitmapsBuffered_test();
|
||||
|
||||
Serial.println("GxEPD_WiFi_Example done");
|
||||
}
|
||||
|
||||
void loop(void)
|
||||
{
|
||||
}
|
||||
|
||||
void drawBitmaps_200x200()
|
||||
{
|
||||
int16_t x = (display.width() - 200) / 2;
|
||||
int16_t y = (display.height() - 200) / 2;
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "logo200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "first200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "second200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "third200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "fourth200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "fifth200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "sixth200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "seventh200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "eighth200x200.bmp", fp_rawcontent, x, y);
|
||||
delay(2000);
|
||||
}
|
||||
|
||||
void drawBitmaps_other()
|
||||
{
|
||||
int16_t w2 = display.width() / 2;
|
||||
int16_t h2 = display.height() / 2;
|
||||
showBitmapFrom_HTTP("www.squix.org", "/blog/wunderground/", "chanceflurries.bmp", w2 - 50, h2 - 50, false);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "betty_1.bmp", fp_rawcontent, w2 - 100, h2 - 160);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "betty_4.bmp", fp_rawcontent, w2 - 102, h2 - 126);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "marilyn_240x240x8.bmp", fp_rawcontent, w2 - 120, h2 - 120);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "miniwoof.bmp", fp_rawcontent, w2 - 60, h2 - 80);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "test.bmp", fp_rawcontent, w2 - 100, h2 - 100);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "tiger.bmp", fp_rawcontent, w2 - 160, h2 - 120);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "tiger_178x160x4.bmp", fp_rawcontent, w2 - 89, h2 - 80);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "tiger_240x317x4.bmp", fp_rawcontent, w2 - 120, h2 - 160);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "tiger_320x200x24.bmp", fp_rawcontent, w2 - 160, h2 - 100);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "tiger16T.bmp", fp_rawcontent, w2 - 160, h2 - 100);
|
||||
delay(2000);
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "woof.bmp", fp_rawcontent, w2 - 100, h2 - 100);
|
||||
delay(2000);
|
||||
}
|
||||
|
||||
void drawBitmaps_test()
|
||||
{
|
||||
int16_t w2 = display.width() / 2;
|
||||
int16_t h2 = display.height() / 2;
|
||||
showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "betty_4.bmp", fp_rawcontent, w2 - 102, h2 - 126);
|
||||
delay(2000);
|
||||
}
|
||||
|
||||
static const uint16_t input_buffer_pixels = 800; // may affect performance
|
||||
|
||||
static const uint16_t max_row_width = 1448; // for up to 6" display 1448x1072
|
||||
static const uint16_t max_palette_pixels = 256; // for depth <= 8
|
||||
|
||||
uint8_t input_buffer[3 * input_buffer_pixels]; // up to depth 24
|
||||
uint8_t output_row_mono_buffer[max_row_width / 8]; // buffer for at least one row of b/w bits
|
||||
uint8_t output_row_color_buffer[max_row_width / 8]; // buffer for at least one row of color bits
|
||||
uint8_t mono_palette_buffer[max_palette_pixels / 8]; // palette buffer for depth <= 8 b/w
|
||||
uint8_t color_palette_buffer[max_palette_pixels / 8]; // palette buffer for depth <= 8 c/w
|
||||
|
||||
void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char* filename, int16_t x, int16_t y, bool with_color)
|
||||
{
|
||||
WiFiClient client;
|
||||
bool connection_ok = false;
|
||||
bool valid = false; // valid format to be handled
|
||||
bool flip = true; // bitmap is stored bottom-to-top
|
||||
uint32_t startTime = millis();
|
||||
if ((x >= display.width()) || (y >= display.height())) return;
|
||||
display.fillScreen(GxEPD_WHITE);
|
||||
Serial.print("connecting to "); Serial.println(host);
|
||||
if (!client.connect(host, httpPort))
|
||||
{
|
||||
Serial.println("connection failed");
|
||||
return;
|
||||
}
|
||||
Serial.print("requesting URL: ");
|
||||
Serial.println(String("http://") + host + path + filename);
|
||||
client.print(String("GET ") + path + filename + " HTTP/1.1\r\n" +
|
||||
"Host: " + host + "\r\n" +
|
||||
"User-Agent: GxEPD_WiFi_Example\r\n" +
|
||||
"Connection: close\r\n\r\n");
|
||||
Serial.println("request sent");
|
||||
while (client.connected())
|
||||
{
|
||||
String line = client.readStringUntil('\n');
|
||||
if (!connection_ok)
|
||||
{
|
||||
connection_ok = line.startsWith("HTTP/1.1 200 OK");
|
||||
if (connection_ok) Serial.println(line);
|
||||
//if (!connection_ok) Serial.println(line);
|
||||
}
|
||||
if (!connection_ok) Serial.println(line);
|
||||
//Serial.println(line);
|
||||
if (line == "\r")
|
||||
{
|
||||
Serial.println("headers received");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!connection_ok) return;
|
||||
// Parse BMP header
|
||||
if (read16(client) == 0x4D42) // BMP signature
|
||||
{
|
||||
int32_t fileSize = read32(client);
|
||||
int32_t creatorBytes = read32(client);
|
||||
int32_t imageOffset = read32(client); // Start of image data
|
||||
int32_t headerSize = read32(client);
|
||||
int32_t width = read32(client);
|
||||
int32_t height = read32(client);
|
||||
uint16_t planes = read16(client);
|
||||
uint16_t depth = read16(client); // bits per pixel
|
||||
int32_t format = read32(client);
|
||||
int32_t bytes_read = 7 * 4 + 3 * 2; // read so far
|
||||
(void) creatorBytes;
|
||||
if ((planes == 1) && ((format == 0) || (format == 3))) // uncompressed is handled, 565 also
|
||||
{
|
||||
Serial.print("File size: "); Serial.println(fileSize);
|
||||
Serial.print("Image Offset: "); Serial.println(imageOffset);
|
||||
Serial.print("Header size: "); Serial.println(headerSize);
|
||||
Serial.print("Bit Depth: "); Serial.println(depth);
|
||||
Serial.print("Image size: ");
|
||||
Serial.print(width);
|
||||
Serial.print('x');
|
||||
Serial.println(height);
|
||||
// BMP rows are padded (if needed) to 4-byte boundary
|
||||
uint32_t rowSize = (width * depth / 8 + 3) & ~3;
|
||||
if (depth < 8) rowSize = ((width * depth + 8 - depth) / 8 + 3) & ~3;
|
||||
if (height < 0)
|
||||
{
|
||||
height = -height;
|
||||
flip = false;
|
||||
}
|
||||
uint16_t w = width;
|
||||
uint16_t h = height;
|
||||
if ((x + w - 1) >= display.width()) w = display.width() - x;
|
||||
if ((y + h - 1) >= display.height()) h = display.height() - y;
|
||||
valid = true;
|
||||
uint8_t bitmask = 0xFF;
|
||||
uint8_t bitshift = 8 - depth;
|
||||
uint16_t red, green, blue;
|
||||
bool whitish = false;
|
||||
bool colored = false;
|
||||
if (depth == 1) with_color = false;
|
||||
if (depth <= 8)
|
||||
{
|
||||
if (depth < 8) bitmask >>= depth;
|
||||
//bytes_read += skip(client, 54 - bytes_read); //palette is always @ 54
|
||||
bytes_read += skip(client, imageOffset - (4 << depth) - bytes_read); // 54 for regular, diff for colorsimportant
|
||||
for (uint16_t pn = 0; pn < (1 << depth); pn++)
|
||||
{
|
||||
blue = client.read();
|
||||
green = client.read();
|
||||
red = client.read();
|
||||
client.read();
|
||||
bytes_read += 4;
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
if (0 == pn % 8) mono_palette_buffer[pn / 8] = 0;
|
||||
mono_palette_buffer[pn / 8] |= whitish << pn % 8;
|
||||
if (0 == pn % 8) color_palette_buffer[pn / 8] = 0;
|
||||
color_palette_buffer[pn / 8] |= colored << pn % 8;
|
||||
//Serial.print("0x00"); Serial.print(red, HEX); Serial.print(green, HEX); Serial.print(blue, HEX);
|
||||
//Serial.print(" : "); Serial.print(whitish); Serial.print(", "); Serial.println(colored);
|
||||
}
|
||||
}
|
||||
display.fillScreen(GxEPD_WHITE);
|
||||
uint32_t rowPosition = flip ? imageOffset + (height - h) * rowSize : imageOffset;
|
||||
//Serial.print("skip "); Serial.println(rowPosition - bytes_read);
|
||||
bytes_read += skip(client, rowPosition - bytes_read);
|
||||
for (uint16_t row = 0; row < h; row++, rowPosition += rowSize) // for each line
|
||||
{
|
||||
if (!connection_ok || !(client.connected() || client.available())) break;
|
||||
delay(1); // yield() to avoid WDT
|
||||
uint32_t in_remain = rowSize;
|
||||
uint32_t in_idx = 0;
|
||||
uint32_t in_bytes = 0;
|
||||
uint8_t in_byte = 0; // for depth <= 8
|
||||
uint8_t in_bits = 0; // for depth <= 8
|
||||
uint16_t color = GxEPD_WHITE;
|
||||
for (uint16_t col = 0; col < w; col++) // for each pixel
|
||||
{
|
||||
yield();
|
||||
if (!connection_ok || !(client.connected() || client.available())) break;
|
||||
// Time to read more pixel data?
|
||||
if (in_idx >= in_bytes) // ok, exact match for 24bit also (size IS multiple of 3)
|
||||
{
|
||||
uint32_t get = in_remain > sizeof(input_buffer) ? sizeof(input_buffer) : in_remain;
|
||||
uint32_t got = read8n(client, input_buffer, get);
|
||||
while ((got < get) && connection_ok)
|
||||
{
|
||||
//Serial.print("got "); Serial.print(got); Serial.print(" < "); Serial.print(get); Serial.print(" @ "); Serial.println(bytes_read);
|
||||
uint32_t gotmore = read8n(client, input_buffer + got, get - got);
|
||||
got += gotmore;
|
||||
connection_ok = gotmore > 0;
|
||||
}
|
||||
in_bytes = got;
|
||||
in_remain -= got;
|
||||
bytes_read += got;
|
||||
}
|
||||
if (!connection_ok)
|
||||
{
|
||||
Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!");
|
||||
break;
|
||||
}
|
||||
switch (depth)
|
||||
{
|
||||
case 24:
|
||||
blue = input_buffer[in_idx++];
|
||||
green = input_buffer[in_idx++];
|
||||
red = input_buffer[in_idx++];
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
break;
|
||||
case 16:
|
||||
{
|
||||
uint8_t lsb = input_buffer[in_idx++];
|
||||
uint8_t msb = input_buffer[in_idx++];
|
||||
if (format == 0) // 555
|
||||
{
|
||||
blue = (lsb & 0x1F) << 3;
|
||||
green = ((msb & 0x03) << 6) | ((lsb & 0xE0) >> 2);
|
||||
red = (msb & 0x7C) << 1;
|
||||
}
|
||||
else // 565
|
||||
{
|
||||
blue = (lsb & 0x1F) << 3;
|
||||
green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3);
|
||||
red = (msb & 0xF8);
|
||||
}
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case 4:
|
||||
case 8:
|
||||
{
|
||||
if (0 == in_bits)
|
||||
{
|
||||
in_byte = input_buffer[in_idx++];
|
||||
in_bits = 8;
|
||||
}
|
||||
uint16_t pn = (in_byte >> bitshift) & bitmask;
|
||||
whitish = mono_palette_buffer[pn / 8] & (0x1 << pn % 8);
|
||||
colored = color_palette_buffer[pn / 8] & (0x1 << pn % 8);
|
||||
in_byte <<= depth;
|
||||
in_bits -= depth;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (whitish)
|
||||
{
|
||||
color = GxEPD_WHITE;
|
||||
}
|
||||
else if (colored && with_color)
|
||||
{
|
||||
color = GxEPD_RED;
|
||||
}
|
||||
else
|
||||
{
|
||||
color = GxEPD_BLACK;
|
||||
}
|
||||
uint16_t yrow = y + (flip ? h - row - 1 : row);
|
||||
display.drawPixel(x + col, yrow, color);
|
||||
} // end pixel
|
||||
} // end line
|
||||
}
|
||||
Serial.print("bytes read "); Serial.println(bytes_read);
|
||||
}
|
||||
Serial.print("loaded in "); Serial.print(millis() - startTime); Serial.println(" ms");
|
||||
if (!valid)
|
||||
{
|
||||
Serial.println("bitmap format not handled.");
|
||||
}
|
||||
}
|
||||
|
||||
void showBitmapFrom_HTTP(const char* host, const char* path, const char* filename, int16_t x, int16_t y, bool with_color)
|
||||
{
|
||||
Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\"");
|
||||
drawBitmapFrom_HTTP_ToBuffer(host, path, filename, x, y, with_color);
|
||||
display.update();
|
||||
}
|
||||
|
||||
void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const char* filename, const char* fingerprint, int16_t x, int16_t y, bool with_color, const char* certificate)
|
||||
{
|
||||
// Use WiFiClientSecure class to create TLS connection
|
||||
#if USE_BearSSL
|
||||
BearSSL::WiFiClientSecure client;
|
||||
#else
|
||||
WiFiClientSecure client;
|
||||
#endif
|
||||
bool connection_ok = false;
|
||||
bool valid = false; // valid format to be handled
|
||||
bool flip = true; // bitmap is stored bottom-to-top
|
||||
uint32_t startTime = millis();
|
||||
if ((x >= display.width()) || (y >= display.height())) return;
|
||||
display.fillScreen(GxEPD_WHITE);
|
||||
Serial.print("connecting to "); Serial.println(host);
|
||||
#if defined (ESP8266)
|
||||
client.setBufferSizes(4096, 4096); // doesn't help
|
||||
if (fingerprint) client.setFingerprint(fingerprint);
|
||||
#elif defined (ESP32)
|
||||
if (certificate) client.setCACert(certificate);
|
||||
#endif
|
||||
if (!client.connect(host, httpsPort))
|
||||
{
|
||||
Serial.println("connection failed");
|
||||
return;
|
||||
}
|
||||
Serial.print("requesting URL: ");
|
||||
Serial.println(String("https://") + host + path + filename);
|
||||
client.print(String("GET ") + path + filename + " HTTP/1.1\r\n" +
|
||||
"Host: " + host + "\r\n" +
|
||||
"User-Agent: GxEPD_WiFi_Example\r\n" +
|
||||
"Connection: close\r\n\r\n");
|
||||
Serial.println("request sent");
|
||||
while (client.connected())
|
||||
{
|
||||
String line = client.readStringUntil('\n');
|
||||
if (!connection_ok)
|
||||
{
|
||||
connection_ok = line.startsWith("HTTP/1.1 200 OK");
|
||||
if (connection_ok) Serial.println(line);
|
||||
//if (!connection_ok) Serial.println(line);
|
||||
}
|
||||
if (!connection_ok) Serial.println(line);
|
||||
//Serial.println(line);
|
||||
if (line == "\r")
|
||||
{
|
||||
Serial.println("headers received");
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!connection_ok) return;
|
||||
// Parse BMP header
|
||||
if (read16(client) == 0x4D42) // BMP signature
|
||||
{
|
||||
int32_t fileSize = read32(client);
|
||||
int32_t creatorBytes = read32(client);
|
||||
int32_t imageOffset = read32(client); // Start of image data
|
||||
int32_t headerSize = read32(client);
|
||||
int32_t width = read32(client);
|
||||
int32_t height = read32(client);
|
||||
uint16_t planes = read16(client);
|
||||
uint16_t depth = read16(client); // bits per pixel
|
||||
int32_t format = read32(client);
|
||||
int32_t bytes_read = 7 * 4 + 3 * 2; // read so far
|
||||
(void) creatorBytes;
|
||||
if ((planes == 1) && ((format == 0) || (format == 3))) // uncompressed is handled, 565 also
|
||||
{
|
||||
Serial.print("File size: "); Serial.println(fileSize);
|
||||
Serial.print("Image Offset: "); Serial.println(imageOffset);
|
||||
Serial.print("Header size: "); Serial.println(headerSize);
|
||||
Serial.print("Bit Depth: "); Serial.println(depth);
|
||||
Serial.print("Image size: ");
|
||||
Serial.print(width);
|
||||
Serial.print('x');
|
||||
Serial.println(height);
|
||||
// BMP rows are padded (if needed) to 4-byte boundary
|
||||
uint32_t rowSize = (width * depth / 8 + 3) & ~3;
|
||||
if (depth < 8) rowSize = ((width * depth + 8 - depth) / 8 + 3) & ~3;
|
||||
if (height < 0)
|
||||
{
|
||||
height = -height;
|
||||
flip = false;
|
||||
}
|
||||
uint16_t w = width;
|
||||
uint16_t h = height;
|
||||
if ((x + w - 1) >= display.width()) w = display.width() - x;
|
||||
if ((y + h - 1) >= display.height()) h = display.height() - y;
|
||||
valid = true;
|
||||
uint8_t bitmask = 0xFF;
|
||||
uint8_t bitshift = 8 - depth;
|
||||
uint16_t red, green, blue;
|
||||
bool whitish = false;
|
||||
bool colored = false;
|
||||
if (depth == 1) with_color = false;
|
||||
if (depth <= 8)
|
||||
{
|
||||
if (depth < 8) bitmask >>= depth;
|
||||
//bytes_read += skip(client, 54 - bytes_read); //palette is always @ 54
|
||||
bytes_read += skip(client, imageOffset - (4 << depth) - bytes_read); // 54 for regular, diff for colorsimportant
|
||||
for (uint16_t pn = 0; pn < (1 << depth); pn++)
|
||||
{
|
||||
blue = client.read();
|
||||
green = client.read();
|
||||
red = client.read();
|
||||
client.read();
|
||||
bytes_read += 4;
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
if (0 == pn % 8) mono_palette_buffer[pn / 8] = 0;
|
||||
mono_palette_buffer[pn / 8] |= whitish << pn % 8;
|
||||
if (0 == pn % 8) color_palette_buffer[pn / 8] = 0;
|
||||
color_palette_buffer[pn / 8] |= colored << pn % 8;
|
||||
//Serial.print("0x00"); Serial.print(red, HEX); Serial.print(green, HEX); Serial.print(blue, HEX);
|
||||
//Serial.print(" : "); Serial.print(whitish); Serial.print(", "); Serial.println(colored);
|
||||
}
|
||||
}
|
||||
display.fillScreen(GxEPD_WHITE);
|
||||
uint32_t rowPosition = flip ? imageOffset + (height - h) * rowSize : imageOffset;
|
||||
//Serial.print("skip "); Serial.println(rowPosition - bytes_read);
|
||||
bytes_read += skip(client, rowPosition - bytes_read);
|
||||
for (uint16_t row = 0; row < h; row++, rowPosition += rowSize) // for each line
|
||||
{
|
||||
if (!connection_ok || !(client.connected() || client.available())) break;
|
||||
delay(1); // yield() to avoid WDT
|
||||
uint32_t in_remain = rowSize;
|
||||
uint32_t in_idx = 0;
|
||||
uint32_t in_bytes = 0;
|
||||
uint8_t in_byte = 0; // for depth <= 8
|
||||
uint8_t in_bits = 0; // for depth <= 8
|
||||
uint16_t color = GxEPD_WHITE;
|
||||
for (uint16_t col = 0; col < w; col++) // for each pixel
|
||||
{
|
||||
yield();
|
||||
if (!connection_ok || !(client.connected() || client.available())) break;
|
||||
// Time to read more pixel data?
|
||||
if (in_idx >= in_bytes) // ok, exact match for 24bit also (size IS multiple of 3)
|
||||
{
|
||||
uint32_t get = in_remain > sizeof(input_buffer) ? sizeof(input_buffer) : in_remain;
|
||||
uint32_t got = read8n(client, input_buffer, get);
|
||||
while ((got < get) && connection_ok)
|
||||
{
|
||||
//Serial.print("got "); Serial.print(got); Serial.print(" < "); Serial.print(get); Serial.print(" @ "); Serial.println(bytes_read);
|
||||
uint32_t gotmore = read8n(client, input_buffer + got, get - got);
|
||||
got += gotmore;
|
||||
connection_ok = gotmore > 0;
|
||||
}
|
||||
in_bytes = got;
|
||||
in_remain -= got;
|
||||
bytes_read += got;
|
||||
}
|
||||
if (!connection_ok)
|
||||
{
|
||||
Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!");
|
||||
break;
|
||||
}
|
||||
switch (depth)
|
||||
{
|
||||
case 24:
|
||||
blue = input_buffer[in_idx++];
|
||||
green = input_buffer[in_idx++];
|
||||
red = input_buffer[in_idx++];
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
break;
|
||||
case 16:
|
||||
{
|
||||
uint8_t lsb = input_buffer[in_idx++];
|
||||
uint8_t msb = input_buffer[in_idx++];
|
||||
if (format == 0) // 555
|
||||
{
|
||||
blue = (lsb & 0x1F) << 3;
|
||||
green = ((msb & 0x03) << 6) | ((lsb & 0xE0) >> 2);
|
||||
red = (msb & 0x7C) << 1;
|
||||
}
|
||||
else // 565
|
||||
{
|
||||
blue = (lsb & 0x1F) << 3;
|
||||
green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3);
|
||||
red = (msb & 0xF8);
|
||||
}
|
||||
whitish = with_color ? ((red > 0x80) && (green > 0x80) && (blue > 0x80)) : ((red + green + blue) > 3 * 0x80); // whitish
|
||||
colored = (red > 0xF0) || ((green > 0xF0) && (blue > 0xF0)); // reddish or yellowish?
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
case 4:
|
||||
case 8:
|
||||
{
|
||||
if (0 == in_bits)
|
||||
{
|
||||
in_byte = input_buffer[in_idx++];
|
||||
in_bits = 8;
|
||||
}
|
||||
uint16_t pn = (in_byte >> bitshift) & bitmask;
|
||||
whitish = mono_palette_buffer[pn / 8] & (0x1 << pn % 8);
|
||||
colored = color_palette_buffer[pn / 8] & (0x1 << pn % 8);
|
||||
in_byte <<= depth;
|
||||
in_bits -= depth;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (whitish)
|
||||
{
|
||||
color = GxEPD_WHITE;
|
||||
}
|
||||
else if (colored && with_color)
|
||||
{
|
||||
color = GxEPD_RED;
|
||||
}
|
||||
else
|
||||
{
|
||||
color = GxEPD_BLACK;
|
||||
}
|
||||
uint16_t yrow = y + (flip ? h - row - 1 : row);
|
||||
display.drawPixel(x + col, yrow, color);
|
||||
} // end pixel
|
||||
} // end line
|
||||
}
|
||||
Serial.print("bytes read "); Serial.println(bytes_read);
|
||||
}
|
||||
Serial.print("loaded in "); Serial.print(millis() - startTime); Serial.println(" ms");
|
||||
if (!valid)
|
||||
{
|
||||
Serial.println("bitmap format not handled.");
|
||||
}
|
||||
client.stop();
|
||||
}
|
||||
|
||||
void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filename, const char* fingerprint, int16_t x, int16_t y, bool with_color, const char* certificate)
|
||||
{
|
||||
Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\"");
|
||||
drawBitmapFrom_HTTPS_ToBuffer(host, path, filename, fingerprint, x, y, with_color, certificate);
|
||||
display.update();
|
||||
}
|
||||
|
||||
uint16_t read16(WiFiClient& client)
|
||||
{
|
||||
// BMP data is stored little-endian, same as Arduino.
|
||||
uint16_t result;
|
||||
((uint8_t *)&result)[0] = client.read(); // LSB
|
||||
((uint8_t *)&result)[1] = client.read(); // MSB
|
||||
return result;
|
||||
}
|
||||
|
||||
int32_t read32(WiFiClient& client)
|
||||
{
|
||||
// BMP data is stored little-endian, same as Arduino.
|
||||
int32_t result;
|
||||
((uint8_t *)&result)[0] = client.read(); // LSB
|
||||
((uint8_t *)&result)[1] = client.read();
|
||||
((uint8_t *)&result)[2] = client.read();
|
||||
((uint8_t *)&result)[3] = client.read(); // MSB
|
||||
return result;
|
||||
}
|
||||
|
||||
#if USE_BearSSL
|
||||
|
||||
uint32_t skip(BearSSL::WiFiClientSecure& client, int32_t bytes)
|
||||
{
|
||||
int32_t remain = bytes;
|
||||
uint32_t start = millis();
|
||||
while (client.connected() && (remain > 0))
|
||||
{
|
||||
if (client.available())
|
||||
{
|
||||
int16_t v = client.read();
|
||||
remain--;
|
||||
}
|
||||
else delay(1);
|
||||
if (millis() - start > 2000) break; // don't hang forever
|
||||
}
|
||||
return bytes - remain;
|
||||
}
|
||||
|
||||
uint32_t read(BearSSL::WiFiClientSecure& client, uint8_t* buffer, int32_t bytes)
|
||||
{
|
||||
int32_t remain = bytes;
|
||||
uint32_t start = millis();
|
||||
while (client.connected() && (remain > 0))
|
||||
{
|
||||
if (client.available())
|
||||
{
|
||||
int16_t v = client.read();
|
||||
*buffer++ = uint8_t(v);
|
||||
remain--;
|
||||
}
|
||||
else delay(1);
|
||||
if (millis() - start > 2000) break; // don't hang forever
|
||||
}
|
||||
return bytes - remain;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
uint32_t skip(WiFiClient& client, int32_t bytes)
|
||||
{
|
||||
int32_t remain = bytes;
|
||||
uint32_t start = millis();
|
||||
while ((client.connected() || client.available()) && (remain > 0))
|
||||
{
|
||||
if (client.available())
|
||||
{
|
||||
int16_t v = client.read();
|
||||
(void) v;
|
||||
remain--;
|
||||
}
|
||||
else delay(1);
|
||||
if (millis() - start > 2000) break; // don't hang forever
|
||||
}
|
||||
return bytes - remain;
|
||||
}
|
||||
|
||||
uint32_t read8n(WiFiClient& client, uint8_t* buffer, int32_t bytes)
|
||||
{
|
||||
int32_t remain = bytes;
|
||||
uint32_t start = millis();
|
||||
while ((client.connected() || client.available()) && (remain > 0))
|
||||
{
|
||||
if (client.available())
|
||||
{
|
||||
int16_t v = client.read();
|
||||
*buffer++ = uint8_t(v);
|
||||
remain--;
|
||||
}
|
||||
else delay(1);
|
||||
if (millis() - start > 2000) break; // don't hang forever
|
||||
}
|
||||
return bytes - remain;
|
||||
}
|
||||
Reference in New Issue
Block a user