diff --git a/README.md b/README.md index ee9edad..999b777 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,9 @@ - But only few panels at any time, and only panels from known sources. - Adding support will take as much time as needed. -### Version 1.6.0 +### Version 1.6.1 +- fixed and updated GxEPD2_WiFi_Example +#### Version 1.6.0 - updated support for GDEY029T94: fixed a partial refresh issue - updated support for GDEY042T81: fixed fast full refresh for 2024 panel version - updated support for GDEP073E01: fixed color mapping for its native color values diff --git a/examples/GxEPD2_Spiffs_Loader/GxEPD2_Spiffs_Loader.ino b/examples/GxEPD2_Spiffs_Loader/GxEPD2_Spiffs_Loader.ino index c4c6020..07df4aa 100644 --- a/examples/GxEPD2_Spiffs_Loader/GxEPD2_Spiffs_Loader.ino +++ b/examples/GxEPD2_Spiffs_Loader/GxEPD2_Spiffs_Loader.ino @@ -35,21 +35,20 @@ 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 // note: the certificates have been moved to a separate header file, as R"CERT( destroys IDE Auto Format capability #include "GxEPD2_github_raw_certs.h" -const char* certificate_rawcontent = cert_DigiCert_TLS_RSA_SHA256_2020_CA1; // ok, should work until 2031-04-13 23:59:59 +const char* certificate_rawcontent = github_io_pem; // ok, should work until Fri, 14 Mar 2025 23:59:59 GMT const char* host_rawcontent = "raw.githubusercontent.com"; const char* path_rawcontent = "/ZinggJM/GxEPD2/master/extras/bitmaps/"; +const char* path_workcontent = "/ZinggJM/GxEPD2/work_in_progress/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/"; +const char* fp_rawcontent = "97:D8:C5:70:0F:12:24:6C:88:BC:FA:06:7E:8C:A7:4D:A8:62:67:28"; // SHA-1 as of 12.04.2024 void setup() { @@ -150,6 +149,7 @@ void downloadBitmaps_other() void downloadBitmaps_test() { + //downloadFile_HTTPS(host_rawcontent, path_workcontent, "z0gs/screenshot.bmp", fp_rawcontent, "screenshot.bmp"); return; downloadFile_HTTPS(host_rawcontent, path_rawcontent, "output5.bmp", fp_rawcontent, "output5.bmp"); downloadFile_HTTPS(host_rawcontent, path_rawcontent, "output6.bmp", fp_rawcontent, "output6.bmp"); downloadFile_HTTPS(host_rawcontent, path_rawcontent, "tractor_1.bmp", fp_rawcontent, "tractor_1.bmp"); @@ -289,6 +289,8 @@ void downloadFile_HTTPS(const char* host, const char* path, const char* filename Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\""); Serial.print("connecting to "); Serial.println(host); #if defined (ESP8266) + client.setBufferSizes(4096, 4096); // required + //client.setBufferSizes(8192, 4096); // may help for some sites if (certificate) client.setTrustAnchors(&cert); else if (fingerprint) client.setFingerprint(fingerprint); else client.setInsecure(); diff --git a/examples/GxEPD2_Spiffs_Loader/GxEPD2_github_raw_certs.h b/examples/GxEPD2_Spiffs_Loader/GxEPD2_github_raw_certs.h index 2657719..75ad698 100644 --- a/examples/GxEPD2_Spiffs_Loader/GxEPD2_github_raw_certs.h +++ b/examples/GxEPD2_Spiffs_Loader/GxEPD2_github_raw_certs.h @@ -1,3 +1,44 @@ +// 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 (cert), +// Opened the .pem file and copied the pem into R"CERT(...)CERT"; strings. +// for https://raw.githubusercontent.com the pem works on ESP8266 and ESP32, if time is set from ntp. +// but using a root certificate would preferred, as its validity may be longer. But this failed now. + +const char github_io_pem [] PROGMEM = R"CERT( +-----BEGIN CERTIFICATE----- +MIIEyDCCA7CgAwIBAgIQDPW9BitWAvR6uFAsI8zwZjANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0yMTAzMzAwMDAwMDBaFw0zMTAzMjkyMzU5NTlaMFkxCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2Jh +bCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAMz3EGJPprtjb+2QUlbFbSd7ehJWivH0+dbn4Y+9lavyYEEV +cNsSAPonCrVXOFt9slGTcZUOakGUWzUb+nv6u8W+JDD+Vu/E832X4xT1FE3LpxDy +FuqrIvAxIhFhaZAmunjZlx/jfWardUSVc8is/+9dCopZQ+GssjoP80j812s3wWPc +3kbW20X+fSP9kOhRBx5Ro1/tSUZUfyyIxfQTnJcVPAPooTncaQwywa8WV0yUR0J8 +osicfebUTVSvQpmowQTCd5zWSOTOEeAqgJnwQ3DPP3Zr0UxJqyRewg2C/Uaoq2yT +zGJSQnWS+Jr6Xl6ysGHlHx+5fwmY6D36g39HaaECAwEAAaOCAYIwggF+MBIGA1Ud +EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFHSFgMBmx9833s+9KTeqAx2+7c0XMB8G +A1UdIwQYMBaAFE4iVCAYlebjbuYP+vq5Eu0GF485MA4GA1UdDwEB/wQEAwIBhjAd +BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYIKwYBBQUHAQEEajBoMCQG +CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKG +NGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RH +Mi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQuY29t +L0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA9BgNVHSAENjA0MAsGCWCGSAGG/WwC +ATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgGBmeBDAECAzANBgkqhkiG +9w0BAQsFAAOCAQEAkPFwyyiXaZd8dP3A+iZ7U6utzWX9upwGnIrXWkOH7U1MVl+t +wcW1BSAuWdH/SvWgKtiwla3JLko716f2b4gp/DA/JIS7w7d7kwcsr4drdjPtAFVS +slme5LnQ89/nD/7d+MS5EHKBCQRfz5eeLjJ1js+aWNJXMX43AYGyZm0pGrFmCW3R +bpD0ufovARTFXFZkAdl9h6g4U5+LXUZtXMYnhIHUfoyMo5tS58aI7Dd8KvvwVVo4 +chDYABPPTHPbqjc1qCmBaZx2vN4Ye5DUys/vZwP9BFohFrH/6j/f3IL16/RZkiMN +JCqVJUzKoZHm1Lesh3Sz8W2jmdv51b2EQJ8HmA== +-----END CERTIFICATE----- +)CERT"; + +// 12:04.2024: the following no longer works, needs further investigation +// ********************************************************************** + // http://cacerts.digicert.com/DigiCertTLSRSASHA2562020CA1-1.crt // CN: DigiCert TLS RSA SHA256 2020 CA1 => name: DigiCert_TLS_RSA_SHA256_2020_CA1 // not valid before: 2021-04-14 00:00:00 @@ -42,101 +83,102 @@ A7sKPPcw7+uvTPyLNhBzPvOk // https://raw.githubusercontent.com // issued by DigiCert Inc : DigiCert TLS RSA SHA256 2020 CA1 -// not valid before: Fri, 18 Mar 2022 00:00:00 GMT -// not valid after: Tue, 21 Mar 2023 23:59:59 GMT +// not valid before: Fri, 15 Mar 2024 00:00:00 GMT +// not valid after: Fri, 14 Mar 2025 23:59:59 GMT const char github_io_chain_pem_first [] PROGMEM = R"CERT( -----BEGIN CERTIFICATE----- -MIIHEzCCBfugAwIBAgIQC44ztdGGen6l0VAu1+MWiTANBgkqhkiG9w0BAQsFADBP -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBE -aWdpQ2VydCBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTAeFw0yMjAzMTgwMDAwMDBa -Fw0yMzAzMjEyMzU5NTlaMGcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y -bmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRUwEwYDVQQKEwxHaXRIdWIsIElu -Yy4xFDASBgNVBAMMCyouZ2l0aHViLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAxgDppBtMFl4zNvBbWAdr21IwcskxdMU/SkxYK/ZAXFrRIPcoZR15 -5DCrzTevHMUNLhCJqL8mMFidKOz4cZjhPn5sxjUCe/sPNvaiXm8cGUwzFlAYK1MY -dM+wepJKcT/qK8RegSIEbk/6qU5Bmh558RSCGuIJj3E85C0fRVdA+zXHP5GkuuB4 -VEXYzM2oz5KmgXIdBYFydjyK9LNO5nc/Z2Bc7JppCripRHfht3OR1Bf4JFYBuEJE -vE4E1FGxwhZzqA/F6ZTRNb+qhQgRfY3HNdbhv5/HRRQZY4H5V6F9MsO0RAHrz30A -QtB10paU9KOvxZqA/CEJTAdiYDQKAADitwIDAQABo4ID0TCCA80wHwYDVR0jBBgw -FoAUt2ui6qiqhIx56rTaD5iyxZV2ufQwHQYDVR0OBBYEFNPlHIi+YXl95r64oS2D -0v2+1mFkMHsGA1UdEQR0MHKCCyouZ2l0aHViLmlvggpnaXRodWIuY29tggwqLmdp -dGh1Yi5jb22CDnd3dy5naXRodWIuY29tgglnaXRodWIuaW+CFWdpdGh1YnVzZXJj -b250ZW50LmNvbYIXKi5naXRodWJ1c2VyY29udGVudC5jb20wDgYDVR0PAQH/BAQD -AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBjwYDVR0fBIGHMIGE -MECgPqA8hjpodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FT -SEEyNTYyMDIwQ0ExLTQuY3JsMECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2VydC5j -b20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTQuY3JsMD4GA1UdIAQ3MDUw -MwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29t -L0NQUzB/BggrBgEFBQcBAQRzMHEwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRp -Z2ljZXJ0LmNvbTBJBggrBgEFBQcwAoY9aHR0cDovL2NhY2VydHMuZGlnaWNlcnQu -Y29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS0xLmNydDAJBgNVHRMEAjAA -MIIBfwYKKwYBBAHWeQIEAgSCAW8EggFrAWkAdgDoPtDaPvUGNTLnVyi8iWvJA9PL -0RFr7Otp4Xd9bQa9bgAAAX+dgO+dAAAEAwBHMEUCIQDOV8Qe7mebG+hhf+MfzEEF -2i0lNIO83vUTxkMREz/eMwIgKp3ZLFVMP2hz+1DAYPhmKvdWT3kTKWeeZxSHUEtm -f88AdgA1zxkbv7FsV78PrUxtQsu7ticgJlHqP+Eq76gDwzvWTAAAAX+dgO/rAAAE -AwBHMEUCIDAKos+w1Y1esfHWzcjREKA0m/fEoyMxA8Cj5EZETZziAiEAkxIcc6ZB -3d7pHTI2w1yuRp1s6uciDTU/ICZ5yEvuFtwAdwC3Pvsk35xNunXyOcW6WPRsXfxC -z3qfNcSeHQmBJe20mQAAAX+dgO/PAAAEAwBIMEYCIQDDYK04bMarexB4cqaAhnUF -FItaejcjp7CeW+YtF70CzAIhAK5Fy7ARpPdjNoaSWuG1NzNZbj6DPfwdsFOZnoBq -4GLhMA0GCSqGSIb3DQEBCwUAA4IBAQBokieSf5eLa7o62sPf9ihHuvIPoligvH1r -gxFf6+kgsz+EwtF80Tb0ZR2DC7O2HSi0JGiihPgKO/3bXHZUc9cc4NkL7J842yFI -rRwPHABMq2nLq7LCuGdJn+2tG76DAOXCtHMQ6XfuAq1FoPbtxXdWzynOJdDelPC6 -Qv3v3sMH6gJML1vW3OmeSUIncu686uDTs6E95BIuZ8eOjBjxZ7GfQv54RQU6oiMf -bYVRSYaNfnS0VkPlwcR9Ubhx9wEuG4GuDus7OWItwFqm2c3peKQQK8+2CDMUHDUC -QafDHvXcWeRdqQouCQC1tDlRAzPLKTcLD6EVltnPR5HQITRvHVgm +MIIHOTCCBiGgAwIBAgIQBj1JF0BNOeUTyz/uzRsuGzANBgkqhkiG9w0BAQsFADBZ +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypE +aWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjQw +MzE1MDAwMDAwWhcNMjUwMzE0MjM1OTU5WjBnMQswCQYDVQQGEwJVUzETMBEGA1UE +CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEVMBMGA1UEChMM +R2l0SHViLCBJbmMuMRQwEgYDVQQDDAsqLmdpdGh1Yi5pbzCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAK0rFKU6TEGvuLCY3ZOuXlG+3jerD6EP1gc1qe35 +g68FqyGuVPOUddYNZiymjYMZxywoNp3qxlbFFBTf9etsayavT+uW+2UMjqCotAdK +KicBEspuExoACFuNgTi7sSUT7A55+k4/+5O+VtpaxQ5dmQk7HxcqvMYx5owBU+fB +wYDD+hXeg3YvxLZNeIlN8OlqWL8w9HbG+3ccegVEjOJQbkrcrW7IQMq2Uk92XjxI +PmMVIvaefqcC1poGYvS4VvEh3x64vJK1hEM4YLMKBaE/hqFtcMozi+H/8JqTCfzP +Qhnu21HIop9rSucxxnZbe9AeHz2LERpUTf3rjgOMg9PB1RUCAwEAAaOCA+0wggPp +MB8GA1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1UdDgQWBBTob1fr +hlGY65+lvlPa25SsKC777TB7BgNVHREEdDByggsqLmdpdGh1Yi5pb4IJZ2l0aHVi +LmlvghVnaXRodWJ1c2VyY29udGVudC5jb22CDnd3dy5naXRodWIuY29tggwqLmdp +dGh1Yi5jb22CFyouZ2l0aHVidXNlcmNvbnRlbnQuY29tggpnaXRodWIuY29tMD4G +A1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGln +aWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH +AwEGCCsGAQUFBwMCMIGfBgNVHR8EgZcwgZQwSKBGoESGQmh0dHA6Ly9jcmwzLmRp +Z2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS0x +LmNybDBIoEagRIZCaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xv +YmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3JsMIGHBggrBgEFBQcBAQR7MHkw +JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBRBggrBgEFBQcw +AoZFaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsRzJU +TFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3J0MAwGA1UdEwEB/wQCMAAwggF/BgorBgEE +AdZ5AgQCBIIBbwSCAWsBaQB2AE51oydcmhDDOFts1N8/Uusd8OCOG41pwLH6ZLFi +mjnfAAABjkN89oAAAAQDAEcwRQIgU/M527Wcx0KQ3II7kCuG5WMuOHRSxKkf1xAj +JuSkyPACIQCVX0uurcIA2Ug7ipNN2S1ZygukWqJCh7hjIH0XsrXh8QB2AH1ZHhLh +eCp7HGFnfF79+NCHXBSgTpWeuQMv2Q6MLnm4AAABjkN89oEAAAQDAEcwRQIgCxpL +BDak+TWKarrCHlZn4DlqwEfAN3lvlgSo21HQuU8CIQDicrb72c0lA2suMWPWT92P +FLaRvFrFn9HVzI6Vh50YZgB3AObSMWNAd4zBEEEG13G5zsHSQPaWhIb7uocyHf0e +N45QAAABjkN89pQAAAQDAEgwRgIhAPJQX4QArFCjM0sKKzsWLmqmmU8lMhKEYR2T +ges1AQyQAiEA2Y3VhP5RG+dapcbwYgVbrTlgWzO7KE/lg1x11CVcz3QwDQYJKoZI +hvcNAQELBQADggEBAHKlvzObJBxxgyLaUNCEFf37mNFsUtXmaWvkmcfIt9V+TZ7Q +mtvjx5bsd5lqAflp/eqk4+JYpnYcKWrZfM/vMdxPQTeh/VQWewY/hYn6X/V1s2JI +MtjqEkW4aotVdWjHVvsx4rAjz5vtub/wVYgtrU8jusH3TVpT9/0AoFhKE5m2IS7M +Ig7wKR+DDxoNj4fFFluxteVNgbtwuJcb23NkBQqfHXCvQWqxXZZA4Nwl/WoGPoGG +dW5qVOc3BlhtITW53ASyhvKC7HArhj7LwQH8C/dRgn1agIHP9vVJ1NaZnPXhK98T +ohv++OO0E/F/bVGNWVnLBQ4v5PjQzRQUTGvM2mU= -----END CERTIFICATE----- )CERT"; const char github_io_chain_pem_second [] PROGMEM = R"CERT( -----BEGIN CERTIFICATE----- -MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh +MIIEyDCCA7CgAwIBAgIQDPW9BitWAvR6uFAsI8zwZjANBgkqhkiG9w0BAQsFADBh 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 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0yMTAzMzAwMDAwMDBaFw0zMTAzMjkyMzU5NTlaMFkxCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2Jh +bCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAMz3EGJPprtjb+2QUlbFbSd7ehJWivH0+dbn4Y+9lavyYEEV +cNsSAPonCrVXOFt9slGTcZUOakGUWzUb+nv6u8W+JDD+Vu/E832X4xT1FE3LpxDy +FuqrIvAxIhFhaZAmunjZlx/jfWardUSVc8is/+9dCopZQ+GssjoP80j812s3wWPc +3kbW20X+fSP9kOhRBx5Ro1/tSUZUfyyIxfQTnJcVPAPooTncaQwywa8WV0yUR0J8 +osicfebUTVSvQpmowQTCd5zWSOTOEeAqgJnwQ3DPP3Zr0UxJqyRewg2C/Uaoq2yT +zGJSQnWS+Jr6Xl6ysGHlHx+5fwmY6D36g39HaaECAwEAAaOCAYIwggF+MBIGA1Ud +EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFHSFgMBmx9833s+9KTeqAx2+7c0XMB8G +A1UdIwQYMBaAFE4iVCAYlebjbuYP+vq5Eu0GF485MA4GA1UdDwEB/wQEAwIBhjAd +BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYIKwYBBQUHAQEEajBoMCQG +CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKG +NGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RH +Mi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQuY29t +L0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA9BgNVHSAENjA0MAsGCWCGSAGG/WwC +ATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgGBmeBDAECAzANBgkqhkiG +9w0BAQsFAAOCAQEAkPFwyyiXaZd8dP3A+iZ7U6utzWX9upwGnIrXWkOH7U1MVl+t +wcW1BSAuWdH/SvWgKtiwla3JLko716f2b4gp/DA/JIS7w7d7kwcsr4drdjPtAFVS +slme5LnQ89/nD/7d+MS5EHKBCQRfz5eeLjJ1js+aWNJXMX43AYGyZm0pGrFmCW3R +bpD0ufovARTFXFZkAdl9h6g4U5+LXUZtXMYnhIHUfoyMo5tS58aI7Dd8KvvwVVo4 +chDYABPPTHPbqjc1qCmBaZx2vN4Ye5DUys/vZwP9BFohFrH/6j/f3IL16/RZkiMN +JCqVJUzKoZHm1Lesh3Sz8W2jmdv51b2EQJ8HmA== -----END CERTIFICATE----- )CERT"; const char github_io_chain_pem_third [] PROGMEM = R"CERT( -----BEGIN CERTIFICATE----- -MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB -CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 -nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt -43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P -T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 -gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO -BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR -TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw -DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr -hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg -06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF -PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls -YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk -CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI +2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx +1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ +q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz +tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ +vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP +BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV +5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY +1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 +NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG +Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 +8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe +pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl +MrY= -----END CERTIFICATE----- )CERT"; diff --git a/examples/GxEPD2_WiFi_CertStore_Example/GxEPD2_WiFi_CertStore_Example.ino b/examples/GxEPD2_WiFi_CertStore_Example/GxEPD2_WiFi_CertStore_Example.ino index 3fc6b5a..1da1229 100644 --- a/examples/GxEPD2_WiFi_CertStore_Example/GxEPD2_WiFi_CertStore_Example.ino +++ b/examples/GxEPD2_WiFi_CertStore_Example/GxEPD2_WiFi_CertStore_Example.ino @@ -81,6 +81,7 @@ //#define GxEPD2_DRIVER_CLASS GxEPD2_290_BS // DEPG0290BS 128x296, SSD1680, (FPC-7519 rev.b) //#define GxEPD2_DRIVER_CLASS GxEPD2_290_M06 // GDEW029M06 128x296, UC8151D, (WFT0290CZ10) //#define GxEPD2_DRIVER_CLASS GxEPD2_290_GDEY029T94 // GDEY029T94 128x296, SSD1680, (FPC-A005 20.06.15) +//#define GxEPD2_DRIVER_CLASS GxEPD2_290_GDEY029T71H // GDEY029T71H 168x384, SSD1685, (FPC-H004 22.03.24) //#define GxEPD2_DRIVER_CLASS GxEPD2_310_GDEQ031T10 // GDEQ031T10 240x320, UC8253, (no inking, backside mark KEGMO 3100) //#define GxEPD2_DRIVER_CLASS GxEPD2_371 // GDEW0371W7 240x416, UC8171 (IL0324), (missing) //#define GxEPD2_DRIVER_CLASS GxEPD2_370_TC1 // ED037TC1 280x480, SSD1677, (ICA-FU-20 ichia 2029), Waveshare 3.7" @@ -90,6 +91,7 @@ //#define GxEPD2_DRIVER_CLASS GxEPD2_420_GYE042A87 // GYE042A87, 400x300, SSD1683 (HINK-E042-A07-FPC-A1) //#define GxEPD2_DRIVER_CLASS GxEPD2_420_SE0420NQ04 // SE0420NQ04, 400x300, UC8276C (OPM042A2_V1.0) //#define GxEPD2_DRIVER_CLASS GxEPD2_426_GDEQ0426T82 // GDEQ0426T82 480x800, SSD1677 (P426010-MF1-A) +//#define GxEPD2_DRIVER_CLASS GxEPD2_579_GDEY0579T93 // GDEY0579T93 792x272, SSD1683 (FPC-E004 22.04.13) //#define GxEPD2_DRIVER_CLASS GxEPD2_583 // GDEW0583T7 600x448, UC8159c (IL0371), (missing) //#define GxEPD2_DRIVER_CLASS GxEPD2_583_T8 // GDEW0583T8 648x480, EK79655 (GD7965), (WFT0583CZ61) //#define GxEPD2_DRIVER_CLASS GxEPD2_583_GDEQ0583T31 // GDEQ0583T31 648x480, UC8179, (P583010-MF1-B) @@ -97,6 +99,7 @@ //#define GxEPD2_DRIVER_CLASS GxEPD2_750_T7 // GDEW075T7 800x480, EK79655 (GD7965), (WFT0583CZ61) //#define GxEPD2_DRIVER_CLASS GxEPD2_750_GDEY075T7 // GDEY075T7 800x480, UC8179 (GD7965), (FPC-C001 20.08.20) //#define GxEPD2_DRIVER_CLASS GxEPD2_1020_GDEM102T91 // GDEM102T91 960x640, SSD1677, (FPC7705 REV.b) +//#define GxEPD2_DRIVER_CLASS GxEPD2_1085_GDEM1085T51 // GDEM1085T51 1360x480, JD79686AB, (FPC8617) *** needs CS2 *** //#define GxEPD2_DRIVER_CLASS GxEPD2_1160_T91 // GDEH116T91 960x640, SSD1677, (none or hidden) //#define GxEPD2_DRIVER_CLASS GxEPD2_1248 // GDEW1248T3 1304x984, UC8179, (WFT1248BZ23,WFT1248BZ24) //#define GxEPD2_DRIVER_CLASS GxEPD2_1330_GDEM133T91 // GDEM133T91 960x680, SSD1677, (FPC-7701 REV.B) @@ -113,6 +116,8 @@ //#define GxEPD2_DRIVER_CLASS GxEPD2_290_C90c // GDEM029C90 128x296, SSD1680, (FPC-7519 rev.b) //#define GxEPD2_DRIVER_CLASS GxEPD2_420c // GDEW042Z15 400x300, UC8176 (IL0398), (WFT0420CZ15) //#define GxEPD2_DRIVER_CLASS GxEPD2_420c_Z21 // GDEQ042Z21 400x300, UC8276, (hidden) +//#define GxEPD2_DRIVER_CLASS GxEPD2_420c_GDEY042Z98 // GDEY042Z98 400x300, SSD1683 (no inking) +//#define GxEPD2_DRIVER_CLASS GxEPD2_579c_GDEY0579Z93 // GDEY0579Z93 792x272, SSD1683 (FPC-E004 22.04.13) //#define GxEPD2_DRIVER_CLASS GxEPD2_583c // GDEW0583Z21 600x448, UC8159c (IL0371), (missing) //#define GxEPD2_DRIVER_CLASS GxEPD2_583c_Z83 // GDEW0583Z83 648x480, EK79655 (GD7965), (WFT0583CZ61) //#define GxEPD2_DRIVER_CLASS GxEPD2_583c_GDEQ0583Z31 // GDEQ0583Z31 648x480, UC8179C, @@ -123,15 +128,20 @@ //#define GxEPD2_DRIVER_CLASS GxEPD2_1248c // GDEY1248Z51 1304x984, UC8179, (WFT1248BZ23,WFT1248BZ24) //#define GxEPD2_DRIVER_CLASS GxEPD2_1330c_GDEM133Z91 // GDEM133Z91 960x680, SSD1677 (FPC-7701 REV.B) // 4-color e-paper +//#define GxEPD2_DRIVER_CLASS GxEPD2_213c_GDEY0213F51 // GDEY0213F51 122x250, JD79661 (FPC-A002 20.04.08) //#define GxEPD2_DRIVER_CLASS GxEPD2_266c_GDEY0266F51H // GDEY0266F51H 184x360, JD79667 (FPC-H006 22.04.02) //#define GxEPD2_DRIVER_CLASS GxEPD2_290c_GDEY029F51H // GDEY029F51H 168x384, JD79667 (FPC-H004 22.03.24) //#define GxEPD2_DRIVER_CLASS GxEPD2_300c // Waveshare 3.00" 4-color //#define GxEPD2_DRIVER_CLASS GxEPD2_420c_GDEY0420F51 // GDEY0420F51 400x300, HX8717 (no inking) //#define GxEPD2_DRIVER_CLASS GxEPD2_437c // Waveshare 4.37" 4-color +//#define GxEPD2_DRIVER_CLASS GxEPD2_0579c_GDEY0579F51 // GDEY0579F51 792x272, HX8717 (FPC-E009 22.09.25) +//#define GxEPD2_DRIVER_CLASS GxEPD2_1160c_GDEY116F51 // GDEY116F51 960x640, SSD2677, (FPC-K012 23.09.27) // 7-color e-paper //#define GxEPD2_DRIVER_CLASS GxEPD2_565c // Waveshare 5.65" 7-color +//#define GxEPD2_DRIVER_CLASS GxEPD2_565c_GDEP0565D90 // GDEP0565D90 600x448 7-color (E219454, AB1024-EGA AC0750TC1) //#define GxEPD2_DRIVER_CLASS GxEPD2_730c_GDEY073D46 // GDEY073D46 800x480 7-color, (N-FPC-001 2021.11.26) //#define GxEPD2_DRIVER_CLASS GxEPD2_730c_ACeP_730 // Waveshare 7.3" 7-color +//#define GxEPD2_DRIVER_CLASS GxEPD2_730c_GDEP073E01 // GDEP073E01 800x480 7-color, (E350911HF 94V-0 F-6 ROHS 24141) // grey levels parallel IF e-papers on Waveshare e-Paper IT8951 Driver HAT //#define GxEPD2_DRIVER_CLASS GxEPD2_it60 // ED060SCT 800x600 //#define GxEPD2_DRIVER_CLASS GxEPD2_it60_1448x1072 // ED060KC1 1448x1072 @@ -159,9 +169,7 @@ #define IS_GxEPD2_1248c(x) IS_GxEPD(GxEPD2_1248c_IS_, x) #if defined (ESP8266) -#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-38000ul) // ~34000 base use, WiFiClientSecure seems to need about 38k more to work (with CertStore) -// for site people.math.sc.edu an increased RX buffer is required for timely decodes, client.setBufferSizes(8192, 4096); // may help. needs more space: -//#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-38000ul) // ~34000 base use, WiFiClientSecure seems to need about 38k more to work (with CertStore) +#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-40000ul) // ~34000 base use, WiFiClientSecure seems to need about 40k more to work (with CertStore) #if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) #define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) #elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) @@ -217,40 +225,44 @@ GxEPD2_DISPLAY_CLASS < GxEPD2_DRIVER_CLASS, MAX_HEIGHT(GxEPD2_DRIVER_CLASS) > di #include #include #include +#else +#include #endif #include #include -#if defined (ESP8266) -// A single, global CertStore which can be used by all -// connections. Needs to stay live the entire time any of -// the WiFiClientBearSSLs are present. -BearSSL::CertStore certStore; -const char* certificate_rawcontent = 0; -#else -#include "GxEPD2_github_raw_certs.h" -const char* certificate_rawcontent = cert_DigiCert_TLS_RSA_SHA256_2020_CA1; -#pragma GCC warning "no CertStore for this target" -//#warning "no CertStore for this target" -#endif - const char* ssid = "........"; const char* password = "........"; const int httpPort = 80; const int httpsPort = 443; -const char* fp_rawcontent = "97:D8:C5:70:0F:12:24:6C:88:BC:FA:06:7E:8C:A7:4D:A8:62:67:28"; // SHA-1 as of 12.04.2024 +// note: the certificates have been moved to a separate header file, as R"CERT( destroys IDE Auto Format capability +#include "GxEPD2_github_raw_certs.h" +const char* certificate_rawcontent = github_io_pem; // ok, should work until Fri, 14 Mar 2025 23:59:59 GMT const char* host_rawcontent = "raw.githubusercontent.com"; const char* path_rawcontent = "/ZinggJM/GxEPD2/master/extras/bitmaps/"; +const char* path_workcontent = "/ZinggJM/GxEPD2/work_in_progress/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/"; -const char* path_Burkardt = "https://people.math.sc.edu/Burkardt/data/bmp/"; +const char* fp_rawcontent = "97:D8:C5:70:0F:12:24:6C:88:BC:FA:06:7E:8C:A7:4D:A8:62:67:28"; // SHA-1 as of 12.04.2024 + +//const char* path_Burkardt = "https://people.math.sc.edu/Burkardt/data/bmp/"; +const char* path_Burkardt = "/Burkardt/data/bmp/"; const char* fp_people_cas = "99:6C:B7:72:CC:ED:96:82:49:2D:B2:78:71:00:14:BA:02:8E:FF:BF"; const char* host_people_cas_sc_edu = "people.math.sc.edu"; +#if defined (ESP8266) +// A single, global CertStore which can be used by all +// connections. Needs to stay live the entire time any of +// the WiFiClientBearSSLs are present. +BearSSL::CertStore certStore; +#else +#pragma GCC warning "no CertStore for this target" +#endif + // note that BMP bitmaps are drawn at physical position in physical orientation of the screen 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, @@ -267,7 +279,8 @@ void setup() Serial.println(); Serial.println("GxEPD2_WiFi_Example"); - display.init(115200); + //display.init(115200); // default 10ms reset pulse, e.g. for bare panels with DESPI-C02 + display.init(115200, true, 2, false); // USE THIS for Waveshare boards with "clever" reset circuit, 2ms reset pulse #ifdef REMAP_SPI_FOR_WAVESHARE_ESP32_DRIVER_BOARD SPI.end(); // release standard SPI pins, e.g. SCK(18), MISO(19), MOSI(23), SS(5) @@ -283,26 +296,11 @@ void setup() delay(1000); } -#ifdef RE_INIT_NEEDED - WiFi.persistent(true); + Serial.println(); 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); - } + Serial.print("Connecting to "); + Serial.println(ssid); + WiFi.begin(ssid, password); int ConnectTimeout = 60; // 30 seconds while (WiFi.status() != WL_CONNECTED) { @@ -388,8 +386,8 @@ void drawBitmaps_other() { int16_t w2 = display.width() / 2; int16_t h2 = display.height() / 2; - showBitmapFrom_HTTP("www.packescape.com", "/img/assets/", "IniciMenusTV2.bmp", w2 - 200, h2 - 150, false); - delay(2000); + //showBitmapFrom_HTTP("www.packescape.com", "/img/assets/", "IniciMenusTV2.bmp", w2 - 200, h2 - 150, false); + //delay(2000); 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); @@ -419,10 +417,11 @@ void drawBitmaps_other() void drawBitmaps_test() { #if defined (ESP8266) - showBitmapFrom_HTTPS_Buffered(host_people_cas_sc_edu, path_Burkardt, "lena.bmp", 0, 0, 0, true, 0); // connection ok with CertStore + //showBitmapFrom_HTTPS(host_people_cas_sc_edu, path_Burkardt, "lena.bmp", 0, 0, 0, true, 0); // connection not ok with CertStore, needs be updated #endif int16_t w2 = display.width() / 2; int16_t h2 = display.height() / 2; + //showBitmapFrom_HTTPS(host_rawcontent, path_workcontent, "z0gs/screenshot.bmp", fp_rawcontent, 0, 0); delay(2000); return; showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "betty_4.bmp", fp_rawcontent, w2 - 102, h2 - 126); delay(2000); showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "output5.bmp", fp_rawcontent, 0, 0); @@ -515,13 +514,18 @@ void drawBitmapsBuffered_7C() delay(2000); showBitmapFrom_HTTPS_Buffered(host_rawcontent, path_waveshare_py, "N-Color1.bmp", fp_rawcontent, 0, 0); delay(2000); + + showBitmapFrom_HTTPS_Buffered(host_rawcontent, path_rawcontent, "displayed_bmp_small_but_padded.bmp", fp_rawcontent, 0, 0); + delay(2000); + showBitmapFrom_HTTPS_Buffered(host_rawcontent, path_rawcontent, "displayed_bmp_large.bmp", fp_rawcontent, 0, 0); + delay(2000); } } void drawBitmapsBuffered_test() { #if defined (ESP8266) - showBitmapFrom_HTTPS_Buffered(host_people_cas_sc_edu, path_Burkardt, "lena.bmp", 0, 0, 0, true, 0); // connection ok with CertStore + //showBitmapFrom_HTTPS_Buffered(host_people_cas_sc_edu, path_Burkardt, "lena.bmp", 0, 0, 0, true, 0); // connection not ok with CertStore, needs be updated #endif int16_t w2 = display.width() / 2; int16_t h2 = display.height() / 2; @@ -530,6 +534,7 @@ void drawBitmapsBuffered_test() } static const uint16_t input_buffer_pixels = 800; // may affect performance +//static const uint16_t input_buffer_pixels = 960; // may affect performance static const uint16_t max_row_width = 1872; // for up to 7.8" display 1872x1404 static const uint16_t max_palette_pixels = 256; // for depth <= 8 @@ -570,10 +575,8 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam { 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"); @@ -603,7 +606,7 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -628,7 +631,6 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam 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++) { @@ -647,7 +649,6 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam } display.clearScreen(); 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 { @@ -680,6 +681,7 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -809,10 +811,8 @@ void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char { 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"); @@ -842,7 +842,7 @@ void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -867,7 +867,6 @@ void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char 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++) { @@ -888,7 +887,6 @@ void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char } } 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 { @@ -919,6 +917,7 @@ void drawBitmapFrom_HTTP_ToBuffer(const char* host, const char* path, const char in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -1032,8 +1031,9 @@ void showBitmapFrom_HTTP_Buffered(const char* host, const char* path, const char 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) { // Use WiFiClientSecure class to create TLS connection -#if defined (ESP8266) +#if defined (ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) BearSSL::WiFiClientSecure client; + //BearSSL::X509List cert(certificate ? certificate : certificate_rawcontent); #else WiFiClientSecure client; #endif @@ -1044,9 +1044,7 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena if ((x >= display.epd2.WIDTH) || (y >= display.epd2.HEIGHT)) return; Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\""); Serial.print("connecting to "); Serial.println(host); -#if defined (ESP8266) - //client.setBufferSizes(4096, 4096); // required - client.setBufferSizes(8192, 4096); // may help for some sites +#if defined (ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) client.setCertStore(&certStore); #elif defined (ESP32) if (certificate) client.setCACert(certificate); @@ -1070,10 +1068,8 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena { 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"); @@ -1082,7 +1078,6 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena } if (!connection_ok) return; // Parse BMP header - //if (read16(client) == 0x4D42) // BMP signature uint16_t signature = 0; for (int16_t i = 0; i < 50; i++) { @@ -1102,8 +1097,6 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena uint16_t depth = read16(client); // bits per pixel uint32_t format = read32(client); uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far - //Serial.print("planes: "); Serial.println(planes); - //Serial.print("format: "); Serial.println(format); if ((planes == 1) && ((format == 0) || (format == 3))) // uncompressed is handled, 565 also { Serial.print("File size: "); Serial.println(fileSize); @@ -1113,7 +1106,7 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -1191,6 +1184,7 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -1293,6 +1287,7 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha // Use WiFiClientSecure class to create TLS connection #if defined (ESP8266) BearSSL::WiFiClientSecure client; + //BearSSL::X509List cert(certificate ? certificate : certificate_rawcontent); #else WiFiClientSecure client; #endif @@ -1305,8 +1300,6 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha display.fillScreen(GxEPD_WHITE); Serial.print("connecting to "); Serial.println(host); #if defined (ESP8266) - //client.setBufferSizes(4096, 4096); // required - client.setBufferSizes(8192, 4096); // may help client.setCertStore(&certStore); #elif defined (ESP32) if (certificate) client.setCACert(certificate); @@ -1330,10 +1323,8 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha { 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"); @@ -1342,18 +1333,12 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha } if (!connection_ok) return; // Parse BMP header - //if (read16(client) == 0x4D42) // BMP signature uint16_t signature = 0; for (int16_t i = 0; i < 50; i++) { if (!client.available()) delay(100); else signature = read16(client); - //Serial.print("signature: 0x"); Serial.println(signature, HEX); - if (signature == 0x4D42) - { - //Serial.print("signature wait loops: "); Serial.println(i); - break; - } + if (signature == 0x4D42) break; } if (signature == 0x4D42) // BMP signature { @@ -1376,7 +1361,7 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -1453,6 +1438,7 @@ void drawBitmapFrom_HTTPS_ToBuffer(const char* host, const char* path, const cha in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -1596,7 +1582,7 @@ uint32_t skip(BearSSL::WiFiClientSecure& client, int32_t bytes) client.read(); remain--; } - else delay(1); + else delay(10); if (millis() - start > 2000) break; // don't hang forever } return bytes - remain; @@ -1614,7 +1600,7 @@ uint32_t read8n(BearSSL::WiFiClientSecure& client, uint8_t* buffer, int32_t byte *buffer++ = uint8_t(v); remain--; } - else delay(1); + else delay(10); if (millis() - start > 2000) break; // don't hang forever } return bytes - remain; diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Buffered.h b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Buffered.h new file mode 100644 index 0000000..0996729 --- /dev/null +++ b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Buffered.h @@ -0,0 +1,515 @@ +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 + bool has_multicolors = (display.epd2.panel == GxEPD2::ACeP565) || (display.epd2.panel == GxEPD2::GDEY073D46); + 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: GxEPD2_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 (line == "\r") + { + Serial.println("headers received"); + break; + } + } + if (!connection_ok) return; + // Parse BMP header + if (read16(client) == 0x4D42) // BMP signature + { + uint32_t fileSize = read32(client); + uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused + uint32_t imageOffset = read32(client); // Start of image data + uint32_t headerSize = read32(client); + uint32_t width = read32(client); + int32_t height = (int32_t) read32(client); + uint16_t planes = read16(client); + uint16_t depth = read16(client); // bits per pixel + uint32_t format = read32(client); + uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far + 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(abs(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; + //if (w <= max_row_width) // handle with direct drawing + { + 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, 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); + rgb_palette_buffer[pn] = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + } + } + uint32_t rowPosition = flip ? imageOffset + (height - h) * rowSize : imageOffset; + 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; + in_idx = 0; + } + if (!connection_ok) + { + Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!"); + break; + } + switch (depth) + { + case 32: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + in_idx++; // skip alpha + 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? + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + break; + 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? + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + 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; + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + } + else // 565 + { + blue = (lsb & 0x1F) << 3; + green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3); + red = (msb & 0xF8); + color = (msb << 8) | lsb; + } + 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 2: + 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; + color = rgb_palette_buffer[pn]; + } + break; + } + if (with_color && has_multicolors) + { + // keep color + } + else if (whitish) + { + color = GxEPD_WHITE; + } + else if (colored && with_color) + { + color = GxEPD_COLORED; + } + 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"); + client.stop(); + if (!valid) + { + Serial.println("bitmap format not handled."); + } +} + +void showBitmapFrom_HTTP_Buffered(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("\""); + display.setFullWindow(); + display.firstPage(); + do + { + drawBitmapFrom_HTTP_ToBuffer(host, path, filename, x, y, with_color); + } + while (display.nextPage()); +} + +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 defined (ESP8266) + BearSSL::WiFiClientSecure client; + BearSSL::X509List cert(certificate ? certificate : certificate_rawcontent); +#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 + bool has_multicolors = (display.epd2.panel == GxEPD2::ACeP565) || (display.epd2.panel == GxEPD2::GDEY073D46); + 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) + if (certificate) client.setTrustAnchors(&cert); + else if (fingerprint) client.setFingerprint(fingerprint); + else client.setInsecure(); +#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: GxEPD2_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 (line == "\r") + { + Serial.println("headers received"); + break; + } + } + if (!connection_ok) return; + // Parse BMP header + uint16_t signature = 0; + for (int16_t i = 0; i < 50; i++) + { + if (!client.available()) delay(100); + else signature = read16(client); + if (signature == 0x4D42) break; + } + if (signature == 0x4D42) // BMP signature + { + uint32_t fileSize = read32(client); + uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused + uint32_t imageOffset = read32(client); // Start of image data + uint32_t headerSize = read32(client); + uint32_t width = read32(client); + int32_t height = (int32_t) read32(client); + uint16_t planes = read16(client); + uint16_t depth = read16(client); // bits per pixel + uint32_t format = read32(client); + uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far + 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(abs(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; + //if (w <= max_row_width) // handle with direct drawing + { + 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); + rgb_palette_buffer[pn] = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + } + } + 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; + in_idx = 0; + } + if (!connection_ok) + { + Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!"); + break; + } + switch (depth) + { + case 32: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + in_idx++; // skip alpha + 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? + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + break; + 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? + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + 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; + color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); + } + else // 565 + { + blue = (lsb & 0x1F) << 3; + green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3); + red = (msb & 0xF8); + color = (msb << 8) | lsb; + } + 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 2: + 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; + color = rgb_palette_buffer[pn]; + } + break; + } + if (with_color && has_multicolors) + { + // keep color + } + else if (whitish) + { + color = GxEPD_WHITE; + } + else if (colored && with_color) + { + color = GxEPD_COLORED; + } + 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"); + client.stop(); + if (!valid) + { + Serial.println("bitmap format not handled."); + } +} + +void showBitmapFrom_HTTPS_Buffered(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("\""); + display.setFullWindow(); + display.firstPage(); + do + { + drawBitmapFrom_HTTPS_ToBuffer(host, path, filename, fingerprint, x, y, with_color, certificate); + } + while (display.nextPage()); +} diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_display_selection_new_style.h b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_DisplaySelection.h similarity index 62% rename from examples/GxEPD2_WiFi_Example/GxEPD2_display_selection_new_style.h rename to examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_DisplaySelection.h index ec02d61..9765ead 100644 --- a/examples/GxEPD2_WiFi_Example/GxEPD2_display_selection_new_style.h +++ b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_DisplaySelection.h @@ -1,20 +1,3 @@ -// Display Library example for SPI e-paper panels from Dalian Good Display and boards from Waveshare. -// Requires HW SPI and Adafruit_GFX. Caution: the e-paper panels require 3.3V supply AND data lines! -// -// Display Library based on Demo Example from Good Display: https://www.good-display.com/companyfile/32/ -// -// Author: Jean-Marc Zingg -// -// Version: see library.properties -// -// Library: https://github.com/ZinggJM/GxEPD2 - -// Supporting Arduino Forum Topics (closed, read only): -// Good Display ePaper for Arduino: https://forum.arduino.cc/t/good-display-epaper-for-arduino/419657 -// Waveshare e-paper displays with SPI: https://forum.arduino.cc/t/waveshare-e-paper-displays-with-spi/467865 -// -// Add new topics in https://forum.arduino.cc/c/using-arduino/displays/23 for new questions and issues - // NOTE: you may need to adapt or select for your wiring in the processor specific conditional compile sections below // select the display class (only one), matching the kind of display panel @@ -128,8 +111,6 @@ #define EPD_CS SS #endif -#if defined(GxEPD2_DISPLAY_CLASS) && defined(GxEPD2_DRIVER_CLASS) - // somehow there should be an easier way to do this #define GxEPD2_BW_IS_GxEPD2_BW true #define GxEPD2_3C_IS_GxEPD2_3C true @@ -145,44 +126,8 @@ #define IS_GxEPD2_1248(x) IS_GxEPD(GxEPD2_1248_IS_, x) #define IS_GxEPD2_1248c(x) IS_GxEPD(GxEPD2_1248c_IS_, x) -#include "GxEPD2_selection_check.h" - -// for my test use only -//#if defined(_AVR) -//#warning "defined(_AVR)" -//#endif -//#if defined(ESP32) -//#warning "defined(ESP32)" -//#endif -//#if defined(ARDUINO_ARCH_ESP32) -//#warning "defined(ARDUINO_ARCH_ESP32)" -//#endif - -#if defined(ARDUINO_ARCH_AVR) -#if defined (ARDUINO_AVR_MEGA2560) // Note: SS is on 53 on MEGA -#define MAX_DISPLAY_BUFFER_SIZE 5000 // e.g. full height for 200x200 -#elif defined(ARDUINO_AVR_NANO_EVERY) -#define EPD_CS 10 -#define MAX_DISPLAY_BUFFER_SIZE 5000 // e.g. full height for 200x200 -#else // Note: SS is on 10 on UNO, NANO -#define MAX_DISPLAY_BUFFER_SIZE 800 // -#endif -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -// for Arduino Micro or Arduino Leonardo with CS on 10 on my proto boards (SS would be 17) uncomment instead: -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 10, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#endif - -#if defined(ARDUINO_ARCH_MEGAAVR) -#if defined(ARDUINO_AVR_NANO_EVERY) -#define MAX_DISPLAY_BUFFER_SIZE 5000 // e.g. full height for 200x200 +#if defined (ESP8266) +#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-36000ul) // ~34000 base use, WiFiClientSecure seems to need about 36k more to work (with certificates) #if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) #define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) #elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) @@ -191,11 +136,16 @@ GxEPD2_DISPLAY_CLASS displ #define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) #endif // adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 10, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#endif +GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=D8*/ EPD_CS, /*DC=D3*/ 0, /*RST=D4*/ 2, /*BUSY=D2*/ 4)); +// mapping of Waveshare e-Paper ESP8266 Driver Board, new version +//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=2*/ 2, /*BUSY=5*/ 5)); +// mapping of Waveshare e-Paper ESP8266 Driver Board, old version +//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=5*/ 5, /*BUSY=16*/ 16)); +#undef MAX_DISPLAY_BUFFER_SIZE +#undef MAX_HEIGHT #endif -#if defined(ARDUINO_ARCH_ESP32) +#if defined(ESP32) #define MAX_DISPLAY_BUFFER_SIZE 65536ul // e.g. #if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) #define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) @@ -206,15 +156,9 @@ GxEPD2_DISPLAY_CLASS displ #endif // adapt the constructor parameters to your wiring #if !IS_GxEPD2_1248(GxEPD2_DRIVER_CLASS) && !IS_GxEPD2_1248c(GxEPD2_DRIVER_CLASS) -#if defined(ARDUINO_NANO_ESP32) // uses Dx pin names -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ D10, /*DC=*/ D8, /*RST=*/ D9, /*BUSY=*/ D7)); -#elif defined(ARDUINO_LOLIN_D32_PRO) +#if defined(ARDUINO_LOLIN_D32_PRO) GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 0, /*RST=*/ 2, /*BUSY=*/ 15)); // my LOLIN_D32_PRO proto board -#elif defined(ARDUINO_LOLIN_S2_MINI) -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS*/ 33, /*DC=*/ 35, /*RST=*/ 37, /*BUSY=*/ 39)); // my LOLIN ESP32 S2 mini connection #else -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 27, /*DC=*/ 14, /*RST=*/ 12, /*BUSY=*/ 13)); // Good Display ESP32 Development Kit ESP32-L -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 27, /*DC=*/ 14, /*RST=*/ 12, /*BUSY=*/ 13, /*CS2=*/ 4)); // for GDEM1085T51 with ESP32-L GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 17, /*RST=*/ 16, /*BUSY=*/ 4)); // my suggested wiring and proto board //GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ 5, /*DC=*/ 17, /*RST=*/ 16, /*BUSY=*/ 4)); // LILYGO_T5_V2.4.1 //GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 19, /*RST=*/ 4, /*BUSY=*/ 34)); // LILYGO® TTGO T5 2.66 @@ -233,47 +177,7 @@ GxEPD2_DISPLAY_CLASS < GxEPD2_DRIVER_CLASS, MAX_HEIGHT(GxEPD2_DRIVER_CLASS) > di #undef MAX_HEIGHT #endif -#if defined (ARDUINO_ARCH_ESP8266) -#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-5000ul) // ~34000 base use, change 5000 to your application use -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=D8*/ EPD_CS, /*DC=D3*/ 0, /*RST=D4*/ 2, /*BUSY=D2*/ 4)); -// mapping of Waveshare e-Paper ESP8266 Driver Board, new version -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=2*/ 2, /*BUSY=5*/ 5)); -// mapping of Waveshare e-Paper ESP8266 Driver Board, old version -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=5*/ 5, /*BUSY=16*/ 16)); -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif - -// can't use package "STMF1 Boards (STM32Duino.com)" (Roger Clark) anymore with Adafruit_GFX, use "STM32 Boards (selected from submenu)" (STMicroelectronics) -#if defined(ARDUINO_ARCH_STM32) -#define MAX_DISPLAY_BUFFER_SIZE 15000ul // ~15k is a good compromise -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -// for Good Display STM32 Development Kit DESPI-L. -// needs jumpers from PA5 (PIN_SPI_SCK) to SCK for EPD and PA7 (PIN_SPI_MOSI) to SDI for EPD. PD9 and PD10 are not HW SPI capable. -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ PD8, /*DC=*/ PE15, /*RST=*/ PE14, /*BUSY=*/ PE13)); -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ PD8, /*DC=*/ PE15, /*RST=*/ PE14, /*BUSY=*/ PE13, /*CS2=*/ PD12)); // for GDEM1085T51 -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=PA4*/ EPD_CS, /*DC=*/ PA3, /*RST=*/ PA2, /*BUSY=*/ PA1)); // my proto board -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif - -#if defined(ARDUINO_ARCH_RENESAS) -#if defined(ARDUINO_UNOR4_MINIMA) || defined(ARDUINO_UNOR4_WIFI) +#if defined(ARDUINO_UNOR4_WIFI) #define MAX_DISPLAY_BUFFER_SIZE 16384ul // e.g. half of available RAM #if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) #define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) @@ -285,43 +189,6 @@ GxEPD2_DISPLAY_CLASS displ // adapt the constructor parameters to your wiring GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); #endif -#endif - -#if defined(ARDUINO_ARCH_SAM) -#define MAX_DISPLAY_BUFFER_SIZE 32768ul // e.g., up to 96k -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=10*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif - -#if defined(ARDUINO_ARCH_SAMD) -#define MAX_DISPLAY_BUFFER_SIZE 15000ul // ~15k is a good compromise -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -#if defined(ARDUINO_SAMD_NANO_33_IOT) -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=10*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#else -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=4*/ 4, /*DC=*/ 7, /*RST=*/ 6, /*BUSY=*/ 5)); -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=4*/ 4, /*DC=*/ 3, /*RST=*/ 2, /*BUSY=*/ 1)); // my Seed XIOA0 -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=4*/ 3, /*DC=*/ 2, /*RST=*/ 1, /*BUSY=*/ 0)); // my other Seed XIOA0 -#endif -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif #if defined(ARDUINO_ARCH_RP2040) #define MAX_DISPLAY_BUFFER_SIZE 131072ul // e.g. half of available ram @@ -336,23 +203,9 @@ GxEPD2_DISPLAY_CLASS displ // adapt the constructor parameters to your wiring GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); #endif -#if defined(ARDUINO_RASPBERRY_PI_PICO) -// adapt the constructor parameters to your wiring -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 5, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); // my proto board -// mapping of GoodDisplay DESPI-PICO. NOTE: uses alternate HW SPI pins! -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 3, /*DC=*/ 2, /*RST=*/ 1, /*BUSY=*/ 0)); // DESPI-PICO -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 3, /*DC=*/ 2, /*RST=*/ 11, /*BUSY=*/ 10)); // DESPI-PICO modified -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 9, /*DC=*/ 8, /*RST=*/ 12, /*BUSY=*/ 13)); // Waveshare Pico-ePaper-2.9 -#endif #if defined(ARDUINO_RASPBERRY_PI_PICO_W) GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 9, /*DC=*/ 8, /*RST=*/ 12, /*BUSY=*/ 13)); // Waveshare Pico-ePaper-2.9 #endif -#if defined(ARDUINO_ADAFRUIT_FEATHER_RP2040_THINKINK) -// Adafruit Feather RP2040 ThinkInk used with package https://github.com/earlephilhower/arduino-pico -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ PIN_EPD_CS, /*DC=*/ PIN_EPD_DC, /*RST=*/ PIN_EPD_RESET, /*BUSY=*/ PIN_EPD_BUSY)); -#endif #undef MAX_DISPLAY_BUFFER_SIZE #undef MAX_HEIGHT #endif - -#endif diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Example.ino b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Example.ino index cbb6390..b4cf1c8 100644 --- a/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Example.ino +++ b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Example.ino @@ -35,210 +35,12 @@ #include #include -// NOTE: you may need to adapt or select for your wiring in the processor specific conditional compile sections below - -// select the display class (only one), matching the kind of display panel -#define GxEPD2_DISPLAY_CLASS GxEPD2_BW -//#define GxEPD2_DISPLAY_CLASS GxEPD2_3C -//#define GxEPD2_DISPLAY_CLASS GxEPD2_4C -//#define GxEPD2_DISPLAY_CLASS GxEPD2_7C - -// select the display driver class (only one) for your panel -//#define GxEPD2_DRIVER_CLASS GxEPD2_102 // GDEW0102T4 80x128, UC8175, (WFT0102CZA2) -//#define GxEPD2_DRIVER_CLASS GxEPD2_150_BN // DEPG0150BN 200x200, SSD1681, (FPC8101), TTGO T5 V2.4.1 -//#define GxEPD2_DRIVER_CLASS GxEPD2_154 // GDEP015OC1 200x200, IL3829, (WFC0000CZ07), no longer available -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_D67 // GDEH0154D67 200x200, SSD1681, (HINK-E154A07-A1) -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_T8 // GDEW0154T8 152x152, UC8151 (IL0373), (WFT0154CZ17) -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_M09 // GDEW0154M09 200x200, JD79653A, (WFT0154CZB3) -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_M10 // GDEW0154M10 152x152, UC8151D, (WFT0154CZ17) -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_GDEY0154D67 // GDEY0154D67 200x200, SSD1681, (FPC-B001 20.05.21) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213 // GDE0213B1 122x250, IL3895, (HINK-E0213-G01), phased out -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_B72 // GDEH0213B72 122x250, SSD1675A (IL3897), (HINK-E0213A22-A0 SLH1852) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_B73 // GDEH0213B73 122x250, SSD1675B, (HINK-E0213A22-A0 SLH1914) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_B74 // GDEM0213B74 122x250, SSD1680, FPC-7528B) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_flex // GDEW0213I5F 104x212, UC8151 (IL0373), (WFT0213CZ16) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_M21 // GDEW0213M21 104x212, UC8151 (IL0373), (WFT0213CZ16) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_T5D // GDEW0213T5D 104x212, UC8151D, (WFT0213CZ16) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_BN // DEPG0213BN 122x250, SSD1680, (FPC-7528B), TTGO T5 V2.4.1, V2.3.1 -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_GDEY0213B74 // GDEY0213B74 122x250, SSD1680, (FPC-A002 20.04.08) -//#define GxEPD2_DRIVER_CLASS GxEPD2_260 // GDEW026T0 152x296, UC8151 (IL0373), (WFT0154CZ17) -//#define GxEPD2_DRIVER_CLASS GxEPD2_260_M01 // GDEW026M01 152x296, UC8151 (IL0373), (WFT0260CZB2) -//#define GxEPD2_DRIVER_CLASS GxEPD2_266_BN // DEPG0266BN 152x296, SSD1680, (FPC7510), TTGO T5 V2.66, TTGO T5 V2.4.1 -//#define GxEPD2_DRIVER_CLASS GxEPD2_266_GDEY0266T90 // GDEY0266T90 152x296, SSD1680, (FPC-A003 HB) -//#define GxEPD2_DRIVER_CLASS GxEPD2_270 // GDEW027W3 176x264, EK79652 (IL91874), (WFI0190CZ22) -//#define GxEPD2_DRIVER_CLASS GxEPD2_270_GDEY027T91 // GDEY027T91 176x264, SSD1680, (FB) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290 // GDEH029A1 128x296, SSD1608 (IL3820), (E029A01-FPC-A1 SYX1553) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_T5 // GDEW029T5 128x296, UC8151 (IL0373), (WFT0290CZ10) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_T5D // GDEW029T5D 128x296, UC8151D, (WFT0290CZ10) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_I6FD // GDEW029I6FD 128x296, UC8151D, (WFT0290CZ10) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_T94 // GDEM029T94 128x296, SSD1680, (FPC-7519 rev.b) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_T94_V2 // GDEM029T94 128x296, SSD1680, (FPC-7519 rev.b), Waveshare 2.9" V2 variant -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_BS // DEPG0290BS 128x296, SSD1680, (FPC-7519 rev.b) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_M06 // GDEW029M06 128x296, UC8151D, (WFT0290CZ10) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_GDEY029T94 // GDEY029T94 128x296, SSD1680, (FPC-A005 20.06.15) -//#define GxEPD2_DRIVER_CLASS GxEPD2_310_GDEQ031T10 // GDEQ031T10 240x320, UC8253, (no inking, backside mark KEGMO 3100) -//#define GxEPD2_DRIVER_CLASS GxEPD2_371 // GDEW0371W7 240x416, UC8171 (IL0324), (missing) -//#define GxEPD2_DRIVER_CLASS GxEPD2_370_TC1 // ED037TC1 280x480, SSD1677, (ICA-FU-20 ichia 2029), Waveshare 3.7" -//#define GxEPD2_DRIVER_CLASS GxEPD2_420 // GDEW042T2 400x300, UC8176 (IL0398), (WFT042CZ15) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420_M01 // GDEW042M01 400x300, UC8176 (IL0398), (WFT042CZ15) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420_GDEY042T81 // GDEY042T81 400x300, SSD1683 (no inking) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420_GYE042A87 // GYE042A87, 400x300, SSD1683 (HINK-E042-A07-FPC-A1) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420_SE0420NQ04 // SE0420NQ04, 400x300, UC8276C (OPM042A2_V1.0) -//#define GxEPD2_DRIVER_CLASS GxEPD2_426_GDEQ0426T82 // GDEQ0426T82 480x800, SSD1677 (P426010-MF1-A) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583 // GDEW0583T7 600x448, UC8159c (IL0371), (missing) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583_T8 // GDEW0583T8 648x480, EK79655 (GD7965), (WFT0583CZ61) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583_GDEQ0583T31 // GDEQ0583T31 648x480, UC8179, (P583010-MF1-B) -//#define GxEPD2_DRIVER_CLASS GxEPD2_750 // GDEW075T8 640x384, UC8159c (IL0371), (WF0583CZ09) -//#define GxEPD2_DRIVER_CLASS GxEPD2_750_T7 // GDEW075T7 800x480, EK79655 (GD7965), (WFT0583CZ61) -//#define GxEPD2_DRIVER_CLASS GxEPD2_750_GDEY075T7 // GDEY075T7 800x480, UC8179 (GD7965), (FPC-C001 20.08.20) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1020_GDEM102T91 // GDEM102T91 960x640, SSD1677, (FPC7705 REV.b) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1160_T91 // GDEH116T91 960x640, SSD1677, (none or hidden) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1248 // GDEW1248T3 1304x984, UC8179, (WFT1248BZ23,WFT1248BZ24) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1330_GDEM133T91 // GDEM133T91 960x680, SSD1677, (FPC-7701 REV.B) -// 3-color e-papers -//#define GxEPD2_DRIVER_CLASS GxEPD2_154c // GDEW0154Z04 200x200, IL0376F, (WFT0000CZ04), no longer available -//#define GxEPD2_DRIVER_CLASS GxEPD2_154_Z90c // GDEH0154Z90 200x200, SSD1681, (HINK-E154A07-A1) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213c // GDEW0213Z16 104x212, UC8151 (IL0373), (WFT0213CZ16) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_Z19c // GDEH0213Z19 104x212, UC8151D, (HINK-E0213A20-A2 2020-11-19) -//#define GxEPD2_DRIVER_CLASS GxEPD2_213_Z98c // GDEY0213Z98 122x250, SSD1680, (FPC-A002 20.04.08) -//#define GxEPD2_DRIVER_CLASS GxEPD2_266c // GDEY0266Z90 152x296, SSD1680, (FPC-7510) -//#define GxEPD2_DRIVER_CLASS GxEPD2_270c // GDEW027C44 176x264, IL91874, (WFI0190CZ22) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290c // GDEW029Z10 128x296, UC8151 (IL0373), (WFT0290CZ10) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_Z13c // GDEH029Z13 128x296, UC8151D, (HINK-E029A10-A3 20160809) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290_C90c // GDEM029C90 128x296, SSD1680, (FPC-7519 rev.b) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420c // GDEW042Z15 400x300, UC8176 (IL0398), (WFT0420CZ15) -//#define GxEPD2_DRIVER_CLASS GxEPD2_420c_Z21 // GDEQ042Z21 400x300, UC8276, (hidden) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583c // GDEW0583Z21 600x448, UC8159c (IL0371), (missing) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583c_Z83 // GDEW0583Z83 648x480, EK79655 (GD7965), (WFT0583CZ61) -//#define GxEPD2_DRIVER_CLASS GxEPD2_583c_GDEQ0583Z31 // GDEQ0583Z31 648x480, UC8179C, -//#define GxEPD2_DRIVER_CLASS GxEPD2_750c // GDEW075Z09 640x384, UC8159c (IL0371), (WF0583CZ09) -//#define GxEPD2_DRIVER_CLASS GxEPD2_750c_Z08 // GDEW075Z08 800x480, EK79655 (GD7965), (WFT0583CZ61) -//#define GxEPD2_DRIVER_CLASS GxEPD2_750c_Z90 // GDEH075Z90 880x528, SSD1677, (HINK-E075A07-A0) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1160c_GDEY116Z91 // GDEY116Z91 960x640, SSD1677, (FPV-K002 22.04.15) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1248c // GDEY1248Z51 1304x984, UC8179, (WFT1248BZ23,WFT1248BZ24) -//#define GxEPD2_DRIVER_CLASS GxEPD2_1330c_GDEM133Z91 // GDEM133Z91 960x680, SSD1677 (FPC-7701 REV.B) -// 4-color e-paper -//#define GxEPD2_DRIVER_CLASS GxEPD2_266c_GDEY0266F51H // GDEY0266F51H 184x360, JD79667 (FPC-H006 22.04.02) -//#define GxEPD2_DRIVER_CLASS GxEPD2_290c_GDEY029F51H // GDEY029F51H 168x384, JD79667 (FPC-H004 22.03.24) -//#define GxEPD2_DRIVER_CLASS GxEPD2_300c // Waveshare 3.00" 4-color -//#define GxEPD2_DRIVER_CLASS GxEPD2_420c_GDEY0420F51 // GDEY0420F51 400x300, HX8717 (no inking) -//#define GxEPD2_DRIVER_CLASS GxEPD2_437c // Waveshare 4.37" 4-color -// 7-color e-paper -//#define GxEPD2_DRIVER_CLASS GxEPD2_565c // Waveshare 5.65" 7-color -//#define GxEPD2_DRIVER_CLASS GxEPD2_730c_GDEY073D46 // GDEY073D46 800x480 7-color, (N-FPC-001 2021.11.26) -//#define GxEPD2_DRIVER_CLASS GxEPD2_730c_ACeP_730 // Waveshare 7.3" 7-color -// grey levels parallel IF e-papers on Waveshare e-Paper IT8951 Driver HAT -//#define GxEPD2_DRIVER_CLASS GxEPD2_it60 // ED060SCT 800x600 -//#define GxEPD2_DRIVER_CLASS GxEPD2_it60_1448x1072 // ED060KC1 1448x1072 -//#define GxEPD2_DRIVER_CLASS GxEPD2_it78_1872x1404 // ED078KC2 1872x1404 -//#define GxEPD2_DRIVER_CLASS GxEPD2_it103_1872x1404 // ES103TC1 1872x1404 - -// SS is usually used for CS. define here for easy change -#ifndef EPD_CS -#define EPD_CS SS -#endif - -// somehow there should be an easier way to do this -#define GxEPD2_BW_IS_GxEPD2_BW true -#define GxEPD2_3C_IS_GxEPD2_3C true -#define GxEPD2_4C_IS_GxEPD2_4C true -#define GxEPD2_7C_IS_GxEPD2_7C true -#define GxEPD2_1248_IS_GxEPD2_1248 true -#define GxEPD2_1248c_IS_GxEPD2_1248c true -#define IS_GxEPD(c, x) (c##x) -#define IS_GxEPD2_BW(x) IS_GxEPD(GxEPD2_BW_IS_, x) -#define IS_GxEPD2_3C(x) IS_GxEPD(GxEPD2_3C_IS_, x) -#define IS_GxEPD2_4C(x) IS_GxEPD(GxEPD2_4C_IS_, x) -#define IS_GxEPD2_7C(x) IS_GxEPD(GxEPD2_7C_IS_, x) -#define IS_GxEPD2_1248(x) IS_GxEPD(GxEPD2_1248_IS_, x) -#define IS_GxEPD2_1248c(x) IS_GxEPD(GxEPD2_1248c_IS_, x) - -#if defined (ESP8266) -#define MAX_DISPLAY_BUFFER_SIZE (81920ul-34000ul-36000ul) // ~34000 base use, WiFiClientSecure seems to need about 36k more to work (with certificates) -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=D8*/ EPD_CS, /*DC=D3*/ 0, /*RST=D4*/ 2, /*BUSY=D2*/ 4)); -// mapping of Waveshare e-Paper ESP8266 Driver Board, new version -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=2*/ 2, /*BUSY=5*/ 5)); -// mapping of Waveshare e-Paper ESP8266 Driver Board, old version -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=15*/ EPD_CS, /*DC=4*/ 4, /*RST=5*/ 5, /*BUSY=16*/ 16)); -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif - -#if defined(ESP32) -#define MAX_DISPLAY_BUFFER_SIZE 65536ul // e.g. -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -#if !IS_GxEPD2_1248(GxEPD2_DRIVER_CLASS) && !IS_GxEPD2_1248c(GxEPD2_DRIVER_CLASS) -#if defined(ARDUINO_LOLIN_D32_PRO) -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 0, /*RST=*/ 2, /*BUSY=*/ 15)); // my LOLIN_D32_PRO proto board -#else -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 17, /*RST=*/ 16, /*BUSY=*/ 4)); // my suggested wiring and proto board -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ 5, /*DC=*/ 17, /*RST=*/ 16, /*BUSY=*/ 4)); // LILYGO_T5_V2.4.1 -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 19, /*RST=*/ 4, /*BUSY=*/ 34)); // LILYGO® TTGO T5 2.66 -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=5*/ EPD_CS, /*DC=*/ 2, /*RST=*/ 0, /*BUSY=*/ 4)); // e.g. TTGO T8 ESP32-WROVER -//GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 15, /*DC=*/ 27, /*RST=*/ 26, /*BUSY=*/ 25)); // Waveshare ESP32 Driver Board -#endif -#else // GxEPD2_1248 or GxEPD2_1248c -// Waveshare 12.48 b/w or b/w/r SPI display board and frame or Good Display 12.48 b/w panel GDEW1248T3 or b/w/r panel GDEY1248Z51 -// general constructor for use with all parameters, e.g. for Waveshare ESP32 driver board mounted on connection board -GxEPD2_DISPLAY_CLASS < GxEPD2_DRIVER_CLASS, MAX_HEIGHT(GxEPD2_DRIVER_CLASS) > display(GxEPD2_DRIVER_CLASS(/*sck=*/ 13, /*miso=*/ 12, /*mosi=*/ 14, - /*cs_m1=*/ 23, /*cs_s1=*/ 22, /*cs_m2=*/ 16, /*cs_s2=*/ 19, - /*dc1=*/ 25, /*dc2=*/ 17, /*rst1=*/ 33, /*rst2=*/ 5, - /*busy_m1=*/ 32, /*busy_s1=*/ 26, /*busy_m2=*/ 18, /*busy_s2=*/ 4)); -#endif -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif - -#if defined(ARDUINO_UNOR4_WIFI) -#define MAX_DISPLAY_BUFFER_SIZE 16384ul // e.g. half of available RAM -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#endif - -#if defined(ARDUINO_ARCH_RP2040) -#define MAX_DISPLAY_BUFFER_SIZE 131072ul // e.g. half of available ram -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8) ? EPD::HEIGHT : MAX_DISPLAY_BUFFER_SIZE / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) || IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE / 2) / (EPD::WIDTH / 8)) -#elif IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) -#define MAX_HEIGHT(EPD) (EPD::HEIGHT <= (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2) ? EPD::HEIGHT : (MAX_DISPLAY_BUFFER_SIZE) / (EPD::WIDTH / 2)) -#endif -#if defined(ARDUINO_NANO_RP2040_CONNECT) -// adapt the constructor parameters to your wiring -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ EPD_CS, /*DC=*/ 8, /*RST=*/ 9, /*BUSY=*/ 7)); -#endif -#if defined(ARDUINO_RASPBERRY_PI_PICO_W) -GxEPD2_DISPLAY_CLASS display(GxEPD2_DRIVER_CLASS(/*CS=*/ 9, /*DC=*/ 8, /*RST=*/ 12, /*BUSY=*/ 13)); // Waveshare Pico-ePaper-2.9 -#endif -#undef MAX_DISPLAY_BUFFER_SIZE -#undef MAX_HEIGHT -#endif +#include "GxEPD2_WiFi_DisplaySelection.h" #if defined (ESP8266) #include +#else +#include #endif #include @@ -255,13 +57,9 @@ const int httpsPort = 443; const char* certificate_rawcontent = github_io_pem; // ok, should work until Fri, 14 Mar 2025 23:59:59 GMT -//const char* certificate_rawcontent = cert_DigiCert_TLS_RSA_SHA256_2020_CA1; // not ok, should work until 2031-04-13 23:59:59 -//const char* certificate_rawcontent = github_io_chain_pem_first; // not ok, should work until Fri, 14 Mar 2025 23:59:59 GMT -//const char* certificate_rawcontent = github_io_chain_pem_second; // ok, should work until Fri, 14 Mar 2025 23:59:59 GMT -//const char* certificate_rawcontent = github_io_chain_pem_third; // not ok, should work until Fri, 14 Mar 2025 23:59:59 GMT - const char* host_rawcontent = "raw.githubusercontent.com"; const char* path_rawcontent = "/ZinggJM/GxEPD2/master/extras/bitmaps/"; +const char* path_workcontent = "/ZinggJM/GxEPD2/work_in_progress/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/"; @@ -277,6 +75,10 @@ void showBitmapFrom_HTTP_Buffered(const char* host, const char* path, const char void showBitmapFrom_HTTPS_Buffered(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 showNative4cFrom_HTTP(const char* host, const char* path, const char* filename, int16_t x, int16_t y, bool with_color = true); +void showNative4cFrom_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); + #if defined(ESP32) // uncomment next line to use HSPI for EPD (and VSPI for SD), e.g. with Waveshare ESP32 Driver Board //#define USE_HSPI_FOR_EPD @@ -310,32 +112,19 @@ void setup() //display.init(115200); // default 10ms reset pulse, e.g. for bare panels with DESPI-C02 display.init(115200, true, 2, false); // USE THIS for Waveshare boards with "clever" reset circuit, 2ms reset pulse -#if defined (ESP8266) || defined (ESP32) -#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) != "........")) + if (display.pages() > 1) { + delay(100); 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); + Serial.print("pages = "); Serial.print(display.pages()); Serial.print(" page height = "); Serial.println(display.pageHeight()); + delay(1000); } -#else - Serial.print("Connecting to "); - Serial.println(ssid); - WiFi.begin(ssid, password); -#endif + + Serial.println(); + WiFi.mode(WIFI_STA); // switch off AP + Serial.print("Connecting to "); + Serial.println(ssid); + WiFi.begin(ssid, password); int ConnectTimeout = 60; // 30 seconds while (WiFi.status() != WL_CONNECTED) { @@ -439,6 +228,8 @@ void drawBitmaps_test() { int16_t w2 = display.width() / 2; int16_t h2 = display.height() / 2; + //showBitmapFrom_HTTPS(host_rawcontent, path_workcontent, "z0gs/screenshot.bmp", fp_rawcontent, 0, 0); delay(2000); return; + //showNative4cFrom_HTTPS(host_rawcontent, path_workcontent, "z0gs/screenshot.bmp", fp_rawcontent, 0, 0); delay(2000); return; showBitmapFrom_HTTPS(host_rawcontent, path_prenticedavid, "betty_4.bmp", fp_rawcontent, w2 - 102, h2 - 126); delay(2000); showBitmapFrom_HTTPS(host_rawcontent, path_rawcontent, "output5.bmp", fp_rawcontent, 0, 0); @@ -548,6 +339,7 @@ void drawBitmapsBuffered_test() } static const uint16_t input_buffer_pixels = 800; // may affect performance +//static const uint16_t input_buffer_pixels = 960; // may affect performance static const uint16_t max_row_width = 1872; // for up to 7.8" display 1872x1404 static const uint16_t max_palette_pixels = 256; // for depth <= 8 @@ -588,10 +380,8 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam { 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"); @@ -621,7 +411,7 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -646,7 +436,6 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam 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++) { @@ -665,7 +454,6 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam } display.clearScreen(); 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 { @@ -698,6 +486,7 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -797,256 +586,6 @@ void showBitmapFrom_HTTP(const char* host, const char* path, const char* filenam } } -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 - bool has_multicolors = (display.epd2.panel == GxEPD2::ACeP565) || (display.epd2.panel == GxEPD2::GDEY073D46); - 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: GxEPD2_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 - { - uint32_t fileSize = read32(client); - uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused - uint32_t imageOffset = read32(client); // Start of image data - uint32_t headerSize = read32(client); - uint32_t width = read32(client); - int32_t height = (int32_t) read32(client); - uint16_t planes = read16(client); - uint16_t depth = read16(client); // bits per pixel - uint32_t format = read32(client); - uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far - 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; - //if (w <= max_row_width) // handle with direct drawing - { - 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); - rgb_palette_buffer[pn] = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - } - } - 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 32: - blue = input_buffer[in_idx++]; - green = input_buffer[in_idx++]; - red = input_buffer[in_idx++]; - in_idx++; // skip alpha - 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? - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - break; - 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? - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - 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; - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - } - else // 565 - { - blue = (lsb & 0x1F) << 3; - green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3); - red = (msb & 0xF8); - color = (msb << 8) | lsb; - } - 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 2: - 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; - color = rgb_palette_buffer[pn]; - } - break; - } - if (with_color && has_multicolors) - { - // keep color - } - else if (whitish) - { - color = GxEPD_WHITE; - } - else if (colored && with_color) - { - color = GxEPD_COLORED; - } - 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"); - client.stop(); - if (!valid) - { - Serial.println("bitmap format not handled."); - } -} - -void showBitmapFrom_HTTP_Buffered(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("\""); - display.setFullWindow(); - display.firstPage(); - do - { - drawBitmapFrom_HTTP_ToBuffer(host, path, filename, x, y, with_color); - } - while (display.nextPage()); -} - 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) { // Use WiFiClientSecure class to create TLS connection @@ -1064,8 +603,6 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\""); Serial.print("connecting to "); Serial.println(host); #if defined (ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) - client.setBufferSizes(4096, 4096); // required - //client.setBufferSizes(8192, 4096); // may help for some sites if (certificate) client.setTrustAnchors(&cert); else if (fingerprint) client.setFingerprint(fingerprint); else client.setInsecure(); @@ -1091,10 +628,8 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena { 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"); @@ -1103,13 +638,11 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena } if (!connection_ok) return; // Parse BMP header - //if (read16(client) == 0x4D42) // BMP signature uint16_t signature = 0; for (int16_t i = 0; i < 50; i++) { if (!client.available()) delay(100); else signature = read16(client); - //Serial.print("signature: 0x"); Serial.println(signature, HEX); if (signature == 0x4D42) break; } if (signature == 0x4D42) // BMP signature @@ -1133,7 +666,7 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena Serial.print("Image size: "); Serial.print(width); Serial.print('x'); - Serial.println(height); + Serial.println(abs(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; @@ -1211,6 +744,7 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena in_bytes = got; in_remain -= got; bytes_read += got; + in_idx = 0; } if (!connection_ok) { @@ -1308,282 +842,9 @@ void showBitmapFrom_HTTPS(const char* host, const char* path, const char* filena } } -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 defined (ESP8266) - BearSSL::WiFiClientSecure client; - BearSSL::X509List cert(certificate ? certificate : certificate_rawcontent); -#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 - bool has_multicolors = (display.epd2.panel == GxEPD2::ACeP565) || (display.epd2.panel == GxEPD2::GDEY073D46); - 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); // required - //client.setBufferSizes(8192, 4096); // may help for some sites - if (certificate) client.setTrustAnchors(&cert); - else if (fingerprint) client.setFingerprint(fingerprint); - else client.setInsecure(); -#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: GxEPD2_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 - uint16_t signature = 0; - for (int16_t i = 0; i < 50; i++) - { - if (!client.available()) delay(100); - else signature = read16(client); - if (signature == 0x4D42) - { - //Serial.print("signature wait loops: "); Serial.println(i); - break; - } - } - if (signature == 0x4D42) // BMP signature - { - uint32_t fileSize = read32(client); - uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused - uint32_t imageOffset = read32(client); // Start of image data - uint32_t headerSize = read32(client); - uint32_t width = read32(client); - int32_t height = (int32_t) read32(client); - uint16_t planes = read16(client); - uint16_t depth = read16(client); // bits per pixel - uint32_t format = read32(client); - uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far - 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; - //if (w <= max_row_width) // handle with direct drawing - { - 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); - rgb_palette_buffer[pn] = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - } - } - 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 32: - blue = input_buffer[in_idx++]; - green = input_buffer[in_idx++]; - red = input_buffer[in_idx++]; - in_idx++; // skip alpha - 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? - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - break; - 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? - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - 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; - color = ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | ((blue & 0xF8) >> 3); - } - else // 565 - { - blue = (lsb & 0x1F) << 3; - green = ((msb & 0x07) << 5) | ((lsb & 0xE0) >> 3); - red = (msb & 0xF8); - color = (msb << 8) | lsb; - } - 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 2: - 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; - color = rgb_palette_buffer[pn]; - } - break; - } - if (with_color && has_multicolors) - { - // keep color - } - else if (whitish) - { - color = GxEPD_WHITE; - } - else if (colored && with_color) - { - color = GxEPD_COLORED; - } - 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"); - client.stop(); - if (!valid) - { - Serial.println("bitmap format not handled."); - } -} +#include "GxEPD2_WiFi_Buffered.h" -void showBitmapFrom_HTTPS_Buffered(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("\""); - display.setFullWindow(); - display.firstPage(); - do - { - drawBitmapFrom_HTTPS_ToBuffer(host, path, filename, fingerprint, x, y, with_color, certificate); - } - while (display.nextPage()); -} +#include "GxEPD2_WiFi_Native4c.h" uint16_t read16(WiFiClient& client) { @@ -1618,7 +879,7 @@ uint32_t skip(BearSSL::WiFiClientSecure& client, int32_t bytes) client.read(); remain--; } - else delay(1); + else delay(10); if (millis() - start > 2000) break; // don't hang forever } return bytes - remain; @@ -1636,7 +897,7 @@ uint32_t read8n(BearSSL::WiFiClientSecure& client, uint8_t* buffer, int32_t byte *buffer++ = uint8_t(v); remain--; } - else delay(1); + else delay(10); if (millis() - start > 2000) break; // don't hang forever } return bytes - remain; diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Native4c.h b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Native4c.h new file mode 100644 index 0000000..56ee672 --- /dev/null +++ b/examples/GxEPD2_WiFi_Example/GxEPD2_WiFi_Native4c.h @@ -0,0 +1,457 @@ +uint8_t output_row_native4c_buffer[max_row_width / 4]; // buffer for at least one row of native color bits + +uint8_t color4(uint16_t red, uint16_t green, uint16_t blue) +{ + uint8_t cv4 = 0x00; + if ((red < 0x80) && (green < 0x80) && (blue < 0x80)) cv4 = 0x00; // black + else if ((red >= 0x80) && (green >= 0x80) && (blue >= 0x80)) cv4 = 0x01; // white + else if ((red >= 0x80) && (blue >= 0x80)) cv4 = 0x03; // red, blue > red + else if ((green >= 0x80) && (blue >= 0x80)) cv4 = 0x01; // green, blue > white + else if ((red >= 0x80) && (green >= 0xC0)) cv4 = 0x02; // yellow + else if ((red >= 0x80) && (green >= 0x40)) cv4 = 0x03; // orange > red + else if (red >= 0x80) cv4 = 0x03; // red + else if (green >= 0x80) cv4 = 0x00; // green > black + else cv4 = 0x03; // blue + return cv4; +} + +void showNative4cFrom_HTTP(const char* host, const char* path, const char* filename, int16_t x, int16_t y) +{ + 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.epd2.WIDTH) || (y >= display.epd2.HEIGHT)) return; + Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\""); + 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: GxEPD2_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 (line == "\r") + { + Serial.println("headers received"); + break; + } + } + if (!connection_ok) return; + // Parse BMP header + if (read16(client) == 0x4D42) // BMP signature + { + uint32_t fileSize = read32(client); + uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused + uint32_t imageOffset = read32(client); // Start of image data + uint32_t headerSize = read32(client); + uint32_t width = read32(client); + int32_t height = (int32_t) read32(client); + uint16_t planes = read16(client); + uint16_t depth = read16(client); // bits per pixel + uint32_t format = read32(client); + uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far + 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(abs(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.epd2.WIDTH) w = display.epd2.WIDTH - x; + if ((y + h - 1) >= display.epd2.HEIGHT) h = display.epd2.HEIGHT - y; + if (w <= max_row_width) // handle with direct drawing + { + valid = true; + uint8_t bitmask = 0xFF; + uint8_t bitshift = 8 - depth; + uint16_t red, green, blue; + uint8_t cv4 = 0x00; + if (depth <= 8) + { + if (depth < 8) bitmask >>= depth; + 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; + rgb_palette_buffer[pn] = color4(red, green, blue); + } + } + display.clearScreen(); + uint32_t rowPosition = flip ? imageOffset + (height - h) * rowSize : imageOffset; + 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 + uint8_t out_cv4_byte = 0x00; + uint32_t out_idx = 0; + 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; + in_idx = 0; + } + if (!connection_ok) + { + Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!"); + break; + } + switch (depth) + { + case 32: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + in_idx++; // skip alpha + cv4 = color4(red, green, blue); + break; + case 24: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + cv4 = color4(red, green, blue); + 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); + } + } + cv4 = color4(red, green, blue); + break; + case 1: + case 2: + case 4: + case 8: + { + if (0 == in_bits) + { + in_byte = input_buffer[in_idx++]; + in_bits = 8; + } + uint16_t pn = (in_byte >> bitshift) & bitmask; + cv4 = rgb_palette_buffer[pn]; + in_byte <<= depth; + in_bits -= depth; + } + break; + } + out_cv4_byte |= cv4 << (2 * (3 - col % 4)); + if ((3 == col % 4) || (col == w - 1)) // write that last byte! (for w%4!=0 border) + { + output_row_native4c_buffer[out_idx++] = out_cv4_byte; + out_cv4_byte = 0x00; + } + } // end pixel + int16_t yrow = y + (flip ? h - row - 1 : row); + display.writeNative(output_row_native4c_buffer, 0, x, yrow, w, 1, false, false, false); + } // end line + Serial.print("downloaded in "); + Serial.print(millis() - startTime); + Serial.println(" ms"); + display.refresh(); + } + Serial.print("bytes read "); Serial.println(bytes_read); + } + } + client.stop(); + if (!valid) + { + Serial.println("bitmap format not handled."); + } +} + +void showNative4cFrom_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) +{ + // Use WiFiClientSecure class to create TLS connection +#if defined (ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) + BearSSL::WiFiClientSecure client; + BearSSL::X509List cert(certificate ? certificate : certificate_rawcontent); +#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.epd2.WIDTH) || (y >= display.epd2.HEIGHT)) return; + Serial.println(); Serial.print("downloading file \""); Serial.print(filename); Serial.println("\""); + Serial.print("connecting to "); Serial.println(host); +#if defined (ESP8266) || defined(ARDUINO_RASPBERRY_PI_PICO_W) + if (certificate) client.setTrustAnchors(&cert); + else if (fingerprint) client.setFingerprint(fingerprint); + else client.setInsecure(); +#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: GxEPD2_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 (line == "\r") + { + Serial.println("headers received"); + break; + } + } + if (!connection_ok) return; + // Parse BMP header + uint16_t signature = 0; + for (int16_t i = 0; i < 50; i++) + { + if (!client.available()) delay(100); + else signature = read16(client); + if (signature == 0x4D42) break; + } + if (signature == 0x4D42) // BMP signature + { + uint32_t fileSize = read32(client); + uint32_t creatorBytes = read32(client); (void)creatorBytes; //unused + uint32_t imageOffset = read32(client); // Start of image data + uint32_t headerSize = read32(client); + uint32_t width = read32(client); + int32_t height = (int32_t) read32(client); + uint16_t planes = read16(client); + uint16_t depth = read16(client); // bits per pixel + uint32_t format = read32(client); + uint32_t bytes_read = 7 * 4 + 3 * 2; // read so far + 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(abs(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.epd2.WIDTH) w = display.epd2.WIDTH - x; + if ((y + h - 1) >= display.epd2.HEIGHT) h = display.epd2.HEIGHT - y; + if (w <= max_row_width) // handle with direct drawing + { + valid = true; + uint8_t bitmask = 0xFF; + uint8_t bitshift = 8 - depth; + uint16_t red, green, blue; + uint8_t cv4 = 0x00; + if (depth <= 8) + { + if (depth < 8) bitmask >>= depth; + 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; + rgb_palette_buffer[pn] = color4(red, green, blue); + } + } + display.clearScreen(); + uint32_t rowPosition = flip ? imageOffset + (height - h) * rowSize : imageOffset; + 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 + uint8_t out_cv4_byte = 0x00; + uint32_t out_idx = 0; + 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; + in_idx = 0; + } + if (!connection_ok) + { + Serial.print("Error: got no more after "); Serial.print(bytes_read); Serial.println(" bytes read!"); + break; + } + switch (depth) + { + case 32: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + in_idx++; // skip alpha + cv4 = color4(red, green, blue); + break; + case 24: + blue = input_buffer[in_idx++]; + green = input_buffer[in_idx++]; + red = input_buffer[in_idx++]; + cv4 = color4(red, green, blue); + 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); + } + } + cv4 = color4(red, green, blue); + break; + case 1: + case 2: + case 4: + case 8: + { + if (0 == in_bits) + { + in_byte = input_buffer[in_idx++]; + in_bits = 8; + } + uint16_t pn = (in_byte >> bitshift) & bitmask; + cv4 = rgb_palette_buffer[pn]; + in_byte <<= depth; + in_bits -= depth; + } + break; + } + out_cv4_byte |= cv4 << (2 * (3 - col % 4)); + if ((3 == col % 4) || (col == w - 1)) // write that last byte! (for w%4!=0 border) + { + output_row_native4c_buffer[out_idx++] = out_cv4_byte; + out_cv4_byte = 0x00; + } + } // end pixel + int16_t yrow = y + (flip ? h - row - 1 : row); + // void writeNative(const uint8_t* data1, const uint8_t* data2, int16_t x, int16_t y, int16_t w, int16_t h, bool invert, bool mirror_y, bool pgm) + display.writeNative(output_row_native4c_buffer, 0, x, yrow, w, 1, false, false, false); + } // end line + Serial.print("downloaded in "); + Serial.print(millis() - startTime); + Serial.println(" ms"); + display.refresh(); + } + Serial.print("bytes read "); Serial.println(bytes_read); + } + } + client.stop(); + if (!valid) + { + Serial.println("bitmap format not handled."); + } +} diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_selection_check.h b/examples/GxEPD2_WiFi_Example/GxEPD2_selection_check.h deleted file mode 100644 index 44b0772..0000000 --- a/examples/GxEPD2_WiFi_Example/GxEPD2_selection_check.h +++ /dev/null @@ -1,156 +0,0 @@ -// Display Library example for SPI e-paper panels from Dalian Good Display and boards from Waveshare. -// Requires HW SPI and Adafruit_GFX. Caution: the e-paper panels require 3.3V supply AND data lines! -// -// Display Library based on Demo Example from Good Display: https://www.good-display.com/companyfile/32/ -// -// Author: Jean-Marc Zingg -// -// Version: see library.properties -// -// Library: https://github.com/ZinggJM/GxEPD2 - -// Supporting Arduino Forum Topics (closed, read only): -// Good Display ePaper for Arduino: https://forum.arduino.cc/t/good-display-epaper-for-arduino/419657 -// Waveshare e-paper displays with SPI: https://forum.arduino.cc/t/waveshare-e-paper-displays-with-spi/467865 -// -// Add new topics in https://forum.arduino.cc/c/using-arduino/displays/23 for new questions and issues - -#define GxEPD2_102_IS_BW true -#define GxEPD2_150_BN_IS_BW true -#define GxEPD2_154_IS_BW true -#define GxEPD2_154_D67_IS_BW true -#define GxEPD2_154_T8_IS_BW true -#define GxEPD2_154_M09_IS_BW true -#define GxEPD2_154_M10_IS_BW true -#define GxEPD2_154_GDEY0154D67_IS_BW true -#define GxEPD2_213_IS_BW true -#define GxEPD2_213_B72_IS_BW true -#define GxEPD2_213_B73_IS_BW true -#define GxEPD2_213_B74_IS_BW true -#define GxEPD2_213_flex_IS_BW true -#define GxEPD2_213_M21_IS_BW true -#define GxEPD2_213_T5D_IS_BW true -#define GxEPD2_213_BN_IS_BW true -#define GxEPD2_213_GDEY0213B74_IS_BW true -#define GxEPD2_260_IS_BW true -#define GxEPD2_260_M01_IS_BW true -#define GxEPD2_266_BN_IS_BW true -#define GxEPD2_266_GDEY0266T90_IS_BW true -#define GxEPD2_270_IS_BW true -#define GxEPD2_270_GDEY027T91_IS_BW true -#define GxEPD2_290_IS_BW true -#define GxEPD2_290_T5_IS_BW true -#define GxEPD2_290_T5D_IS_BW true -#define GxEPD2_290_I6FD_IS_BW true -#define GxEPD2_290_T94_IS_BW true -#define GxEPD2_290_T94_V2_IS_BW true -#define GxEPD2_290_BS_IS_BW true -#define GxEPD2_290_M06_IS_BW true -#define GxEPD2_290_GDEY029T94_IS_BW true -#define GxEPD2_290_GDEY029T71H_IS_BW true -#define GxEPD2_310_GDEQ031T10_IS_BW true -#define GxEPD2_371_IS_BW true -#define GxEPD2_370_TC1_IS_BW true -#define GxEPD2_420_IS_BW true -#define GxEPD2_420_M01_IS_BW true -#define GxEPD2_420_GDEY042T81_IS_BW true -#define GxEPD2_420_GYE042A87_IS_BW true -#define GxEPD2_420_SE0420NQ04_IS_BW true -#define GxEPD2_426_GDEQ0426T82_IS_BW true -#define GxEPD2_579_GDEY0579T93_IS_BW true -#define GxEPD2_583_IS_BW true -#define GxEPD2_583_T8_IS_BW true -#define GxEPD2_583_GDEQ0583T31_IS_BW true -#define GxEPD2_750_IS_BW true -#define GxEPD2_750_T7_IS_BW true -#define GxEPD2_750_GDEY075T7_IS_BW true -#define GxEPD2_1020_GDEM102T91_IS_BW true -#define GxEPD2_1085_GDEM1085T51_IS_BW true -#define GxEPD2_1160_T91_IS_BW true -#define GxEPD2_1248_IS_BW true -#define GxEPD2_1330_GDEM133T91_IS_BW true -#define GxEPD2_it60_IS_BW true -#define GxEPD2_it60_1448x1072_IS_BW true -#define GxEPD2_it78_1872x1404_IS_BW true -#define GxEPD2_it103_1872x1404_IS_BW true -// 3-color e-papers -#define GxEPD2_154c_IS_3C true -#define GxEPD2_154_Z90c_IS_3C true -#define GxEPD2_213c_IS_3C true -#define GxEPD2_213_Z19c_IS_3C true -#define GxEPD2_213_Z98c_IS_3C true -#define GxEPD2_266c_IS_3C true -#define GxEPD2_270c_IS_3C true -#define GxEPD2_290c_IS_3C true -#define GxEPD2_290_Z13c_IS_3C true -#define GxEPD2_290_C90c_IS_3C true -#define GxEPD2_420c_IS_3C true -#define GxEPD2_420c_Z21_IS_3C true -#define GxEPD2_420c_GDEY042Z98_IS_3C true -#define GxEPD2_579c_GDEY0579Z93_IS_3C true -#define GxEPD2_583c_IS_3C true -#define GxEPD2_583c_Z83_IS_3C true -#define GxEPD2_583c_GDEQ0583Z31_IS_3C true -#define GxEPD2_750c_IS_3C true -#define GxEPD2_750c_Z08_IS_3C true -#define GxEPD2_750c_Z90_IS_3C true -#define GxEPD2_1160c_GDEY116Z91_IS_3C true -#define GxEPD2_1248c_IS_3C true -#define GxEPD2_1330c_GDEM133Z91_IS_3C true -// 4-color e-paper -#define GxEPD2_213c_GDEY0213F51_IS_4C true -#define GxEPD2_266c_GDEY0266F51H_IS_4C true -#define GxEPD2_290c_GDEY029F51H_IS_4C true -#define GxEPD2_300c_IS_4C true -#define GxEPD2_420c_GDEY0420F51_IS_4C true -#define GxEPD2_437c_IS_4C true -#define GxEPD2_0579c_GDEY0579F51_IS_4C true -#define GxEPD2_1160c_GDEY116F51_IS_4C true -// 7-color e-paper -#define GxEPD2_565c_IS_7C true -#define GxEPD2_565c_GDEP0565D90_IS_7C true -#define GxEPD2_730c_GDEY073D46_IS_7C true -#define GxEPD2_730c_ACeP_730_IS_7C true -#define GxEPD2_730c_GDEP073E01_IS_7C true - -#if defined(GxEPD2_DISPLAY_CLASS) && defined(GxEPD2_DRIVER_CLASS) -#define IS_GxEPD2_DRIVER(c, x) (c##x) -#define IS_GxEPD2_DRIVER_BW(x) IS_GxEPD2_DRIVER(x, _IS_BW) -#define IS_GxEPD2_DRIVER_3C(x) IS_GxEPD2_DRIVER(x, _IS_3C) -#define IS_GxEPD2_DRIVER_4C(x) IS_GxEPD2_DRIVER(x, _IS_4C) -#define IS_GxEPD2_DRIVER_7C(x) IS_GxEPD2_DRIVER(x, _IS_7C) -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_3C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_BW used with 3-color driver class" -#endif -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_4C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_BW used with 4-color driver class" -#endif -#if IS_GxEPD2_BW(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_7C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_BW used with 7-color driver class" -#endif -#if IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_BW(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_3C used with b/w driver class" -#endif -#if IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_4C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_3C used with 4-color driver class" -#endif -#if IS_GxEPD2_3C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_7C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_3C used with 7-color driver class" -#endif -#if IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_BW(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_4C used with b/w driver class" -#endif -#if IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_3C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_4C used with 3-color driver class" -#endif -#if IS_GxEPD2_4C(GxEPD2_DISPLAY_CLASS) && IS_GxEPD2_DRIVER_7C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_4C used with 7-color driver class" -#endif -#if IS_GxEPD2_7C(GxEPD2_DISPLAY_CLASS) && !IS_GxEPD2_DRIVER_7C(GxEPD2_DRIVER_CLASS) -#error "GxEPD2_7C used with less colors driver class" -#endif -#if !IS_GxEPD2_DRIVER_BW(GxEPD2_DRIVER_CLASS) && !IS_GxEPD2_DRIVER_3C(GxEPD2_DRIVER_CLASS) && !IS_GxEPD2_DRIVER_4C(GxEPD2_DRIVER_CLASS) && !IS_GxEPD2_DRIVER_7C(GxEPD2_DRIVER_CLASS) -#error "neither BW nor 3C nor 4C nor 7C kind defined for driver class (error in GxEPD2_selection_check.h)" -#endif - -#endif diff --git a/examples/GxEPD2_WiFi_Example/GxEPD2_wiring_examples.h b/examples/GxEPD2_WiFi_Example/GxEPD2_wiring_examples.h deleted file mode 100644 index 7b077d5..0000000 --- a/examples/GxEPD2_WiFi_Example/GxEPD2_wiring_examples.h +++ /dev/null @@ -1,119 +0,0 @@ -// Display Library example for SPI e-paper panels from Dalian Good Display and boards from Waveshare. -// Requires HW SPI and Adafruit_GFX. Caution: the e-paper panels require 3.3V supply AND data lines! -// -// Display Library based on Demo Example from Good Display: https://www.good-display.com/companyfile/32/ -// -// Author: Jean-Marc Zingg -// -// Version: see library.properties -// -// Library: https://github.com/ZinggJM/GxEPD2 - -// Supporting Arduino Forum Topics (closed, read only): -// Good Display ePaper for Arduino: https://forum.arduino.cc/t/good-display-epaper-for-arduino/419657 -// Waveshare e-paper displays with SPI: https://forum.arduino.cc/t/waveshare-e-paper-displays-with-spi/467865 -// -// Add new topics in https://forum.arduino.cc/c/using-arduino/displays/23 for new questions and issues - -// mapping of Good Display Arduino UNO Development Kit DEArduino-L, e.g. to DESPI-C02 -// BUSY -> 4, RES -> 5, D/C -> 6, CS-> 7, SCK -> 13, SDI -> 11 - -// mapping of Good Display ESP8266 Development Kit ESP8266-L, e.g. to DESPI-C02 -// BUSY -> GPIO16, RES -> GPIO5, D/C -> GPIO4, CS-> GPIO2, SCK -> GPIO14, SDI -> GPIO13 - -// mapping of Good Display ESP32 Development Kit ESP32-L, e.g. to DESPI-C02 -// BUSY -> GPIO13, RES -> GPIO12, D/C -> GPIO14, CS-> GPIO27, SCK -> GPIO18, SDI -> GPIO23 - -// mapping of Good Display STM32 Development Kit DESPI-L, e.g. to DESPI-C02 -// BUSY -> PE13, RES -> PE14, D/C -> PE14, CS-> PD8, SCK -> PD9, SDI -> PD10 -// needs jumpers from PA5 (PIN_SPI_SCK) to SCK for EPD and PA7 (PIN_SPI_MOSI) to SDI for EPD. PD9 and PD10 are not HW SPI capable. -// BUSY -> PE13, RES -> PE14, D/C -> PE14, CS-> PD8, SCK -> PA5, SDI -> PA7 // for HW SPI with GxEPD2 - -// connection suggestions concerning Waveshare e-paper HAT Rev 2.3: -// DON'T FORGET to connect the PWR pin to VCC, to enable power to the board. -// RST is no longer used to disable power to the board, as with earlier revisions. -// Note, for 3.3V processors, no level converters are needed. Use DESPI-C02 instead. Uses less power. -// See https://www.buyepaper.com/products/development-kit-connection-adapter-board-for-eaper-display-demo-kit - -// 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 -// NOTE: connect 3.3k pull-down from D8 to GND if your board or shield has level converters -// NOTE for ESP8266: using SS (GPIO15) for CS may cause boot mode problems, use different pin in case, or 3.3k pull-down -// NOTE: connect 1k pull-up from D4 (RST) to 3.3V if your board or shield has the "clever" reset circuit, or use a different pin - -// 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 -// NOTE: connect 3.3k pull-down from GPIO15 to GND if your board or shield has level converters -// NOTE for ESP8266: using SS (GPIO15) for CS may cause boot mode problems, use different pin in case, or 3.3k pull-down -// NOTE: connect 1k pull-up from GPIO2 (RST) to 3.3V if your board or shield has the "clever" reset circuit, or use a different pin - -// mapping of Waveshare e-Paper ESP8266 Driver Board, new version -// BUSY -> GPIO5, RST -> GPIO2, DC -> GPIO4, CS -> GPIO15, CLK -> GPIO14, DIN -> GPIO13, GND -> GND, 3.3V -> 3.3V -// NOTE for ESP8266: using SS (GPIO15) for CS may cause boot mode problems, add a 3.3k pull-down in case -// the e-Paper ESP8266 Driver Board should have no boot mode issue, as it doesn't use level converters - -// mapping of Waveshare e-Paper ESP8266 Driver Board, old version -// BUSY -> GPIO16, RST -> GPIO5, DC -> GPIO4, CS -> GPIO15, CLK -> GPIO14, DIN -> GPIO13, GND -> GND, 3.3V -> 3.3V -// NOTE for ESP8266: using SS (GPIO15) for CS may cause boot mode problems, add a 3.3k pull-down in case -// the e-Paper ESP8266 Driver Board should have no boot mode issue, as it doesn't use level converters - -// 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 - -// mapping of Waveshare ESP32 Driver Board -// BUSY -> 25, RST -> 26, DC -> 27, CS-> 15, CLK -> 13, DIN -> 14 -// NOTE: this board uses "unusual" SPI pins and requires re-mapping of HW SPI to these pins in SPIClass -// see example GxEPD2_WS_ESP32_Driver.ino, it shows how this can be done easily - -// mapping suggestion for ESP32, e.g. LOLIN32 D32 PRO -// BUSY -> 15, RST -> 2, DC -> 0, CS -> 5, CLK -> SCK(18), DIN -> MOSI(23), GND -> GND, 3.3V -> 3.3V -// note: use explicit value for CS, as SS is re-defined to TF_CS(4) in pins_arduino.h for Board: "LOLIN D32 PRO" - -// mapping suggestion for ESP32, e.g. TTGO T8 ESP32-WROVER -// BUSY -> 4, RST -> 0, DC -> 2, CS -> SS(5), CLK -> SCK(18), DIN -> MOSI(23), GND -> GND, 3.3V -> 3.3V -// for use with Board: "ESP32 Dev Module": - -// mapping suggestion for ESP32S2, e.g. LOLIN ESP32 S2 mini, direct connection of DESPI-C02 -// BUSY -> 39, RST -> 37, DC -> 35, CS -> 33, CLK -> 18, DIN -> 16, GND -> GND, 3.3V -> 3.3V -// for use with Board: "LOLIN S2 MINI": - -// 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 AVR, Arduino Micro, Leonardo -// note: on Leonardo board HW SPI pins are on 6-pin ICSP header -// BUSY -> 7, RST -> 9, DC -> 8, CS-> 10, CLK -> 15, DIN -> 16 - -// mapping of Waveshare Universal e-Paper Raw Panel Driver Shield for Arduino / NUCLEO -// BUSY -> 7, RST -> 8, DC -> 9, 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, note: pin 77 is on board pin 10, SS is 10 -// BUSY -> 7, RST -> 9, DC -> 8, CS-> 10, CLK -> 76, DIN -> 75 -// SPI pins are on 6 pin 2x3 SPI header, no SS on SPI header! - -// mapping suggestion for Arduino MKR1000 or MKRZERO -// note: can't use SS on MKR1000: is defined as 24, should be 4 -// BUSY -> 5, RST -> 6, DC -> 7, CS-> 4, CLK -> 9, DIN -> 8 - -// mapping suggestion for Arduino Nano RP2040 Connect (Arduino MBED OS Nano Boards) -// BUSY -> 7, RST -> 9, DC -> 8, CS-> 10, CLK -> 13, DIN -> 11 - -// mapping suggestion for Raspberry Pi Pico RP2040 (Arduino MBED OS RP2040 Boards) -// BUSY -> 7, RST -> 9, DC -> 8, CS-> 5, CLK -> 18, DIN -> 19 - -// mapping of my proto board for Raspberry Pi Pico RP2040 (previous default SPI pins) -// BUSY -> 7, RST -> 9, DC -> 8, CS-> 5, CLK -> 2, DIN -> 3 - -// mapping of my new proto board like Waveshare Pico-ePaper-2.9 -// needs 10k pull-up on RST when used with Arduino MBED OS RP2040 Boards -// BUSY -> 13, RST -> 12, DC -> 8, CS-> 9, CLK -> 10, DIN -> 11 - -// mapping of Waveshare Pico-ePaper-2.9 -// BUSY -> 13, RST -> 12, DC -> 8, CS-> 9, CLK -> 10, DIN -> 11 diff --git a/extras/bitmaps/z0gs/screenshot.bmp b/extras/bitmaps/z0gs/screenshot.bmp new file mode 100644 index 0000000..44f4624 Binary files /dev/null and b/extras/bitmaps/z0gs/screenshot.bmp differ diff --git a/library.properties b/library.properties index 6567df4..6e6b8b6 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=GxEPD2 -version=1.6.0 +version=1.6.1 author=Jean-Marc Zingg maintainer=Jean-Marc Zingg sentence=Arduino Display Library for SPI E-Paper displays from Dalian Good Display and Waveshare. diff --git a/src/GxEPD2_4C.h b/src/GxEPD2_4C.h index 5a31a4a..77f5303 100644 --- a/src/GxEPD2_4C.h +++ b/src/GxEPD2_4C.h @@ -542,7 +542,7 @@ class GxEPD2_4C : public GxEPD2_GFX_BASE_CLASS else if ((green >= 0x8000) && (blue >= 0x8000)) cv4 = 0x01; // green, blue > white else if ((red >= 0x8000) && (green >= 0xC000)) cv4 = 0x02; // yellow else if ((red >= 0x8000) && (green >= 0x4000)) cv4 = 0x03; // orange > red - else if (red >= 0x8000) cv4 = 0x04; // red + else if (red >= 0x8000) cv4 = 0x03; // red else if (green >= 0x8000) cv4 = 0x00; // green > black else cv4 = 0x03; // blue }