mirror
/
esp32cam-demo
kopia lustrzana https://github.com/alanesq/esp32cam-demo
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update esp32cam-demo.ino

master
Alan 2022-01-18 10:54:55 +00:00 zatwierdzone przez GitHub
rodzic 2cae0d96d3
commit d2d5c7d352
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 18 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
esp32cam-demo.ino
Wyświetl plik

@ -893,7 +893,7 @@ bool handleImg() {
int imgToShow = imageCounter; // default to showing most recent file int imgToShow = imageCounter; // default to showing most recent file
// get image number from url parameter // get image number from url parameter
if (server.hasArg("img")) { if (server.hasArg("img") && sdcardPresent) {
String Tvalue = server.arg("img"); // read value String Tvalue = server.arg("img"); // read value
imgToShow = Tvalue.toInt(); // convert string to int imgToShow = Tvalue.toInt(); // convert string to int
if (imgToShow < 1 || imgToShow > imageCounter) imgToShow = imageCounter; // validate image number if (imgToShow < 1 || imgToShow > imageCounter) imgToShow = imageCounter; // validate image number
@ -912,20 +912,33 @@ bool handleImg() {
pRes = 1; // flag sucess pRes = 1; // flag sucess
} else { } else {
if (serialDebug) Serial.println("Error: image file not found"); if (serialDebug) Serial.println("Error: image file not found");
WiFiClient client = server.client(); // open link with client sendHeader(client, "Display stored image");
client.write("<!DOCTYPE html> <html> <body>\n");
client.write("<p>Error: Image not found</p></html>\n"); client.write("<p>Error: Image not found</p></html>\n");
delay(3); client.write("<br><a href='/'>Return</a>\n"); // link back
client.stop(); sendFooter(client); // close web page
} }
} }
// if stored in SPIFFS // if stored in SPIFFS
if (!sdcardPresent) { if (!sdcardPresent) {
if (serialDebug) Serial.println("Displaying image from spiffs"); if (serialDebug) Serial.println("Displaying image from spiffs");
// check file exists
if (!SPIFFS.exists(spiffsFilename)) {
sendHeader(client, "Display stored image");
client.write("Error: No image found to display\n");
client.write("<br><a href='/'>Return</a>\n"); // link back
sendFooter(client); // close web page
return 0;
}
File f = SPIFFS.open(spiffsFilename, "r"); // read file from spiffs File f = SPIFFS.open(spiffsFilename, "r"); // read file from spiffs
if (!f) { if (!f) {
if (serialDebug) Serial.println("Error reading " + spiffsFilename); if (serialDebug) Serial.println("Error reading " + spiffsFilename);
sendHeader(client, "Display stored image");
client.write("Error reading file from Spiffs\n");
client.write("<br><a href='/'>Return</a>\n"); // link back
sendFooter(client); // close web page
} }
else { else {
size_t sent = server.streamFile(f, "image/jpeg"); // send file to web page size_t sent = server.streamFile(f, "image/jpeg"); // send file to web page