diff --git a/v58/ESP32-CAM-Video-Recorder-junior-58x.8.ino b/v58/ESP32-CAM-Video-Recorder-junior-58x.8.ino new file mode 100644 index 0000000..4171239 --- /dev/null +++ b/v58/ESP32-CAM-Video-Recorder-junior-58x.8.ino @@ -0,0 +1,2381 @@ +/* + + ESP32-CAM-Video-Recorder-junior + + This program records an mjpeg avi video to the sd card of an ESP32-CAM. + + + It is the junior version of https://github.com/jameszah/ESP32-CAM-Video-Recorder + which has 100 other features of wifi, streaming video, http control, telegram updates, pir control, + touch control, ftp downloads, .... and other things that make it very big and complex. + + Just set a few parameters, compile and download, and it will record on power-on, until sd is full, or power-off. + Then pull out the sd and move it to your computer, and you will see all but the last file avi which died during the unplug. + + The files will have the name such as: + + desklens10.003.avi + + "desklens" is your devname + 10 - is a number stored in eprom that will increase everytime your device boots + 3 - is the 3rd file created during the current boot + + Small red led on the back blinks with every frame. + + + by James Zahary Sep 12, 2020 + jamzah.plc@gmail.com + + - v50 apr 13, 2021 - tidy + - v50lpmod apr 28, 2021 - shut off low power modem + - v53 jul 8, 2021 - get rid on no wifi message cloggoing up log file + - v56 dec 23, 2021 - tzchar to 60 bytes + - add esp32 sd filemanager to download files + - v57 dec 28, 2021 - final changes to https://github.com/jameszah/ESPxWebFlMgr/tree/master/esp32_sd_file_manager + - v58 dec 30, 2021 - changes for Arduino 1.8.19 and esp32 Board Library 2.0.2 + jan 12, 2022 - add dates to file manager + - add simple version of config.txt configuration + + https://github.com/jameszah/ESP32-CAM-Video-Recorder-junior + + jameszah/ESP32-CAM-Video-Recorder-junior is licensed under the + GNU General Public License v3.0 + + The is Arduino code, with standard setup for ESP32-CAM + - Board ESP32 Wrover Module + - Partition Scheme Huge APP (3MB No OTA) + - or with AI Thinker ESP32-CAM + + Needs these libraries or better: + + ArduinoJson 6.18.5 by Benoit Blanchon + WiFiManager 2.05-beat by tablatronix + + Compiled with Arduino 1.8.19, and esp32-arduino core version 2.0.2, on Jan 12, 2022 + + + Using library FS at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\FS +Using library SD_MMC at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\SD_MMC +Using library EEPROM at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\EEPROM +Using library WiFi at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\WiFi +Using library WiFiManager at version 2.0.5-beta in folder: C:\ArduinoPortable\arduino-1.8.19\portable\sketchbook\libraries\WiFiManager +Using library Update at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\Update +Using library WebServer at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\WebServer +Using library DNSServer at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\DNSServer +Using library ESPmDNS at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\ESPmDNS +Using library HTTPClient at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\HTTPClient +Using library WiFiClientSecure at version 2.0.0 in folder: C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2\libraries\WiFiClientSecure +"C:\\ArduinoPortable\\arduino-1.8.19\\portable\\packages\\esp32\\tools\\xtensa-esp32-elf-gcc\\gcc8_4_0-esp-2021r2/bin/xtensa-esp32-elf-size" -A "C:\\Users\\James\\AppData\\Local\\Temp\\arduino_build_568185/ESP32-CAM-Video-Recorder-junior-58x.8.ino.elf" +Sketch uses 1060501 bytes (33%) of program storage space. Maximum is 3145728 bytes. +Global variables use 59268 bytes (18%) of dynamic memory, leaving 268412 bytes for local variables. Maximum is 327680 bytes. +C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\tools\esptool_py\3.1.0/esptool.exe --chip esp32 --port COM7 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0xe000 C:\ArduinoPortable\arduino-1.8.19\portable\packages\esp32\hardware\esp32\2.0.2/tools/partitions/boot_app0.bin 0x1000 C:\Users\James\AppData\Local\Temp\arduino_build_568185/ESP32-CAM-Video-Recorder-junior-58x.8.ino.bootloader.bin 0x10000 C:\Users\James\AppData\Local\Temp\arduino_build_568185/ESP32-CAM-Video-Recorder-junior-58x.8.ino.bin 0x8000 C:\Users\James\AppData\Local\Temp\arduino_build_568185/ESP32-CAM-Video-Recorder-junior-58x.8.ino.partitions.bin + + +*/ + +//#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE +#include "esp_log.h" +#include "esp_http_server.h" +#include "esp_camera.h" +#include "sensor.h" +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// user edits here: + +static const char vernum[] = "v58"; +char devname[30]; +String devstr = "desklens"; + +int IncludeInternet = 0; // 0 for no internet, 1 for time only, 2 streaming with WiFiMan, 3 ssid in file, 4 default internet on and file + + +const char* ssid = "jzjzjz"; +const char* password = "jzjzjz"; + + + +// https://sites.google.com/a/usapiens.com/opnode/time-zones -- find your timezone here +String TIMEZONE = "GMT0BST,M3.5.0/01,M10.5.0/02"; +//String TIMEZONE = "MST7MDT,M3.2.0/2:00:00,M11.1.0/2:00:00"; +#define Lots_of_Stats 1 + +int framesize = FRAMESIZE_HD; +int quality = 12; +int framesizeconfig = FRAMESIZE_UXGA; +int qualityconfig = 5; +int buffersconfig = 3; +int avi_length = 1800; // how long a movie in seconds -- 1800 sec = 30 min +int frame_interval = 0; // record at full speed +int speed_up_factor = 1; // play at realtime +int stream_delay = 500; // minimum of 500 ms delay between frames +int MagicNumber = 12; // change this number to reset the eprom in your esp32 for file numbers + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +bool configfile = false; +bool InternetOff = true; +bool reboot_now = false; +String cssid; +String cpass; +String czone; + +TaskHandle_t the_camera_loop_task; +TaskHandle_t the_sd_loop_task; +TaskHandle_t the_streaming_loop_task; + +static SemaphoreHandle_t wait_for_sd; +static SemaphoreHandle_t sd_go; + +long current_frame_time; +long last_frame_time; + + +// https://github.com/espressif/esp32-camera/issues/182 +#define fbs 8 // was 64 -- how many kb of static ram for psram -> sram buffer for sd write +uint8_t framebuffer_static[fbs * 1024 + 20]; + +// CAMERA_MODEL_AI_THINKER +#define PWDN_GPIO_NUM 32 +#define RESET_GPIO_NUM -1 +#define XCLK_GPIO_NUM 0 +#define SIOD_GPIO_NUM 26 +#define SIOC_GPIO_NUM 27 +#define Y9_GPIO_NUM 35 +#define Y8_GPIO_NUM 34 +#define Y7_GPIO_NUM 39 +#define Y6_GPIO_NUM 36 +#define Y5_GPIO_NUM 21 +#define Y4_GPIO_NUM 19 +#define Y3_GPIO_NUM 18 +#define Y2_GPIO_NUM 5 +#define VSYNC_GPIO_NUM 25 +#define HREF_GPIO_NUM 23 +#define PCLK_GPIO_NUM 22 + +camera_fb_t * fb_curr = NULL; +camera_fb_t * fb_next = NULL; + +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "esp_system.h" +#include "nvs_flash.h" +#include "nvs.h" +#include "soc/soc.h" +#include "soc/cpu.h" +#include "soc/rtc_cntl_reg.h" + +static esp_err_t cam_err; +float most_recent_fps = 0; +int most_recent_avg_framesize = 0; + +uint8_t* framebuffer; +int framebuffer_len; + +int first = 1; +long frame_start = 0; +long frame_end = 0; +long frame_total = 0; +long frame_average = 0; +long loop_average = 0; +long loop_total = 0; +long total_frame_data = 0; +long last_frame_length = 0; +int done = 0; +long avi_start_time = 0; +long avi_end_time = 0; +int start_record = 0; +int start_record_2nd_opinion = -2; +int start_record_1st_opinion = -1; + +int we_are_already_stopped = 0; +long total_delay = 0; +long bytes_before_last_100_frames = 0; +long time_before_last_100_frames = 0; + +long time_in_loop = 0; +long time_in_camera = 0; +long time_in_sd = 0; +long time_in_good = 0; +long time_total = 0; +long time_in_web1 = 0; +long time_in_web2 = 0; +long delay_wait_for_sd = 0; +long wait_for_cam = 0; + +int do_it_now = 0; + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// Avi Writer Stuff here + + +// MicroSD +#include "driver/sdmmc_host.h" +#include "driver/sdmmc_defs.h" +#include "sdmmc_cmd.h" +#include "esp_vfs_fat.h" +#include "FS.h" +#include + +File logfile; +File avifile; +File idxfile; + +char avi_file_name[100]; + +static int i = 0; +uint16_t frame_cnt = 0; +uint16_t remnant = 0; +uint32_t length = 0; +uint32_t startms; +uint32_t elapsedms; +uint32_t uVideoLen = 0; + +int bad_jpg = 0; +int extend_jpg = 0; +int normal_jpg = 0; + +int file_number = 0; +int file_group = 0; +long boot_time = 0; + +long totalp; +long totalw; + +#define BUFFSIZE 512 + +uint8_t buf[BUFFSIZE]; + +#define AVIOFFSET 240 // AVI main header length + +unsigned long movi_size = 0; +unsigned long jpeg_size = 0; +unsigned long idx_offset = 0; + +uint8_t zero_buf[4] = {0x00, 0x00, 0x00, 0x00}; +uint8_t dc_buf[4] = {0x30, 0x30, 0x64, 0x63}; // "00dc" +uint8_t dc_and_zero_buf[8] = {0x30, 0x30, 0x64, 0x63, 0x00, 0x00, 0x00, 0x00}; + +uint8_t avi1_buf[4] = {0x41, 0x56, 0x49, 0x31}; // "AVI1" +uint8_t idx1_buf[4] = {0x69, 0x64, 0x78, 0x31}; // "idx1" + + +struct frameSizeStruct { + uint8_t frameWidth[2]; + uint8_t frameHeight[2]; +}; + +// data structure from here https://github.com/s60sc/ESP32-CAM_MJPEG2SD/blob/master/avi.cpp, extended for ov5640 + +static const frameSizeStruct frameSizeData[] = { + {{0x60, 0x00}, {0x60, 0x00}}, // FRAMESIZE_96X96, // 96x96 + {{0xA0, 0x00}, {0x78, 0x00}}, // FRAMESIZE_QQVGA, // 160x120 + {{0xB0, 0x00}, {0x90, 0x00}}, // FRAMESIZE_QCIF, // 176x144 + {{0xF0, 0x00}, {0xB0, 0x00}}, // FRAMESIZE_HQVGA, // 240x176 + {{0xF0, 0x00}, {0xF0, 0x00}}, // FRAMESIZE_240X240, // 240x240 + {{0x40, 0x01}, {0xF0, 0x00}}, // FRAMESIZE_QVGA, // 320x240 framessize + {{0x90, 0x01}, {0x28, 0x01}}, // FRAMESIZE_CIF, // 400x296 bytes per buffer required in psram - quality must be higher number (lower quality) than config quality + {{0xE0, 0x01}, {0x40, 0x01}}, // FRAMESIZE_HVGA, // 480x320 low qual med qual high quality + {{0x80, 0x02}, {0xE0, 0x01}}, // FRAMESIZE_VGA, // 640x480 8 11+ ## 6-10 ## 0-5 indoor(56,COUNT=3) (56,COUNT=2) (56,count=1) + // 38,400 61,440 153,600 + {{0x20, 0x03}, {0x58, 0x02}}, // FRAMESIZE_SVGA, // 800x600 9 240,000 + {{0x00, 0x04}, {0x00, 0x03}}, // FRAMESIZE_XGA, // 1024x768 10 + {{0x00, 0x05}, {0xD0, 0x02}}, // FRAMESIZE_HD, // 1280x720 11 115,200 184,320 460,800 (11)50.000 25.4fps (11)50.000 12fps (11)50,000 12.7fps + {{0x00, 0x05}, {0x00, 0x04}}, // FRAMESIZE_SXGA, // 1280x1024 12 + {{0x40, 0x06}, {0xB0, 0x04}}, // FRAMESIZE_UXGA, // 1600x1200 13 240,000 384,000 960,000 + // 3MP Sensors + {{0x80, 0x07}, {0x38, 0x04}}, // FRAMESIZE_FHD, // 1920x1080 14 259,200 414,720 1,036,800 (11)210,000 5.91fps + {{0xD0, 0x02}, {0x00, 0x05}}, // FRAMESIZE_P_HD, // 720x1280 15 + {{0x60, 0x03}, {0x00, 0x06}}, // FRAMESIZE_P_3MP, // 864x1536 16 + {{0x00, 0x08}, {0x00, 0x06}}, // FRAMESIZE_QXGA, // 2048x1536 17 393,216 629,146 1,572,864 + // 5MP Sensors + {{0x00, 0x0A}, {0xA0, 0x05}}, // FRAMESIZE_QHD, // 2560x1440 18 460,800 737,280 1,843,200 (11)400,000 3.5fps (11)330,000 1.95fps + {{0x00, 0x0A}, {0x40, 0x06}}, // FRAMESIZE_WQXGA, // 2560x1600 19 + {{0x38, 0x04}, {0x80, 0x07}}, // FRAMESIZE_P_FHD, // 1080x1920 20 + {{0x00, 0x0A}, {0x80, 0x07}} // FRAMESIZE_QSXGA, // 2560x1920 21 614,400 983,040 2,457,600 (15)425,000 3.25fps (15)382,000 1.7fps (15)385,000 1.7fps + +}; + +const int avi_header[AVIOFFSET] PROGMEM = { + 0x52, 0x49, 0x46, 0x46, 0xD8, 0x01, 0x0E, 0x00, 0x41, 0x56, 0x49, 0x20, 0x4C, 0x49, 0x53, 0x54, + 0xD0, 0x00, 0x00, 0x00, 0x68, 0x64, 0x72, 0x6C, 0x61, 0x76, 0x69, 0x68, 0x38, 0x00, 0x00, 0x00, + 0xA0, 0x86, 0x01, 0x00, 0x80, 0x66, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x02, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x49, 0x53, 0x54, 0x84, 0x00, 0x00, 0x00, + 0x73, 0x74, 0x72, 0x6C, 0x73, 0x74, 0x72, 0x68, 0x30, 0x00, 0x00, 0x00, 0x76, 0x69, 0x64, 0x73, + 0x4D, 0x4A, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x74, 0x72, 0x66, + 0x28, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, + 0x01, 0x00, 0x18, 0x00, 0x4D, 0x4A, 0x50, 0x47, 0x00, 0x84, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x4E, 0x46, 0x4F, + 0x10, 0x00, 0x00, 0x00, 0x6A, 0x61, 0x6D, 0x65, 0x73, 0x7A, 0x61, 0x68, 0x61, 0x72, 0x79, 0x20, + 0x76, 0x35, 0x38, 0x20, 0x4C, 0x49, 0x53, 0x54, 0x00, 0x01, 0x0E, 0x00, 0x6D, 0x6F, 0x76, 0x69, +}; + + +// +// Writes an uint32_t in Big Endian at current file position +// +static void inline print_quartet(unsigned long i, File fd) { + + uint8_t y[4]; + y[0] = i % 0x100; + y[1] = (i >> 8) % 0x100; + y[2] = (i >> 16) % 0x100; + y[3] = (i >> 24) % 0x100; + size_t i1_err = fd.write(y , 4); +} + +// +// Writes 2 uint32_t in Big Endian at current file position +// +static void inline print_2quartet(unsigned long i, unsigned long j, File fd) { + + uint8_t y[8]; + y[0] = i % 0x100; + y[1] = (i >> 8) % 0x100; + y[2] = (i >> 16) % 0x100; + y[3] = (i >> 24) % 0x100; + y[4] = j % 0x100; + y[5] = (j >> 8) % 0x100; + y[6] = (j >> 16) % 0x100; + y[7] = (j >> 24) % 0x100; + size_t i1_err = fd.write(y , 8); +} + +// +// if we have no camera, or sd card, then flash rear led on and off to warn the human SOS - SOS +// +void major_fail() { + + Serial.println(" "); + logfile.close(); + + for (int i = 0; i < 10; i++) { // 10 loops or about 100 seconds then reboot + for (int j = 0; j < 3; j++) { + digitalWrite(33, LOW); delay(150); + digitalWrite(33, HIGH); delay(150); + } + delay(1000); + + for (int j = 0; j < 3; j++) { + digitalWrite(33, LOW); delay(500); + digitalWrite(33, HIGH); delay(500); + } + delay(1000); + Serial.print("Major Fail "); Serial.print(i); Serial.print(" / "); Serial.println(10); + } + + ESP.restart(); +} + + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// + +static void config_camera() { + + camera_config_t config; + + //Serial.println("config camera"); + + config.ledc_channel = LEDC_CHANNEL_0; + config.ledc_timer = LEDC_TIMER_0; + config.pin_d0 = Y2_GPIO_NUM; + config.pin_d1 = Y3_GPIO_NUM; + config.pin_d2 = Y4_GPIO_NUM; + config.pin_d3 = Y5_GPIO_NUM; + config.pin_d4 = Y6_GPIO_NUM; + config.pin_d5 = Y7_GPIO_NUM; + config.pin_d6 = Y8_GPIO_NUM; + config.pin_d7 = Y9_GPIO_NUM; + config.pin_xclk = XCLK_GPIO_NUM; + config.pin_pclk = PCLK_GPIO_NUM; + config.pin_vsync = VSYNC_GPIO_NUM; + config.pin_href = HREF_GPIO_NUM; + config.pin_sscb_sda = SIOD_GPIO_NUM; + config.pin_sscb_scl = SIOC_GPIO_NUM; + config.pin_pwdn = PWDN_GPIO_NUM; + config.pin_reset = RESET_GPIO_NUM; + + config.xclk_freq_hz = 20000000; // 10000000 or 20000000 -- 100 is faster with v1.04 // 200 is faster with v1.06 // 16500000 is an option + + config.pixel_format = PIXFORMAT_JPEG; + + Serial.printf("Frame config %d, quality config %d, buffers config %d\n", framesizeconfig, qualityconfig, buffersconfig); + config.frame_size = (framesize_t)framesizeconfig; + config.jpeg_quality = qualityconfig; + config.fb_count = buffersconfig; + + + if (Lots_of_Stats) { + Serial.printf("Before camera config ..."); + Serial.printf("Internal Total heap %d, internal Free Heap %d, ", ESP.getHeapSize(), ESP.getFreeHeap()); + Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram()); + } + esp_err_t cam_err = ESP_FAIL; + int attempt = 5; + while (attempt && cam_err != ESP_OK) { + cam_err = esp_camera_init(&config); + if (cam_err != ESP_OK) { + Serial.printf("Camera init failed with error 0x%x", cam_err); + digitalWrite(PWDN_GPIO_NUM, 1); + delay(500); + digitalWrite(PWDN_GPIO_NUM, 0); // power cycle the camera (OV2640) + attempt--; + } + } + + if (Lots_of_Stats) { + Serial.printf("After camera config ..."); + Serial.printf("Internal Total heap %d, internal Free Heap %d, ", ESP.getHeapSize(), ESP.getFreeHeap()); + Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram()); + } + + if (cam_err != ESP_OK) { + major_fail(); + } + + sensor_t * ss = esp_camera_sensor_get(); + + ///ss->set_hmirror(ss, 1); // 0 = disable , 1 = enable + ///ss->set_vflip(ss, 1); // 0 = disable , 1 = enable + + Serial.printf("\nCamera started correctly, Type is %x (hex) of 9650, 7725, 2640, 3660, 5640\n\n", ss->id.PID); + + if (ss->id.PID == OV5640_PID ) { + //Serial.println("56 - going mirror"); + ss->set_hmirror(ss, 1); // 0 = disable , 1 = enable + } else { + ss->set_hmirror(ss, 0); // 0 = disable , 1 = enable + } + + ss->set_quality(ss, quality); + ss->set_framesize(ss, (framesize_t)framesize); + + ss->set_brightness(ss, 1); //up the blightness just a bit + ss->set_saturation(ss, -2); //lower the saturation + + delay(800); + for (int j = 0; j < 4; j++) { + camera_fb_t * fb = esp_camera_fb_get(); // get_good_jpeg(); + if (!fb) { + Serial.println("Camera Capture Failed"); + } else { + Serial.print("Pic, len="); Serial.print(fb->len); + Serial.printf(", new fb %X\n", (long)fb->buf); + esp_camera_fb_return(fb); + delay(50); + } + } +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// + + +static esp_err_t init_sdcard() +{ + + int succ = SD_MMC.begin("/sdcard", true); + if (succ) { + Serial.printf("SD_MMC Begin: %d\n", succ); + uint8_t cardType = SD_MMC.cardType(); + Serial.print("SD_MMC Card Type: "); + if (cardType == CARD_MMC) { + Serial.println("MMC"); + } else if (cardType == CARD_SD) { + Serial.println("SDSC"); + } else if (cardType == CARD_SDHC) { + Serial.println("SDHC"); + } else { + Serial.println("UNKNOWN"); + } + + uint64_t cardSize = SD_MMC.cardSize() / (1024 * 1024); + Serial.printf("SD_MMC Card Size: %lluMB\n", cardSize); + + } else { + Serial.printf("Failed to mount SD card VFAT filesystem. \n"); + Serial.println("Do you have an SD Card installed?"); + Serial.println("Check pin 12 and 13, not grounded, or grounded with 10k resistors!\n\n"); + major_fail(); + } + + return ESP_OK; +} + +//File: simple.txt, Size: 2330 +#define simple_txt_len 2330 +//const uint8_t simple_txt[] PROGMEM = { +const char simple_txt[] PROGMEM = { + 0x64, 0x65, 0x73, 0x6B, 0x6C, 0x65, 0x6E, 0x73, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x63, 0x61, 0x6D, + 0x65, 0x72, 0x61, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x0D, 0x0A, 0x31, 0x31, 0x20, 0x20, 0x2F, 0x2F, + 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x20, 0x31, 0x31, 0x3D, 0x68, + 0x64, 0x0D, 0x0A, 0x31, 0x38, 0x30, 0x30, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x6C, 0x65, 0x6E, 0x67, + 0x74, 0x68, 0x20, 0x6F, 0x66, 0x20, 0x76, 0x69, 0x64, 0x65, 0x6F, 0x20, 0x69, 0x6E, 0x20, 0x73, + 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x0D, 0x0A, 0x30, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x69, 0x6E, + 0x74, 0x65, 0x72, 0x76, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x6D, 0x73, 0x20, 0x62, 0x65, 0x74, 0x77, + 0x65, 0x65, 0x6E, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x72, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x72, + 0x61, 0x6D, 0x65, 0x73, 0x20, 0x0D, 0x0A, 0x31, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x75, 0x70, 0x20, 0x2D, 0x20, 0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6C, 0x79, 0x20, + 0x66, 0x72, 0x61, 0x6D, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, 0x0D, 0x0A, 0x30, 0x20, 0x20, 0x2F, + 0x2F, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, 0x64, 0x65, 0x6C, 0x61, 0x79, 0x20, 0x2D, 0x20, + 0x6D, 0x73, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6E, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, + 0x6D, 0x69, 0x6E, 0x67, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x73, 0x0D, 0x0A, 0x47, 0x4D, 0x54, + 0x20, 0x2F, 0x2F, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x7A, 0x6F, 0x6E, 0x65, 0x0D, 0x0A, 0x73, 0x73, + 0x69, 0x64, 0x31, 0x32, 0x33, 0x34, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, + 0x77, 0x69, 0x66, 0x69, 0x20, 0x6E, 0x61, 0x6D, 0x65, 0x0D, 0x0A, 0x6D, 0x72, 0x70, 0x65, 0x61, + 0x6E, 0x75, 0x74, 0x20, 0x20, 0x2F, 0x2F, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6F, 0x72, 0x64, 0x0D, 0x0A, 0x0D, 0x0A, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, + 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, + 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, + 0x7E, 0x7E, 0x7E, 0x0D, 0x0A, 0x41, 0x62, 0x6F, 0x76, 0x65, 0x20, 0x6C, 0x69, 0x6E, 0x65, 0x73, + 0x20, 0x2D, 0x20, 0x31, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x70, 0x65, 0x72, 0x20, 0x6C, 0x69, + 0x6E, 0x65, 0x20, 0x66, 0x6F, 0x6C, 0x6C, 0x6F, 0x77, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x32, + 0x20, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x0D, 0x0A, 0x0D, 0x0A, 0x64, 0x65, 0x73, 0x6B, 0x6C, + 0x65, 0x6E, 0x73, 0x20, 0x2D, 0x20, 0x63, 0x61, 0x6D, 0x65, 0x72, 0x61, 0x20, 0x6E, 0x61, 0x6D, + 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x2C, 0x20, 0x6D, 0x64, 0x6E, + 0x73, 0x2C, 0x20, 0x65, 0x74, 0x63, 0x0D, 0x0A, 0x31, 0x31, 0x20, 0x2D, 0x20, 0x66, 0x72, 0x61, + 0x6D, 0x65, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x31, 0x31, 0x20, 0x69, 0x73, 0x20, 0x68, 0x64, 0x20, + 0x37, 0x32, 0x30, 0x70, 0x20, 0x31, 0x32, 0x38, 0x30, 0x78, 0x37, 0x32, 0x30, 0x0D, 0x0A, 0x20, + 0x2D, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6F, 0x76, 0x32, 0x36, 0x34, 0x30, 0x20, 0x63, 0x61, 0x6D, + 0x65, 0x72, 0x61, 0x20, 0x38, 0x3D, 0x76, 0x67, 0x61, 0x2C, 0x20, 0x39, 0x3D, 0x73, 0x76, 0x67, + 0x61, 0x2C, 0x20, 0x31, 0x30, 0x3D, 0x78, 0x67, 0x61, 0x2C, 0x20, 0x31, 0x31, 0x3D, 0x68, 0x64, + 0x2C, 0x20, 0x31, 0x32, 0x3D, 0x73, 0x78, 0x67, 0x61, 0x2C, 0x20, 0x31, 0x33, 0x3D, 0x75, 0x78, + 0x67, 0x61, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6F, 0x76, 0x35, 0x36, 0x34, + 0x30, 0x20, 0x63, 0x61, 0x6D, 0x65, 0x72, 0x61, 0x20, 0x61, 0x64, 0x64, 0x20, 0x31, 0x34, 0x3D, + 0x66, 0x68, 0x64, 0x2C, 0x20, 0x31, 0x37, 0x3D, 0x71, 0x78, 0x67, 0x61, 0x2C, 0x20, 0x31, 0x38, + 0x3D, 0x71, 0x68, 0x64, 0x2C, 0x20, 0x32, 0x31, 0x3D, 0x71, 0x73, 0x78, 0x67, 0x61, 0x0D, 0x0A, + 0x31, 0x38, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x6C, 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x6F, 0x66, + 0x20, 0x76, 0x69, 0x64, 0x65, 0x6F, 0x20, 0x69, 0x6E, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, + 0x73, 0x0D, 0x0A, 0x30, 0x20, 0x2D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6C, 0x20, + 0x2D, 0x20, 0x6D, 0x69, 0x6C, 0x6C, 0x69, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x20, 0x62, 0x65, + 0x74, 0x77, 0x65, 0x65, 0x6E, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x73, 0x20, 0x66, 0x6F, 0x72, + 0x20, 0x72, 0x65, 0x63, 0x6F, 0x72, 0x64, 0x69, 0x6E, 0x67, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x30, + 0x20, 0x69, 0x73, 0x20, 0x61, 0x73, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, 0x61, 0x73, 0x20, 0x70, + 0x6F, 0x73, 0x73, 0x69, 0x62, 0x6C, 0x65, 0x20, 0x62, 0x6F, 0x75, 0x6E, 0x64, 0x20, 0x62, 0x79, + 0x20, 0x63, 0x61, 0x6D, 0x65, 0x72, 0x61, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x20, 0x6F, 0x72, + 0x20, 0x73, 0x64, 0x20, 0x77, 0x72, 0x69, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x73, 0x70, 0x65, 0x65, + 0x64, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x35, 0x30, 0x30, 0x20, 0x69, 0x73, 0x20, 0x32, 0x20, 0x66, + 0x72, 0x61, 0x6D, 0x65, 0x73, 0x20, 0x70, 0x65, 0x72, 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, + 0x20, 0x28, 0x73, 0x75, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x62, 0x6F, 0x75, + 0x6E, 0x64, 0x73, 0x29, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x31, 0x30, 0x30, 0x30, 0x30, 0x20, 0x69, + 0x73, 0x20, 0x30, 0x2E, 0x31, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x73, 0x20, 0x70, 0x65, 0x72, + 0x20, 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x20, 0x6F, 0x72, 0x20, 0x31, 0x30, 0x20, 0x73, 0x65, + 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x20, 0x70, 0x65, 0x72, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x0D, + 0x0A, 0x20, 0x2D, 0x20, 0x76, 0x67, 0x61, 0x20, 0x69, 0x73, 0x20, 0x6D, 0x61, 0x78, 0x20, 0x32, + 0x35, 0x20, 0x66, 0x70, 0x73, 0x2C, 0x20, 0x68, 0x64, 0x20, 0x69, 0x73, 0x20, 0x6D, 0x61, 0x78, + 0x20, 0x31, 0x32, 0x2E, 0x35, 0x20, 0x66, 0x70, 0x73, 0x2C, 0x20, 0x75, 0x78, 0x67, 0x61, 0x20, + 0x61, 0x74, 0x20, 0x31, 0x32, 0x2E, 0x35, 0x20, 0x66, 0x70, 0x73, 0x20, 0x65, 0x74, 0x63, 0x0D, + 0x0A, 0x31, 0x20, 0x2D, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x75, 0x70, 0x20, 0x2D, 0x20, 0x6D, + 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6C, 0x79, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x72, 0x61, 0x74, + 0x65, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x20, 0x75, 0x70, 0x20, 0x70, 0x6C, + 0x61, 0x79, 0x62, 0x61, 0x63, 0x6B, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x31, 0x20, 0x69, 0x73, + 0x20, 0x72, 0x65, 0x61, 0x6C, 0x74, 0x69, 0x6D, 0x65, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x32, + 0x34, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x70, 0x6C, 0x61, 0x79, 0x20, 0x61, 0x20, 0x31, 0x20, + 0x66, 0x70, 0x73, 0x20, 0x72, 0x65, 0x63, 0x6F, 0x72, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x61, 0x74, + 0x20, 0x32, 0x34, 0x20, 0x66, 0x70, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, + 0x63, 0x6F, 0x6D, 0x70, 0x75, 0x74, 0x65, 0x72, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x33, 0x30, + 0x30, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x70, 0x6C, 0x61, 0x79, 0x20, 0x31, 0x30, 0x20, 0x73, + 0x65, 0x63, 0x20, 0x70, 0x65, 0x72, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x20, 0x61, 0x74, 0x20, + 0x33, 0x30, 0x20, 0x66, 0x70, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, 0x63, + 0x6F, 0x6D, 0x70, 0x75, 0x74, 0x65, 0x72, 0x0D, 0x0A, 0x30, 0x20, 0x2D, 0x20, 0x73, 0x74, 0x72, + 0x65, 0x61, 0x6D, 0x64, 0x65, 0x6C, 0x61, 0x79, 0x20, 0x2D, 0x20, 0x6D, 0x69, 0x6C, 0x6C, 0x69, + 0x73, 0x65, 0x63, 0x6F, 0x6E, 0x64, 0x73, 0x20, 0x6F, 0x66, 0x20, 0x64, 0x65, 0x6C, 0x61, 0x79, + 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6E, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, 0x69, + 0x6E, 0x67, 0x20, 0x66, 0x72, 0x61, 0x6D, 0x65, 0x73, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x74, 0x68, + 0x69, 0x73, 0x20, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x73, 0x20, 0x79, 0x6F, 0x75, 0x20, 0x74, 0x6F, + 0x20, 0x73, 0x6C, 0x6F, 0x77, 0x20, 0x64, 0x6F, 0x77, 0x6E, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, + 0x6D, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x6F, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x62, 0x61, 0x74, + 0x74, 0x65, 0x72, 0x79, 0x20, 0x70, 0x6F, 0x77, 0x65, 0x72, 0x20, 0x0D, 0x0A, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x75, 0x73, + 0x61, 0x67, 0x65, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x61, 0x6C, 0x73, 0x6F, 0x20, 0x61, 0x6C, 0x6C, + 0x6F, 0x77, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x78, 0x65, 0x64, 0x20, 0x72, 0x61, 0x74, 0x65, + 0x20, 0x69, 0x66, 0x20, 0x79, 0x6F, 0x75, 0x20, 0x61, 0x72, 0x65, 0x20, 0x72, 0x65, 0x63, 0x6F, + 0x72, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, + 0x20, 0x61, 0x74, 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, 0x63, 0x6F, 0x6D, 0x70, 0x75, 0x74, 0x65, + 0x72, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x76, 0x67, 0x61, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x73, + 0x74, 0x72, 0x65, 0x61, 0x6D, 0x20, 0x61, 0x62, 0x6F, 0x75, 0x74, 0x20, 0x33, 0x30, 0x2D, 0x33, + 0x33, 0x20, 0x66, 0x70, 0x73, 0x20, 0x64, 0x65, 0x70, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x20, + 0x6F, 0x6E, 0x20, 0x77, 0x69, 0x66, 0x69, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x62, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x6E, 0x65, 0x73, 0x73, 0x20, 0x63, 0x6F, 0x6C, 0x6F, 0x72, 0x73, 0x20, 0x0D, 0x0A, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x6E, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6A, 0x70, 0x65, 0x67, 0x0D, + 0x0A, 0x20, 0x2D, 0x20, 0x68, 0x64, 0x20, 0x77, 0x69, 0x6C, 0x6C, 0x20, 0x73, 0x74, 0x72, 0x65, + 0x61, 0x6D, 0x20, 0x61, 0x62, 0x6F, 0x75, 0x74, 0x20, 0x31, 0x30, 0x2D, 0x31, 0x32, 0x20, 0x66, + 0x70, 0x73, 0x20, 0x0D, 0x0A, 0x20, 0x2D, 0x20, 0x75, 0x78, 0x67, 0x61, 0x20, 0x77, 0x69, 0x6C, + 0x6C, 0x20, 0x6F, 0x6E, 0x6C, 0x79, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, 0x20, 0x61, 0x74, + 0x20, 0x33, 0x20, 0x66, 0x70, 0x73, 0x20, 0x0D, 0x0A, 0x47, 0x4D, 0x54, 0x20, 0x2D, 0x20, 0x74, + 0x69, 0x6D, 0x65, 0x7A, 0x6F, 0x6E, 0x65, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x64, 0x61, 0x74, 0x65, + 0x73, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x73, 0x20, 0x6F, 0x6E, 0x20, 0x79, + 0x6F, 0x75, 0x72, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x73, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x6D, + 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x3A, 0x20, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, + 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2F, 0x32, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x2C, + 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x2F, 0x32, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x0D, + 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x65, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x3A, 0x20, 0x45, 0x53, + 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, + 0x2E, 0x31, 0x2E, 0x30, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, + 0x6C, 0x20, 0x65, 0x75, 0x72, 0x6F, 0x70, 0x65, 0x3A, 0x20, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, + 0x45, 0x53, 0x54, 0x2D, 0x32, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x32, 0x3A, + 0x30, 0x30, 0x3A, 0x30, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x33, + 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x55, 0x6C, 0x61, 0x61, + 0x6E, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x2C, 0x20, 0x4D, 0x6F, 0x6E, 0x67, 0x6F, 0x6C, 0x69, + 0x61, 0x3A, 0x20, 0x55, 0x4C, 0x41, 0x54, 0x2D, 0x38, 0x55, 0x4C, 0x41, 0x53, 0x54, 0x2C, 0x4D, + 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x32, 0x2C, 0x4D, 0x39, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x32, + 0x20, 0x0D, 0x0A, 0x20, 0x20, 0x2D, 0x20, 0x66, 0x69, 0x6E, 0x64, 0x20, 0x74, 0x69, 0x6D, 0x65, + 0x7A, 0x6F, 0x6E, 0x65, 0x20, 0x68, 0x65, 0x72, 0x65, 0x3A, 0x20, 0x0D, 0x0A, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, 0x2F, 0x73, 0x69, 0x74, 0x65, 0x73, 0x2E, + 0x67, 0x6F, 0x6F, 0x67, 0x6C, 0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x61, 0x2F, 0x75, 0x73, 0x61, + 0x70, 0x69, 0x65, 0x6E, 0x73, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x6F, 0x70, 0x6E, 0x6F, 0x64, 0x65, + 0x2F, 0x74, 0x69, 0x6D, 0x65, 0x2D, 0x7A, 0x6F, 0x6E, 0x65, 0x73, 0x0D, 0x0A, 0x73, 0x73, 0x69, + 0x64, 0x31, 0x32, 0x33, 0x34, 0x20, 0x2D, 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, 0x77, 0x69, 0x66, + 0x69, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x75, 0x73, 0x65, 0x72, 0x6E, 0x61, 0x6D, 0x65, 0x0D, + 0x0A, 0x20, 0x2D, 0x20, 0x65, 0x6E, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6B, 0x65, + 0x79, 0x77, 0x6F, 0x72, 0x64, 0x20, 0x22, 0x77, 0x69, 0x66, 0x69, 0x6D, 0x61, 0x6E, 0x22, 0x20, + 0x74, 0x6F, 0x20, 0x6C, 0x61, 0x75, 0x6E, 0x63, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x57, 0x69, + 0x46, 0x69, 0x4D, 0x61, 0x6E, 0x61, 0x67, 0x65, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x6F, 0x6E, + 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x20, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x79, 0x6F, + 0x75, 0x72, 0x20, 0x73, 0x73, 0x69, 0x64, 0x2F, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6F, 0x72, 0x64, + 0x20, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x65, 0x62, 0x20, 0x70, 0x6F, 0x72, 0x74, + 0x61, 0x6C, 0x20, 0x31, 0x39, 0x32, 0x2E, 0x31, 0x36, 0x38, 0x2E, 0x34, 0x2E, 0x31, 0x20, 0x6F, + 0x72, 0x20, 0x45, 0x53, 0x50, 0x33, 0x32, 0x2D, 0x43, 0x41, 0x4D, 0x0D, 0x0A, 0x20, 0x2D, 0x20, + 0x65, 0x6E, 0x74, 0x65, 0x72, 0x20, 0x6B, 0x65, 0x79, 0x77, 0x6F, 0x72, 0x64, 0x20, 0x22, 0x73, + 0x73, 0x69, 0x64, 0x31, 0x32, 0x33, 0x34, 0x22, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x6E, 0x6F, 0x20, + 0x77, 0x69, 0x66, 0x69, 0x0D, 0x0A, 0x6D, 0x72, 0x70, 0x65, 0x61, 0x6E, 0x75, 0x74, 0x20, 0x2D, + 0x20, 0x79, 0x6F, 0x75, 0x72, 0x20, 0x77, 0x69, 0x66, 0x69, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6F, 0x72, 0x64, 0x0D, 0x0A, 0x0D, 0x0A, 0x53, 0x6F, 0x75, 0x72, + 0x63, 0x65, 0x43, 0x6F, 0x64, 0x65, 0x3A, 0x20, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, + 0x2F, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x6A, 0x61, 0x6D, 0x65, + 0x73, 0x7A, 0x61, 0x68, 0x2F, 0x45, 0x53, 0x50, 0x33, 0x32, 0x2D, 0x43, 0x41, 0x4D, 0x2D, 0x56, + 0x69, 0x64, 0x65, 0x6F, 0x2D, 0x52, 0x65, 0x63, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x2D, 0x6A, 0x75, + 0x6E, 0x69, 0x6F, 0x72, 0x0D, 0x0A, 0x4F, 0x6E, 0x65, 0x2D, 0x43, 0x6C, 0x69, 0x63, 0x6B, 0x20, + 0x49, 0x6E, 0x73, 0x74, 0x61, 0x6C, 0x6C, 0x65, 0x72, 0x3A, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, + 0x3A, 0x2F, 0x2F, 0x6A, 0x61, 0x6D, 0x65, 0x73, 0x7A, 0x61, 0x68, 0x2E, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2E, 0x69, 0x6F, 0x2F, 0x45, 0x53, 0x50, 0x33, 0x32, 0x2D, 0x43, 0x41, 0x4D, 0x2D, + 0x56, 0x69, 0x64, 0x65, 0x6F, 0x43, 0x61, 0x6D, 0x2F, 0x0D, 0x0A, 0x4A, 0x61, 0x6D, 0x65, 0x73, + 0x20, 0x5A, 0x61, 0x68, 0x61, 0x72, 0x79, 0x20, 0x2D, 0x20, 0x4A, 0x61, 0x6E, 0x20, 0x31, 0x31, + 0x2C, 0x20, 0x32, 0x30, 0x32, 0x32, 0x0D, 0x0A, 0x0D, 0x0A +}; + +void read_config_file() { + + // if there is a config.txt, use it plus defaults + // else use defaults, and create a config.txt + + // put a file "config.txt" onto SD card, to set parameters different from your hardcoded parameters + // it should look like this - one paramter per line, in the correct order, followed by 2 spaces, and any comments you choose + /* + ~~~ old config.txt file ~~~ + desklens // camera name for files, mdns, etc + 11 // framesize 9=svga, 10=xga, 11=hd, 12=sxga, 13=uxga, 14=fhd, 17=qxga, 18=qhd, 21=qsxga + 8 // quality 0-63, lower the better, 10 good start, must be higher than "quality config" + 11 // framesize config - must be equal or higher than framesize + 5 / quality config - high q 0..5, med q 6..10, low q 11+ + 3 // buffers - 1 is half speed of 3, but you might run out od memory with 3 and framesize > uxga + 900 // length of video in seconds + 0 // interval - ms between frames - 0 for fastest, or 500 for 2fps, 10000 for 10 sec/frame + 1 // speedup - multiply framerate - 1 for realtime, 24 for record at 1fps, play at 24fps or24x + 0 // streamdelay - ms between streaming frames - 0 for fast as possible, 500 for 2fps + 4 // 0 no internet, 1 get time then shutoff, 2 streaming using wifiman, 3 for use ssid names below default off, 4 names below default on + MST7MDT,M3.2.0/2:00:00,M11.1.0/2:00:00 // timezone - this is mountain time, find timezone here https://sites.google.com/a/usapiens.com/opnode/time-zones + ssid1234 // ssid + mrpeanut // ssid password + + ~~~ new config.txt file ~~~ + desklens // camera name + 11 // framesize 11=hd + 1800 // length of video in seconds + 0 // interval - ms between recording frames + 1 // speedup - multiply framerate + 0 // streamdelay - ms between streaming frames + GMT // timezone + ssid1234 // ssid wifi name + mrpeanut // ssid password + ~~~ + + Lines above are rigid - do not delete lines, must have 2 spaces after the number or string + */ + + String junk; + + String cname = "desklens"; + int cframesize = 11; + int cquality = 12; + int cframesizeconfig = 13; + int cqualityconfig = 5; + int cbuffersconfig = 3; + int clength = 1800; + int cinterval = 0; + int cspeedup = 1; + int cstreamdelay = 0; + int cinternet = 0; + String czone = "GMT"; + cssid = "ssid1234"; + cpass = "mrpeanut"; + + File config_file = SD_MMC.open("/config.txt", "r"); + if (config_file) { + + Serial.println("Reading simple.txt"); + cname = config_file.readStringUntil(' '); + junk = config_file.readStringUntil('\n'); + cframesize = config_file.parseInt(); + junk = config_file.readStringUntil('\n'); + + clength = config_file.parseInt(); + junk = config_file.readStringUntil('\n'); + cinterval = config_file.parseInt(); + junk = config_file.readStringUntil('\n'); + cspeedup = config_file.parseInt(); + junk = config_file.readStringUntil('\n'); + cstreamdelay = config_file.parseInt(); + junk = config_file.readStringUntil('\n'); + czone = config_file.readStringUntil(' '); + junk = config_file.readStringUntil('\n'); + cssid = config_file.readStringUntil(' '); + junk = config_file.readStringUntil('\n'); + cpass = config_file.readStringUntil(' '); + junk = config_file.readStringUntil('\n'); + config_file.close(); + + if (String(cssid) == "ssid1234") { + cinternet = 0; + } else if (String(cssid) == "wifiman") { + cinternet = 2; + } else { + cinternet = 4; + } + } else { + Serial.println("Failed to open config.txt - writing a default"); + + // lets make a simple.txt config file + File new_simple = SD_MMC.open("/config.txt", "w"); + new_simple.print(simple_txt); + new_simple.close(); + + } + + Serial.printf("========= Data fram config.txt and defaults =========\n"); + Serial.printf("Name %s\n", cname); logfile.printf("Name %s\n", cname); + Serial.printf("Framesize %d\n", cframesize); logfile.printf("Framesize %d\n", cframesize); + Serial.printf("Quality %d\n", cquality); logfile.printf("Quality %d\n", cquality); + Serial.printf("Framesize config %d\n", cframesizeconfig); logfile.printf("Framesize config%d\n", cframesizeconfig); + Serial.printf("Quality config %d\n", cqualityconfig); logfile.printf("Quality config%d\n", cqualityconfig); + Serial.printf("Buffers config %d\n", cbuffersconfig); logfile.printf("Buffers config %d\n", cbuffersconfig); + Serial.printf("Length %d\n", clength); logfile.printf("Length %d\n", clength); + Serial.printf("Interval %d\n", cinterval); logfile.printf("Interval %d\n", cinterval); + Serial.printf("Speedup %d\n", cspeedup); logfile.printf("Speedup %d\n", cspeedup); + Serial.printf("Streamdelay %d\n", cstreamdelay); logfile.printf("Streamdelay %d\n", cstreamdelay); + Serial.printf("Internet %d\n", cinternet); logfile.printf("Internet %d\n", cinternet); + Serial.printf("Zone len %d, %s\n", czone.length(), czone.c_str()); //logfile.printf("Zone len %d, %s\n", czone.length(), czone); + Serial.printf("ssid %s\n", cssid); logfile.printf("ssid %s\n", cssid); + Serial.printf("pass %s\n", cpass); logfile.printf("pass %s\n", cpass); + + + framesize = cframesize; + quality = cquality; + framesizeconfig = cframesizeconfig; + qualityconfig = cqualityconfig; + buffersconfig = cbuffersconfig; + avi_length = clength; + frame_interval = cinterval; + speed_up_factor = cspeedup; + stream_delay = cstreamdelay; + IncludeInternet = cinternet; + configfile = true; + TIMEZONE = czone; + + cname.toCharArray(devname, cname.length() + 1); + +} + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// delete_old_stuff() - delete oldest files to free diskspace +// + +void listDir( const char * dirname, uint8_t levels) { + + Serial.printf("Listing directory: %s\n", "/"); + + File root = SD_MMC.open("/"); + if (!root) { + Serial.println("Failed to open directory"); + return; + } + if (!root.isDirectory()) { + Serial.println("Not a directory"); + return; + } + + File filex = root.openNextFile(); + while (filex) { + if (filex.isDirectory()) { + Serial.print(" DIR : "); + Serial.println(filex.name()); + if (levels) { + listDir( filex.name(), levels - 1); + } + } else { + Serial.print(" FILE: "); + Serial.print(filex.name()); + Serial.print(" SIZE: "); + Serial.println(filex.size()); + } + filex = root.openNextFile(); + } +} + +void delete_old_stuff() { + + Serial.printf("Total space: %lluMB\n", SD_MMC.totalBytes() / (1024 * 1024)); + Serial.printf("Used space: %lluMB\n", SD_MMC.usedBytes() / (1024 * 1024)); + + //listDir( "/", 0); + + float full = 1.0 * SD_MMC.usedBytes() / SD_MMC.totalBytes();; + if (full < 0.8) { + Serial.printf("Nothing deleted, %.1f%% disk full\n", 100.0 * full); + } else { + Serial.printf("Disk is %.1f%% full ... deleting oldest file\n", 100.0 * full); + while (full > 0.8) { + + double del_number = 999999999; + char del_numbername[50]; + + File f = SD_MMC.open("/"); + + File file = f.openNextFile(); + + while (file) { + //Serial.println(file.name()); + if (!file.isDirectory()) { + + char foldname[50]; + strcpy(foldname, file.name()); + for ( int x = 0; x < 50; x++) { + if ( (foldname[x] >= 0x30 && foldname[x] <= 0x39) || foldname[x] == 0x2E) { + } else { + if (foldname[x] != 0) foldname[x] = 0x20; + } + } + + double i = atof(foldname); + if ( i > 0 && i < del_number) { + strcpy (del_numbername, file.name()); + del_number = i; + } + //Serial.printf("Name is %s, number is %f\n", foldname, i); + } + file = f.openNextFile(); + + } + Serial.printf("lowest is Name is %s, number is %f\n", del_numbername, del_number); + if (del_number < 999999999) { + deleteFolderOrFile(del_numbername); + } + full = 1.0 * SD_MMC.usedBytes() / SD_MMC.totalBytes(); + Serial.printf("Disk is %.1f%% full ... \n", 100.0 * full); + f.close(); + } + } +} + +void deleteFolderOrFile(const char * val) { + // Function provided by user @gemi254 + Serial.printf("Deleting : %s\n", val); + File f = SD_MMC.open("/" + String(val)); + if (!f) { + Serial.printf("Failed to open %s\n", val); + return; + } + + if (f.isDirectory()) { + File file = f.openNextFile(); + while (file) { + if (file.isDirectory()) { + Serial.print(" DIR : "); + Serial.println(file.name()); + } else { + Serial.print(" FILE: "); + Serial.print(file.name()); + Serial.print(" SIZE: "); + Serial.print(file.size()); + if (SD_MMC.remove(file.name())) { + Serial.println(" deleted."); + } else { + Serial.println(" FAILED."); + } + } + file = f.openNextFile(); + } + f.close(); + //Remove the dir + if (SD_MMC.rmdir("/" + String(val))) { + Serial.printf("Dir %s removed\n", val); + } else { + Serial.println("Remove dir failed"); + } + + } else { + //Remove the file + if (SD_MMC.remove("/" + String(val))) { + Serial.printf("File %s deleted\n", val); + } else { + Serial.println("Delete failed"); + } + } +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// get_good_jpeg() - take a picture and make sure it has a good jpeg +// +camera_fb_t * get_good_jpeg() { + + camera_fb_t * fb; + + long start; + int failures = 0; + + do { + int fblen = 0; + int foundffd9 = 0; + long bp = millis(); + long mstart = micros(); + + fb = esp_camera_fb_get(); + if (!fb) { + Serial.println("Camera Capture Failed"); + failures++; + } else { + long mdelay = micros() - mstart; + + int get_fail = 0; + + totalp = totalp + millis() - bp; + time_in_camera = totalp; + + fblen = fb->len; + + for (int j = 1; j <= 1025; j++) { + if (fb->buf[fblen - j] != 0xD9) { + // no d9, try next for + } else { //Serial.println("Found a D9"); + if (fb->buf[fblen - j - 1] == 0xFF ) { //Serial.print("Found the FFD9, junk is "); Serial.println(j); + if (j == 1) { + normal_jpg++; + } else { + extend_jpg++; + } + foundffd9 = 1; + if (Lots_of_Stats) { + if (j > 900) { // rarely happens - sometimes on 2640 + Serial.print("Frame "); Serial.print(frame_cnt); logfile.print("Frame "); logfile.print(frame_cnt); + Serial.print(", Len = "); Serial.print(fblen); logfile.print(", Len = "); logfile.print(fblen); + //Serial.print(", Correct Len = "); Serial.print(fblen - j + 1); + Serial.print(", Extra Bytes = "); Serial.println( j - 1); logfile.print(", Extra Bytes = "); logfile.println( j - 1); + logfile.flush(); + } + + if ( frame_cnt % 100 == 50) { + Serial.printf("Frame %6d, len %6d, extra %4d, cam time %7d ", frame_cnt, fblen, j - 1, mdelay / 1000); + logfile.printf("Frame %6d, len %6d, extra %4d, cam time %7d ", frame_cnt, fblen, j - 1, mdelay / 1000); + do_it_now = 1; + } + } + break; + } + } + } + + if (!foundffd9) { + bad_jpg++; + Serial.printf("Bad jpeg, Frame %d, Len = %d \n", frame_cnt, fblen); + logfile.printf("Bad jpeg, Frame %d, Len = %d\n", frame_cnt, fblen); + + esp_camera_fb_return(fb); + failures++; + + } else { + break; + // count up the useless bytes + } + } + + } while (failures < 10); // normally leave the loop with a break() + + // if we get 10 bad frames in a row, then quality parameters are too high - set them lower (+5), and start new movie + if (failures == 10) { + Serial.printf("10 failures"); + logfile.printf("10 failures"); + logfile.flush(); + + sensor_t * ss = esp_camera_sensor_get(); + int qual = ss->status.quality ; + ss->set_quality(ss, qual + 5); + quality = qual + 5; + Serial.printf("\n\nDecreasing quality due to frame failures %d -> %d\n\n", qual, qual + 5); + logfile.printf("\n\nDecreasing quality due to frame failures %d -> %d\n\n", qual, qual + 5); + delay(1000); + + start_record = 0; + //reboot_now = true; + } + return fb; +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// eprom functions - increment the file_group, so files are always unique +// + +#include + +struct eprom_data { + int eprom_good; + int file_group; +}; + +void do_eprom_read() { + + eprom_data ed; + + EEPROM.begin(200); + EEPROM.get(0, ed); + + if (ed.eprom_good == MagicNumber) { + Serial.println("Good settings in the EPROM "); + file_group = ed.file_group; + file_group++; + Serial.print("New File Group "); Serial.println(file_group ); + } else { + Serial.println("No settings in EPROM - Starting with File Group 1 "); + file_group = 1; + } + do_eprom_write(); + file_number = 1; +} + +void do_eprom_write() { + + eprom_data ed; + ed.eprom_good = MagicNumber; + ed.file_group = file_group; + + Serial.println("Writing to EPROM ..."); + + EEPROM.begin(200); + EEPROM.put(0, ed); + EEPROM.commit(); + EEPROM.end(); +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// Make the avi functions +// +// start_avi() - open the file and write headers +// another_pic_avi() - write one more frame of movie +// end_avi() - write the final parameters and close the file + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// start_avi - open the files and write in headers +// + +static void start_avi() { + + long start = millis(); + + Serial.println("Starting an avi "); + + sprintf(avi_file_name, "/%s%d.%03d.avi", devname, file_group, file_number); + + file_number++; + + avifile = SD_MMC.open(avi_file_name, "w"); + idxfile = SD_MMC.open("/idx.tmp", "w"); + + if (avifile) { + Serial.printf("File open: %s\n", avi_file_name); + logfile.printf("File open: %s\n", avi_file_name); + } else { + Serial.println("Could not open file"); + major_fail(); + } + + if (idxfile) { + //Serial.printf("File open: %s\n", "//idx.tmp"); + } else { + Serial.println("Could not open file /idx.tmp"); + major_fail(); + } + + for ( i = 0; i < AVIOFFSET; i++) { + char ch = pgm_read_byte(&avi_header[i]); + buf[i] = ch; + } + + memcpy(buf + 0x40, frameSizeData[framesize].frameWidth, 2); + memcpy(buf + 0xA8, frameSizeData[framesize].frameWidth, 2); + memcpy(buf + 0x44, frameSizeData[framesize].frameHeight, 2); + memcpy(buf + 0xAC, frameSizeData[framesize].frameHeight, 2); + + size_t err = avifile.write(buf, AVIOFFSET); + + avifile.seek( AVIOFFSET, SeekSet); + + Serial.print(F("\nRecording ")); + Serial.print(avi_length); + Serial.println(" seconds."); + + startms = millis(); + + totalp = 0; + totalw = 0; + + jpeg_size = 0; + movi_size = 0; + uVideoLen = 0; + idx_offset = 4; + + bad_jpg = 0; + extend_jpg = 0; + normal_jpg = 0; + + time_in_loop = 0; + time_in_camera = 0; + time_in_sd = 0; + time_in_good = 0; + time_total = 0; + time_in_web1 = 0; + time_in_web2 = 0; + delay_wait_for_sd = 0; + wait_for_cam = 0; + + time_in_sd += (millis() - start); + + logfile.flush(); + avifile.flush(); + +} // end of start avi + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// another_save_avi saves another frame to the avi file, uodates index +// -- pass in a fb pointer to the frame to add +// + +static void another_save_avi(camera_fb_t * fb ) { + + long start = millis(); + + int fblen; + fblen = fb->len; + + int fb_block_length; + uint8_t* fb_block_start; + + jpeg_size = fblen; + + remnant = (4 - (jpeg_size & 0x00000003)) & 0x00000003; + + long bw = millis(); + long frame_write_start = millis(); + + framebuffer_static[0] = 0x30; // "00dc" + framebuffer_static[1] = 0x30; + framebuffer_static[2] = 0x64; + framebuffer_static[3] = 0x63; + + int jpeg_size_rem = jpeg_size + remnant; + + framebuffer_static[4] = jpeg_size_rem % 0x100; + framebuffer_static[5] = (jpeg_size_rem >> 8) % 0x100; + framebuffer_static[6] = (jpeg_size_rem >> 16) % 0x100; + framebuffer_static[7] = (jpeg_size_rem >> 24) % 0x100; + + fb_block_start = fb->buf; + + if (fblen > fbs * 1024 - 8 ) { // fbs is the size of frame buffer static + fb_block_length = fbs * 1024; + fblen = fblen - (fbs * 1024 - 8); + memcpy(framebuffer_static + 8, fb_block_start, fb_block_length - 8); + fb_block_start = fb_block_start + fb_block_length - 8; + + } else { + fb_block_length = fblen + 8 + remnant; + memcpy(framebuffer_static + 8, fb_block_start, fblen); + fblen = 0; + } + + size_t err = avifile.write(framebuffer_static, fb_block_length); + + if (err != fb_block_length) { + Serial.print("Error on avi write: err = "); Serial.print(err); + Serial.print(" len = "); Serial.println(fb_block_length); + logfile.print("Error on avi write: err = "); logfile.print(err); + logfile.print(" len = "); logfile.println(fb_block_length); + } + + while (fblen > 0) { + + if (fblen > fbs * 1024) { + fb_block_length = fbs * 1024; + fblen = fblen - fb_block_length; + } else { + fb_block_length = fblen + remnant; + fblen = 0; + } + + memcpy(framebuffer_static, fb_block_start, fb_block_length); + + size_t err = avifile.write(framebuffer_static, fb_block_length); + + if (err != fb_block_length) { + Serial.print("Error on avi write: err = "); Serial.print(err); + Serial.print(" len = "); Serial.println(fb_block_length); + } + + fb_block_start = fb_block_start + fb_block_length; + delay(0); + } + + + movi_size += jpeg_size; + uVideoLen += jpeg_size; + long frame_write_end = millis(); + + print_2quartet(idx_offset, jpeg_size, idxfile); + + idx_offset = idx_offset + jpeg_size + remnant + 8; + + movi_size = movi_size + remnant; + + if ( do_it_now == 1) { + do_it_now = 0; + Serial.printf(" sd time %4d -- \n", millis() - bw); + logfile.printf(" sd time %4d -- \n", millis() - bw); + logfile.flush(); + } + + totalw = totalw + millis() - bw; + time_in_sd += (millis() - start); + + avifile.flush(); + + +} // end of another_pic_avi + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// end_avi writes the index, and closes the files +// + +static void end_avi() { + + long start = millis(); + + unsigned long current_end = avifile.position(); + + Serial.println("End of avi - closing the files"); + logfile.println("End of avi - closing the files"); + + if (frame_cnt < 5 ) { + Serial.println("Recording screwed up, less than 5 frames, forget index\n"); + idxfile.close(); + avifile.close(); + int xx = remove("/idx.tmp"); + int yy = remove(avi_file_name); + + } else { + + elapsedms = millis() - startms; + + float fRealFPS = (1000.0f * (float)frame_cnt) / ((float)elapsedms) * speed_up_factor; + + float fmicroseconds_per_frame = 1000000.0f / fRealFPS; + uint8_t iAttainedFPS = round(fRealFPS) ; + uint32_t us_per_frame = round(fmicroseconds_per_frame); + + //Modify the MJPEG header from the beginning of the file, overwriting various placeholders + + avifile.seek( 4 , SeekSet); + print_quartet(movi_size + 240 + 16 * frame_cnt + 8 * frame_cnt, avifile); + + avifile.seek( 0x20 , SeekSet); + print_quartet(us_per_frame, avifile); + + unsigned long max_bytes_per_sec = (1.0f * movi_size * iAttainedFPS) / frame_cnt; + + avifile.seek( 0x24 , SeekSet); + print_quartet(max_bytes_per_sec, avifile); + + avifile.seek( 0x30 , SeekSet); + print_quartet(frame_cnt, avifile); + + avifile.seek( 0x8c , SeekSet); + print_quartet(frame_cnt, avifile); + + avifile.seek( 0x84 , SeekSet); + print_quartet((int)iAttainedFPS, avifile); + + avifile.seek( 0xe8 , SeekSet); + print_quartet(movi_size + frame_cnt * 8 + 4, avifile); + + Serial.println(F("\n*** Video recorded and saved ***\n")); + + Serial.printf("Recorded %5d frames in %5d seconds\n", frame_cnt, elapsedms / 1000); + Serial.printf("File size is %u bytes\n", movi_size + 12 * frame_cnt + 4); + Serial.printf("Adjusted FPS is %5.2f\n", fRealFPS); + Serial.printf("Max data rate is %lu bytes/s\n", max_bytes_per_sec); + Serial.printf("Frame duration is %d us\n", us_per_frame); + Serial.printf("Average frame length is %d bytes\n", uVideoLen / frame_cnt); + Serial.print("Average picture time (ms) "); Serial.println( 1.0 * totalp / frame_cnt); + Serial.print("Average write time (ms) "); Serial.println( 1.0 * totalw / frame_cnt ); + Serial.print("Normal jpg % "); Serial.println( 100.0 * normal_jpg / frame_cnt, 1 ); + Serial.print("Extend jpg % "); Serial.println( 100.0 * extend_jpg / frame_cnt, 1 ); + Serial.print("Bad jpg % "); Serial.println( 100.0 * bad_jpg / frame_cnt, 5 ); + + Serial.printf("Writng the index, %d frames\n", frame_cnt); + + logfile.printf("Recorded %5d frames in %5d seconds\n", frame_cnt, elapsedms / 1000); + logfile.printf("File size is %u bytes\n", movi_size + 12 * frame_cnt + 4); + logfile.printf("Adjusted FPS is %5.2f\n", fRealFPS); + logfile.printf("Max data rate is %lu bytes/s\n", max_bytes_per_sec); + logfile.printf("Frame duration is %d us\n", us_per_frame); + logfile.printf("Average frame length is %d bytes\n", uVideoLen / frame_cnt); + logfile.print("Average picture time (ms) "); logfile.println( 1.0 * totalp / frame_cnt); + logfile.print("Average write time (ms) "); logfile.println( 1.0 * totalw / frame_cnt ); + logfile.print("Normal jpg % "); logfile.println( 100.0 * normal_jpg / frame_cnt, 1 ); + logfile.print("Extend jpg % "); logfile.println( 100.0 * extend_jpg / frame_cnt, 1 ); + logfile.print("Bad jpg % "); logfile.println( 100.0 * bad_jpg / frame_cnt, 5 ); + + logfile.printf("Writng the index, %d frames\n", frame_cnt); + + avifile.seek( current_end , SeekSet); + + idxfile.close(); + + size_t i1_err = avifile.write(idx1_buf, 4); + + print_quartet(frame_cnt * 16, avifile); + + idxfile = SD_MMC.open("/idx.tmp", "r"); + + if (idxfile) { + //Serial.printf("File open: %s\n", "//idx.tmp"); + //logfile.printf("File open: %s\n", "/idx.tmp"); + } else { + Serial.println("Could not open index file"); + logfile.println("Could not open index file"); + major_fail(); + } + + char * AteBytes; + AteBytes = (char*) malloc (8); + + for (int i = 0; i < frame_cnt; i++) { + size_t res = idxfile.readBytes( AteBytes, 8); + size_t i1_err = avifile.write(dc_buf, 4); + size_t i2_err = avifile.write(zero_buf, 4); + size_t i3_err = avifile.write((uint8_t *)AteBytes, 8); + } + + free(AteBytes); + + idxfile.close(); + avifile.close(); + + int xx = remove("/idx.tmp"); + } + + Serial.println("---"); logfile.println("---"); + + time_in_sd += (millis() - start); + + Serial.println(""); + time_total = millis() - startms; + Serial.printf("waiting for cam %10dms, %4.1f%%\n", wait_for_cam , 100.0 * wait_for_cam / time_total); + Serial.printf("Time in camera %10dms, %4.1f%%\n", time_in_camera, 100.0 * time_in_camera / time_total); + Serial.printf("waiting for sd %10dms, %4.1f%%\n", delay_wait_for_sd , 100.0 * delay_wait_for_sd / time_total); + Serial.printf("Time in sd %10dms, %4.1f%%\n", time_in_sd , 100.0 * time_in_sd / time_total); + Serial.printf("web (core 1) %10dms, %4.1f%%\n", time_in_web1 , 100.0 * time_in_web1 / time_total); + Serial.printf("web (core 0) %10dms, %4.1f%%\n", time_in_web2 , 100.0 * time_in_web2 / time_total); + Serial.printf("time total %10dms, %4.1f%%\n", time_total , 100.0 * time_total / time_total); + + logfile.printf("waiting for cam %10dms, %4.1f%%\n", wait_for_cam , 100.0 * wait_for_cam / time_total); + logfile.printf("Time in camera %10dms, %4.1f%%\n", time_in_camera, 100.0 * time_in_camera / time_total); + logfile.printf("waiting for sd %10dms, %4.1f%%\n", delay_wait_for_sd , 100.0 * delay_wait_for_sd / time_total); + logfile.printf("Time in sd %10dms, %4.1f%%\n", time_in_sd , 100.0 * time_in_sd / time_total); + logfile.printf("web (core 1) %10dms, %4.1f%%\n", time_in_web1 , 100.0 * time_in_web1 / time_total); + logfile.printf("web (core 0) %10dms, %4.1f%%\n", time_in_web2 , 100.0 * time_in_web2 / time_total); + logfile.printf("time total %10dms, %4.1f%%\n", time_total , 100.0 * time_total / time_total); + + logfile.flush(); + +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// Time +#include "time.h" + +// Workaround for the WebServer.h vs esp_http_server.h problem https://github.com/tzapu/WiFiManager/issues/1184 + +#define _HTTP_Method_H_ + +typedef enum { + jHTTP_GET = 0b00000001, + jHTTP_POST = 0b00000010, + jHTTP_DELETE = 0b00000100, + jHTTP_PUT = 0b00001000, + jHTTP_PATCH = 0b00010000, + jHTTP_HEAD = 0b00100000, + jHTTP_OPTIONS = 0b01000000, + jHTTP_ANY = 0b01111111, +} HTTPMethod; + +#include +#include +#include + +#include "ESPxWebFlMgr.h" //v56 +const word filemanagerport = 8080; +ESPxWebFlMgr filemgr(filemanagerport); // we want a different port than the webserver + + +time_t now; +struct tm timeinfo; +char localip[20]; +WiFiEventId_t eventID; + +bool init_wifi() +{ + int connAttempts = 0; + + uint32_t brown_reg_temp = READ_PERI_REG(RTC_CNTL_BROWN_OUT_REG); + WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); + + if (IncludeInternet >= 3) { + + WiFi.disconnect(true, true); + //WiFi.mode(WIFI_STA); // https://github.com/espressif/arduino-esp32/issues/6086 + WiFi.setHostname(devname); + WiFi.mode(WIFI_STA); + char ssidch[20]; + char passch[20]; + cssid.toCharArray(ssidch, cssid.length() + 1); + cpass.toCharArray(passch, cpass.length() + 1); + Serial.printf("ssid >%s<, pass >%s<\n", ssidch, passch); + WiFi.begin(ssidch, passch); + + while (WiFi.status() != WL_CONNECTED ) { + delay(1000); + Serial.print("."); + if (connAttempts++ == 15) break; // try for 15 seconds to get internet, then give up + } + configTime(0, 0, "pool.ntp.org"); + char tzchar[60]; + //Serial.printf("Str >%s<, Char >%s<\n",TIMEZONE,tzchar); + TIMEZONE.toCharArray(tzchar, TIMEZONE.length()); // name of your camera for mDNS, Router, and filenames + setenv("TZ", tzchar, 1); // mountain time zone from #define at top + tzset(); + + time(&now); + + while (now < 15) { // try for 15 seconds to get the time, then give up - 10 seconds after boot + delay(1000); + Serial.print("o"); + time(&now); + } + + Serial.print("Local time: "); Serial.print(ctime(&now)); + sprintf(localip, "%s", WiFi.localIP().toString().c_str()); + Serial.print("IP: "); Serial.println(localip); Serial.println(" "); + InternetOff = false; + + if (!MDNS.begin(devname)) { + Serial.println("Error setting up MDNS responder!"); + } else { + Serial.printf("mDNS responder started '%s'\n", devname); + } + + eventID = WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) { + // info.disconnected.reason ==> info.wifi_sta_disconnected.reason - update with esp32_arduino 2.00 v58 + if (info.wifi_sta_disconnected.reason != 201) { + Serial.printf( "\nframe_cnt: %8d, WiFi event Reason: %d , Status: %d\n", frame_cnt, info.wifi_sta_disconnected.reason, WiFi.status()); + logfile.printf("\nframe_cnt: %8d, WiFi event Reason: %d , Status: %d\n", frame_cnt, info.wifi_sta_disconnected.reason, WiFi.status()); + } + }); + + } else { + WiFi.mode(WIFI_STA); // https://github.com/espressif/arduino-esp32/issues/6086 + WiFiManager wm; + bool res; + wm.setHostname(devname); + //wm.resetSettings(); // for debugging - erase the ssid every time + + wm.setConnectTimeout(30); // how long to try to connect for before continuing + wm.setConfigPortalTimeout(60); // auto close configportal after n seconds + // res = wm.autoConnect(); // auto generated AP name from chipid + + res = wm.autoConnect("ESP32-CAM"); // use the devname defined above, with no password + //res = wm.autoConnect("AutoConnectAP","password"); // password protected ap + + if (res) { + Serial.println("Succesful Connection using WiFiManager"); + Serial.printf("\nInternet status: %d\n", WiFi.status()); + + eventID = WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) { + Serial.printf( "\nframe_cnt: %8d, WiFi event Reason: %d , Status: %d\n", frame_cnt, info.wifi_sta_disconnected.reason, WiFi.status()); + logfile.printf("\nframe_cnt: %8d, WiFi event Reason: %d , Status: %d\n", frame_cnt, info.wifi_sta_disconnected.reason, WiFi.status()); + + }); + + configTime(0, 0, "pool.ntp.org"); + char tzchar[60]; + TIMEZONE.toCharArray(tzchar, TIMEZONE.length()); // name of your camera for mDNS, Router, and filenames + setenv("TZ", tzchar, 1); // mountain time zone from #define at top + tzset(); + + time(&now); + + while (now < 15) { // try for 5 seconds to get the time, then give up - 10 seconds after boot + delay(1000); + Serial.print("o"); + time(&now); + } + + Serial.print("Local time: "); Serial.print(ctime(&now)); + sprintf(localip, "%s", WiFi.localIP().toString().c_str()); + Serial.print("IP: "); Serial.println(localip); Serial.println(" "); + InternetOff = false; + } else { + + InternetOff = true; + Serial.println("Internet failed using WiFiManager - not starting Web services"); + } + } + + //typedef enum { + // WIFI_PS_NONE, /**< No power save */ + // WIFI_PS_MIN_MODEM, /**< Minimum modem power saving. In this mode, station wakes up to receive beacon every DTIM period */ + // WIFI_PS_MAX_MODEM, /**< Maximum modem power saving. In this mode, interval to receive beacons is determined by the listen_interval + // parameter in wifi_sta_config_t. + // Attention: Using this option may cause ping failures. Not recommended */ + //} wifi_ps_type_t; + + wifi_ps_type_t the_type; + + esp_err_t get_ps = esp_wifi_get_ps(&the_type); + Serial.printf("The power save was: %d\n", the_type); + + Serial.printf("Set power save to %d\n", WIFI_PS_NONE); + esp_err_t set_ps = esp_wifi_set_ps(WIFI_PS_NONE); + + esp_err_t new_ps = esp_wifi_get_ps(&the_type); + Serial.printf("The power save is : %d\n", the_type); + + WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, brown_reg_temp); + return true; + +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// +#include + +httpd_handle_t camera_httpd = NULL; +char the_page[4000]; + +static esp_err_t capture_handler(httpd_req_t *req) { + + long start = millis(); + + camera_fb_t * fb = NULL; + esp_err_t res = ESP_OK; + char fname[100]; + int file_number = 0; + + //Serial.print("capture, core "); Serial.print(xPortGetCoreID()); + //Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + file_number++; + + sprintf(fname, "inline; filename=capture_%d.jpg", file_number); + + if (fb_next == NULL) { + fb = get_good_jpeg(); // esp_camera_fb_get(); + framebuffer_len = fb->len; + memcpy(framebuffer, fb->buf, framebuffer_len); + esp_camera_fb_return(fb); + } else { + fb = fb_next; + framebuffer_len = fb->len; + memcpy(framebuffer, fb->buf, framebuffer_len); + } + + httpd_resp_set_type(req, "image/jpeg"); + httpd_resp_set_hdr(req, "Content-Disposition", fname); + + res = httpd_resp_send(req, (const char *)framebuffer, framebuffer_len); + + time_in_web1 += (millis() - start); + return res; +} + + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// +static esp_err_t index_handler(httpd_req_t *req) { + + long start = millis(); + + Serial.print("http index, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + const char the_message[] = "Status"; + + time(&now); + const char *strdate = ctime(&now); + + int tot = SD_MMC.totalBytes() / (1024 * 1024); + int use = SD_MMC.usedBytes() / (1024 * 1024); + long rssi = WiFi.RSSI(); + + const char msg[] PROGMEM = R"rawliteral( + + + + +%s ESP32-CAM Video Recorder Junior + + +

%s
ESP32-CAM Video Recorder Junior %s
%s


+ + Used / Total SD Space %d MB / %d MB
+ Rssi %d
+ + Filename: %s
+ Framesize %d, Quality %d, Frame %d
+ Avg framesize %d, fps %.1f
+ Time left in current video %d seconds
+
+

http://%s/

+

Stream

+

Photos - 10 saveable photos every 3 seconds

+

File Manager - download, delete, edit

+

+

End recording, and reboot

+ +)rawliteral"; + + + int time_left = (- millis() + (avi_start_time + avi_length * 1000)) / 1000; + + if (start_record == 0) { + time_left = 0; + } + + sprintf(the_page, msg, devname, devname, vernum, strdate, use, tot, rssi, avi_file_name, + framesize, quality, frame_cnt, most_recent_avg_framesize, most_recent_fps, time_left, + localip, localip, localip, localip, localip, filemanagerport, localip ); + + + httpd_resp_send(req, the_page, strlen(the_page)); + + time_in_web1 += (millis() - start); + return ESP_OK; +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// +static esp_err_t photos_handler(httpd_req_t *req) { + + long start = millis(); + + Serial.print("http photos, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + //Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap()); + //Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram()); + + const char the_message[] = "Status"; + + time(&now); + const char *strdate = ctime(&now); + + const char msg[] PROGMEM = R"rawliteral( + + + + +%s ESP32-CAM Video Recorder Junior + + +

%s
ESP32-CAM Video Recorder Junior %s
%s


+
+ One photo every 3 seconds for 30 seconds - roll forward or back - refresh for more live photos +
+ +
+
+ +)rawliteral"; + + sprintf(the_page, msg, devname, devname, vernum, strdate ); + + httpd_resp_send(req, the_page, strlen(the_page)); + time_in_web1 += (millis() - start); + return ESP_OK; +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// +static esp_err_t reboot_handler(httpd_req_t *req) { + + long start = millis(); + + Serial.print("http reboot, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + //Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap()); + //Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram()); + + //start_record = 0; + reboot_now = true; + + const char the_message[] = "Status"; + + time(&now); + const char *strdate = ctime(&now); + + const char msg[] PROGMEM = R"rawliteral( + + + + +%s ESP32-CAM Video Recorder Junior + + +

%s
ESP32-CAM Video Recorder Junior %s
%s


+
+ Ending current recording, and rebooting ... +
+ +
+ +)rawliteral"; + + sprintf(the_page, msg, devname, devname, vernum, strdate ); + + httpd_resp_send(req, the_page, strlen(the_page)); + time_in_web1 += (millis() - start); + + return ESP_OK; +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// +// Streaming stuff based on Random Nerd +// + +bool start_streaming = false; + +#define PART_BOUNDARY "123456789000000000000987654321" + +static const char* _STREAM_CONTENT_TYPE = "multipart/x-mixed-replace;boundary=" PART_BOUNDARY; +static const char* _STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n"; +static const char* _STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n"; + +void the_streaming_loop (void* pvParameter); + +static esp_err_t stream_handler(httpd_req_t *req) { + + long start = millis(); + + Serial.print("stream_handler, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + start_streaming = true; + + xTaskCreatePinnedToCore( the_streaming_loop, "the_streaming_loop", 8000, req, 1, &the_streaming_loop_task, 0); + + if ( the_streaming_loop_task == NULL ) { + //vTaskDelete( xHandle ); + Serial.printf("do_the_steaming_task failed to start! %d\n", the_streaming_loop_task); + } + + time_in_web1 += (millis() - start); + + while (start_streaming == true) { // we have to keep the *req alive + delay(1000); + //Serial.print("z"); + } + Serial.println(" streaming done"); + delay(500); + return ESP_OK; +} + +void the_streaming_loop (void* pvParameter) { + + httpd_req_t *req; + camera_fb_t * fb = NULL; + esp_err_t res = ESP_OK; + size_t _jpg_buf_len = 0; + uint8_t * _jpg_buf = NULL; + char * part_buf[64]; + + long start = millis(); + + Serial.print("\n\nlow prio stream_handler task, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + req = (httpd_req_t *) pvParameter; + + Serial.println("Starting the streaming"); + + res = httpd_resp_set_type(req, _STREAM_CONTENT_TYPE); + if (res != ESP_OK) { + Serial.printf("after first httpd_resp_set_type %d\n", res); + start_streaming = false; + } + + int streaming_frames = 0; + long streaming_start = millis(); + + while (true) { + streaming_frames++; + + if (fb_curr == NULL) { + fb = get_good_jpeg(); //esp_camera_fb_get(); + if (!fb) { + Serial.println("Stream - Camera Capture Failed"); + start_streaming = false; + } + framebuffer_len = fb->len; + memcpy(framebuffer, fb->buf, fb->len); + esp_camera_fb_return(fb); + + } else { + fb = fb_curr; + framebuffer_len = fb->len; + memcpy(framebuffer, fb->buf, fb->len); + } + + _jpg_buf_len = framebuffer_len; + _jpg_buf = framebuffer; + + size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len); + long send_time = millis(); + + res = httpd_resp_send_chunk(req, (const char *)part_buf, hlen); + if (res != ESP_OK) { + //Serial.printf("Stream error - 1st send chunk %d\n",res); + start_streaming = false; + } + + res = httpd_resp_send_chunk(req, (const char *)_jpg_buf, _jpg_buf_len); + if (res != ESP_OK) { + //Serial.printf("Stream error - 2nd send chunk %d\n",res); + start_streaming = false; + } + + res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY)); + if (res != ESP_OK) { + //Serial.printf("Stream error - 3rd send chunk %d\n", res); + start_streaming = false; + } + + if (millis() - send_time > stream_delay) { + stream_delay = stream_delay * 1.5; + } + + time_in_web2 += (millis() - start); + + if (streaming_frames % 100 == 10) { + if (Lots_of_Stats) Serial.printf("Streaming at %3.3f fps\n", (float)1000 * streaming_frames / (millis() - streaming_start)); + } + + delay(stream_delay); + start = millis(); + + if (start_streaming == false) { + Serial.println("Deleting the streaming task"); + delay(100); + vTaskDelete(the_streaming_loop_task); + delay(5000); + } + } // stream forever +} + + +void startCameraServer() { + httpd_config_t config = HTTPD_DEFAULT_CONFIG(); + + Serial.print("http task prio: "); Serial.println(config.task_priority); + + httpd_uri_t index_uri = { + .uri = "/", + .method = HTTP_GET, + .handler = index_handler, + .user_ctx = NULL + }; + httpd_uri_t capture_uri = { + .uri = "/capture", + .method = HTTP_GET, + .handler = capture_handler, + .user_ctx = NULL + }; + httpd_uri_t stream_uri = { + .uri = "/stream", + .method = HTTP_GET, + .handler = stream_handler, + .user_ctx = NULL + }; + + httpd_uri_t photos_uri = { + .uri = "/photos", + .method = HTTP_GET, + .handler = photos_handler, + .user_ctx = NULL + }; + + httpd_uri_t reboot_uri = { + .uri = "/reboot", + .method = HTTP_GET, + .handler = reboot_handler, + .user_ctx = NULL + }; + + if (httpd_start(&camera_httpd, &config) == ESP_OK) { + httpd_register_uri_handler(camera_httpd, &index_uri); + httpd_register_uri_handler(camera_httpd, &capture_uri); + httpd_register_uri_handler(camera_httpd, &stream_uri); + httpd_register_uri_handler(camera_httpd, &photos_uri); + httpd_register_uri_handler(camera_httpd, &reboot_uri); + } + + Serial.println("Camera http started"); +} + +void stopCameraServer() { + httpd_stop(camera_httpd); +} + +void the_camera_loop (void* pvParameter); +void the_sd_loop (void* pvParameter); +void delete_old_stuff(); + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +void setup() { + + Serial.begin(115200); + Serial.println("\n\n---"); + + pinMode(33, OUTPUT); // little red led on back of chip + digitalWrite(33, LOW); // turn on the red LED on the back of chip + + pinMode(4, OUTPUT); // Blinding Disk-Avtive Light + digitalWrite(4, LOW); // turn off + + pinMode(12, INPUT_PULLUP); // pull this down to stop recording + pinMode(13, INPUT_PULLUP); // pull this down switch wifi + + //Serial.setDebugOutput(true); + + Serial.println(" "); + Serial.println("-------------------------------------"); + Serial.printf("ESP32-CAM-Video-Recorder-junior %s\n", vernum); + Serial.println("-------------------------------------"); + + Serial.print("setup, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + esp_reset_reason_t reason = esp_reset_reason(); + + logfile.print("--- reboot ------ because: "); + Serial.print("--- reboot ------ because: "); + + switch (reason) { + case ESP_RST_UNKNOWN : Serial.println("ESP_RST_UNKNOWN"); logfile.println("ESP_RST_UNKNOWN"); break; + case ESP_RST_POWERON : Serial.println("ESP_RST_POWERON"); logfile.println("ESP_RST_POWERON"); break; + case ESP_RST_EXT : Serial.println("ESP_RST_EXT"); logfile.println("ESP_RST_EXT"); break; + case ESP_RST_SW : Serial.println("ESP_RST_SW"); logfile.println("ESP_RST_SW"); break; + case ESP_RST_PANIC : Serial.println("ESP_RST_PANIC"); logfile.println("ESP_RST_PANIC"); break; + case ESP_RST_INT_WDT : Serial.println("ESP_RST_INT_WDT"); logfile.println("ESP_RST_INT_WDT"); break; + case ESP_RST_TASK_WDT : Serial.println("ESP_RST_TASK_WDT"); logfile.println("ESP_RST_TASK_WDT"); break; + case ESP_RST_WDT : Serial.println("ESP_RST_WDT"); logfile.println("ESP_RST_WDT"); break; + case ESP_RST_DEEPSLEEP : Serial.println("ESP_RST_DEEPSLEEP"); logfile.println("ESP_RST_DEEPSLEEP"); break; + case ESP_RST_BROWNOUT : Serial.println("ESP_RST_BROWNOUT"); logfile.println("ESP_RST_BROWNOUT"); break; + case ESP_RST_SDIO : Serial.println("ESP_RST_SDIO"); logfile.println("ESP_RST_SDIO"); break; + default : Serial.println("Reset resaon"); logfile.println("ESP ???"); break; + } + + //Serial.printf("Internal Total heap %d, internal Free Heap %d\n", ESP.getHeapSize(), ESP.getFreeHeap()); + //Serial.printf("SPIRam Total heap %d, SPIRam Free Heap %d\n", ESP.getPsramSize(), ESP.getFreePsram()); + + Serial.println("Reading the eprom ..."); + do_eprom_read(); + + // SD camera init + Serial.println("Mounting the SD card ..."); + esp_err_t card_err = init_sdcard(); + if (card_err != ESP_OK) { + Serial.printf("SD Card init failed with error 0x%x", card_err); + major_fail(); + return; + } + + devstr.toCharArray(devname, devstr.length()); // name of your camera for mDNS, Router, and filenames + + Serial.println("Try to get parameters from config.txt ..."); + read_config_file(); + + + char logname[50]; + sprintf(logname, "/%s%d.999.txt", devname, file_group); + Serial.printf("Creating logfile %s\n", logname); + logfile = SD_MMC.open(logname, FILE_WRITE); + + if (!logfile) { + Serial.println("Failed to open logfile for writing"); + } + if (IncludeInternet > 0) { + Serial.println("Starting the wifi ..."); + init_wifi(); + InternetOff = false; + } else { + Serial.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + Serial.println("You have not wifi - no streamning, no file manager"); + Serial.println("Put your ssid and password in config.txt on the sd card"); + Serial.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + } + + Serial.println("Setting up the camera ..."); + config_camera(); + + Serial.println("Checking SD for available space ..."); + delete_old_stuff(); + + digitalWrite(33, HIGH); // red light turns off when setup is complete + + if ( !InternetOff && IncludeInternet == 1) { + Serial.printf("Shutting off WiFi now \n\n"); + delay(1000); + WiFi.disconnect(); + InternetOff = true; + } + + if ( !InternetOff && IncludeInternet > 1) { + Serial.println("Starting Web Services ..."); + startCameraServer(); + } + + framebuffer = (uint8_t*)ps_malloc(1024 * 1024); // buffer to store a jpg in motion // needs to be larger for big frames from ov5640 + + Serial.println("Creating the_camera_loop_task"); + + wait_for_sd = xSemaphoreCreateBinary(); //xSemaphoreCreateMutex(); + sd_go = xSemaphoreCreateBinary(); //xSemaphoreCreateMutex(); + + // prio 3 - higher than the camera loop(), and the streaming + xTaskCreatePinnedToCore( the_camera_loop, "the_camera_loop", 3000, NULL, 6, &the_camera_loop_task, 0); // prio 3, core 0 //v56 core 1 as http dominating 0 ... back to 0, raise prio + + delay(100); + + // prio 4 - higher than the cam_loop(), and the streaming + xTaskCreatePinnedToCore( the_sd_loop, "the_sd_loop", 2000, NULL, 4, &the_sd_loop_task, 1); // prio 4, core 1 + + delay(200); + + boot_time = millis(); + + const char *strdate = ctime(&now); + logfile.println(strdate); + + if ( !InternetOff && IncludeInternet > 1) { + filemgr.begin(); + filemgr.setBackGroundColor("Gray"); + Serial.print("Open Filemanager with http://"); + Serial.print(WiFi.localIP()); + Serial.print(":"); + Serial.print(filemanagerport); + Serial.print("/"); + Serial.println(); + } + Serial.println(" End of setup()\n\n"); +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// the_sd_loop() +// + +void the_sd_loop (void* pvParameter) { + + Serial.print("the_sd_loop, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + while (1) { + xSemaphoreTake( sd_go, portMAX_DELAY ); // we wait for camera loop to tell us to go + another_save_avi( fb_curr); // do the actual sd wrte + xSemaphoreGive( wait_for_sd ); // tell camera loop we are done + } +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// the_camera_loop() +int delete_old_stuff_flag = 0; + +void the_camera_loop (void* pvParameter) { + + Serial.print("the camera loop, core "); Serial.print(xPortGetCoreID()); + Serial.print(", priority = "); Serial.println(uxTaskPriorityGet(NULL)); + + frame_cnt = 0; + start_record_2nd_opinion = digitalRead(12); + start_record_1st_opinion = digitalRead(12); + start_record = 0; + + delay(1000); + + while (1) { + + // if (frame_cnt == 0 && start_record == 0) // do nothing + // if (frame_cnt == 0 && start_record == 1) // start a movie + // if (frame_cnt > 0 && start_record == 0) // stop the movie + // if (frame_cnt > 0 && start_record != 0) // another frame + + /////////////////// NOTHING TO DO ////////////////// + if (frame_cnt == 0 && start_record == 0) { + + // Serial.println("Do nothing"); + if (we_are_already_stopped == 0) Serial.println("\n\nDisconnect Pin 12 from GND to start recording.\n\n"); + we_are_already_stopped = 1; + delay(100); + + /////////////////// START A MOVIE ////////////////// + } else if (frame_cnt == 0 && start_record == 1) { + + //Serial.println("Ready to start"); + + we_are_already_stopped = 0; + + //delete_old_stuff(); // move to loop + + avi_start_time = millis(); + Serial.printf("\nStart the avi ... at %d\n", avi_start_time); + Serial.printf("Framesize %d, quality %d, length %d seconds\n\n", framesize, quality, avi_length); + logfile.printf("\nStart the avi ... at %d\n", avi_start_time); + logfile.printf("Framesize %d, quality %d, length %d seconds\n\n", framesize, quality, avi_length); + logfile.flush(); + + frame_cnt++; + + long wait_for_cam_start = millis(); + fb_curr = get_good_jpeg(); // should take zero time + wait_for_cam += millis() - wait_for_cam_start; + + start_avi(); + + wait_for_cam_start = millis(); + fb_next = get_good_jpeg(); // should take nearly zero time due to time spent writing header + wait_for_cam += millis() - wait_for_cam_start; + xSemaphoreGive( sd_go ); // trigger sd write to write first frame + + digitalWrite(33, frame_cnt % 2); // blink + + /////////////////// END THE MOVIE ////////////////// + } else if ( reboot_now || (frame_cnt > 0 && start_record == 0) || millis() > (avi_start_time + avi_length * 1000)) { // end the avi + + Serial.println("End the Avi"); + + xSemaphoreTake( wait_for_sd, portMAX_DELAY ); + esp_camera_fb_return(fb_curr); + + frame_cnt++; + fb_curr = fb_next; + fb_next = NULL; + + xSemaphoreGive( sd_go ); // save final frame of movie + + digitalWrite(33, frame_cnt % 2); + + xSemaphoreTake( wait_for_sd, portMAX_DELAY ); // wait for final frame of movie to be written + + esp_camera_fb_return(fb_curr); + fb_curr = NULL; + + end_avi(); // end the movie + + digitalWrite(33, HIGH); // light off + + delete_old_stuff_flag = 1; + delay(50); + + avi_end_time = millis(); + + float fps = 1.0 * frame_cnt / ((avi_end_time - avi_start_time) / 1000) ; + + Serial.printf("End the avi at %d. It was %d frames, %d ms at %.2f fps...\n", millis(), frame_cnt, avi_end_time, avi_end_time - avi_start_time, fps); + logfile.printf("End the avi at %d. It was %d frames, %d ms at %.2f fps...\n", millis(), frame_cnt, avi_end_time, avi_end_time - avi_start_time, fps); + + if (!reboot_now) frame_cnt = 0; // start recording again on the next loop + + /////////////////// ANOTHER FRAME ////////////////// + } else if (frame_cnt > 0 && start_record != 0) { // another frame of the avi + + //Serial.println("Another frame"); + + current_frame_time = millis(); + if (current_frame_time - last_frame_time < frame_interval) { + delay(frame_interval - (current_frame_time - last_frame_time)); // delay for timelapse + } + last_frame_time = millis(); + + frame_cnt++; + + long delay_wait_for_sd_start = millis(); + xSemaphoreTake( wait_for_sd, portMAX_DELAY ); // make sure sd writer is done + delay_wait_for_sd += millis() - delay_wait_for_sd_start; + + esp_camera_fb_return(fb_curr); + + fb_curr = fb_next; // we will write a frame, and get the camera preparing a new one + + xSemaphoreGive( sd_go ); // write the frame in fb_curr + + long wait_for_cam_start = millis(); + fb_next = get_good_jpeg(); // should take near zero, unless the sd is faster than the camera, when we will have to wait for the camera + wait_for_cam += millis() - wait_for_cam_start; + + digitalWrite(33, frame_cnt % 2); + + if (frame_cnt % 100 == 10 ) { // print some status every 100 frames + if (frame_cnt == 10) { + bytes_before_last_100_frames = movi_size; + time_before_last_100_frames = millis(); + most_recent_fps = 0; + most_recent_avg_framesize = 0; + } else { + + most_recent_fps = 100.0 / ((millis() - time_before_last_100_frames) / 1000.0) ; + most_recent_avg_framesize = (movi_size - bytes_before_last_100_frames) / 100; + + if (Lots_of_Stats) { + Serial.printf("So far: %04d frames, in %6.1f seconds, for last 100 frames: avg frame size %6.1f kb, %.2f fps ...\n", frame_cnt, 0.001 * (millis() - avi_start_time), 1.0 / 1024 * most_recent_avg_framesize, most_recent_fps); + logfile.printf("So far: %04d frames, in %6.1f seconds, for last 100 frames: avg frame size %6.1f kb, %.2f fps ...\n", frame_cnt, 0.001 * (millis() - avi_start_time), 1.0 / 1024 * most_recent_avg_framesize, most_recent_fps); + } + + total_delay = 0; + + bytes_before_last_100_frames = movi_size; + time_before_last_100_frames = millis(); + } + } + } + } +} + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// loop() - loop runs at low prio, so I had to move it to the task the_camera_loop at higher priority +//long next_delete = 1000; + +void loop() { + long run_time = millis() - boot_time; + + // if ( millis() > next_delete){ + // next_delete = millis() + (15 * 60 * 1000); + if (delete_old_stuff_flag == 1) { + delete_old_stuff_flag = 0; + delete_old_stuff(); + } + start_record_2nd_opinion = start_record_1st_opinion; + start_record_1st_opinion = digitalRead(12); + + if (start_record_1st_opinion == start_record_2nd_opinion ) { + if (start_record_1st_opinion > 0 ) start_record = 1; + else start_record = 0; + } + + int read13 = digitalRead(13); + delay(20); + read13 = read13 + digitalRead(13); // get 2 opinions to help poor soldering + + if (IncludeInternet == 4 || IncludeInternet == 2) { // 4 is oppoiste of 3, so, flip read13 + if (read13 > 0) { + read13 = 0; + } else { + read13 = 2; + } + } + + if (IncludeInternet > 1) { + if (read13 == 2 && !InternetOff) { + Serial.println("Shutting off wifi ..."); logfile.println("Shutting off wifi ..."); + filemgr.end(); + stopCameraServer(); + WiFiManager wm; + wm.disconnect(); + InternetOff = true; + } + if (read13 == 0 && InternetOff) { + Serial.println("Starting the wifi ..."); logfile.println("Starting the wifi ..."); + init_wifi(); + Serial.println("Starting Web Services ..."); + startCameraServer(); + filemgr.begin(); + InternetOff = false; + } + } + + if (reboot_now == true) { + Serial.println(" \n\n\n Rebooting ... \n\n\n"); + delay(2000); + ESP.restart(); + } + if (!InternetOff) { + filemgr.handleClient(); //v56 + } + delay(200); + +} diff --git a/v58/ESPxWebFlMgr.cpp b/v58/ESPxWebFlMgr.cpp index 31a2c57..ca038a9 100644 --- a/v58/ESPxWebFlMgr.cpp +++ b/v58/ESPxWebFlMgr.cpp @@ -1,4 +1,5 @@ // mods by James Zahary Dec 28, 2021 https://github.com/jameszah/ESPxWebFlMgr +// Jan 12, 2022 - adds dates/times to display // based on https://github.com/holgerlembke/ESPxWebFlMgr #include @@ -9,6 +10,8 @@ #include "crc32.h" +#include //jz + #ifdef ESP8266 #include #include @@ -302,38 +305,38 @@ void ESPxWebFlMgr::fileManagerFileListInsert(void) { // must get arg with /i to //Serial.println(fileManager->arg(0)); if ( (fileManager->args() == 1) && (fileManager->argName(0) == "subdir") ) { - subdir = fileManager->arg(0); + subdir = fileManager->arg(0); //Serial.print("Arg: "); Serial.println(fileManager->arg(0)); /* - if (fileManager->arg(0) == "/"){ - subdir = "/"; - } else if (subdir == "/") { - subdir = fileManager->arg(0); - } else { - subdir = fileManager->arg(0); - } - Serial.print("New subdir: "); Serial.println(subdir); + if (fileManager->arg(0) == "/"){ + subdir = "/"; + } else if (subdir == "/") { + subdir = fileManager->arg(0); + } else { + subdir = fileManager->arg(0); + } + Serial.print("New subdir: "); Serial.println(subdir); */ } else { subdir = "/"; } //Serial.print("Final subdir: "); Serial.println(subdir); - + // first file is "go to root" - + String fcd; String direct = "ccd"; //jz bland color for directory String fn = "/"; fcd = "
  " + fn + " - GOTO ROOT DIR -" + "
"; - + "class=\"ccl " + direct + "\"" + "onclick=\"opendirectory('" + fn + "')\"" + ">  " + fn + " - GOTO ROOT DIR -" + ""; + fcd += "
 " + " " + " 
"; fcd += "
 " + dispIntDotted(0) + " 
"; fcd += "
 "; fcd += "  
"; - + fileManager->sendContent(fcd); @@ -344,10 +347,10 @@ void ESPxWebFlMgr::fileManagerFileListInsert(void) { // must get arg with /i to while (file) { String fn = file.name(); /* - Serial.print("FN: >"); - Serial.print(fn); - Serial.print("<"); - Serial.println(); + Serial.print("FN: >"); + Serial.print(fn); + Serial.print("<"); + Serial.println(); */ if ( (_ViewSysFiles) || (allowAccessToThisFile(fn)) ) { /* @@ -360,7 +363,7 @@ void ESPxWebFlMgr::fileManagerFileListInsert(void) { // must get arg with /i to String fc; String nsd; - if (subdir == "/"){ + if (subdir == "/") { nsd = "/"; } else { nsd = subdir + "/"; @@ -381,6 +384,15 @@ void ESPxWebFlMgr::fileManagerFileListInsert(void) { // must get arg with /i to ">  " + fn + ""; } + time_t t= file.getLastWrite(); + struct tm * tmstruct = localtime(&t); + //Serial.printf(" LAST WRITE: %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec); + char ccz[100]; + sprintf(ccz, " %d-%02d-%02d %02d:%02d:%02d\n",(tmstruct->tm_year)+1900,( tmstruct->tm_mon)+1, tmstruct->tm_mday,tmstruct->tm_hour , tmstruct->tm_min, tmstruct->tm_sec); + + + fc += "
 " + String(ccz) + " 
"; //jz + // File f = dir.openFile("r"); fc += "
 " + dispIntDotted(file.size()) + " 
"; @@ -459,7 +471,7 @@ void ESPxWebFlMgr::fileManagerFileEditorInsert(void) { fileManager->sendContent(ESPxWebFlMgrWpFormIntro); if (ESPxWebFlMgr_FileSystem.exists(subdir + "/" + fn)) { - File f = ESPxWebFlMgr_FileSystem.open(subdir + "/" + fn, "r"); + File f = ESPxWebFlMgr_FileSystem.open(subdir + "/" + fn, "r"); if (f) { do { String l = f.readStringUntil('\n') + '\n'; @@ -817,7 +829,7 @@ void ESPxWebFlMgr::fileManagerCommandExecutor(void) { Serial.print(fileManager->arg(i)); Serial.println(); } - */ + */ // no Args: DIE! if (fileManager->args() == 0) { @@ -878,7 +890,17 @@ void ESPxWebFlMgr::fileManagerCommandExecutor(void) { if ( (fileManager->args() == 1) && (fileManager->argName(0) == "del") ) { String fn = fileManager->arg(0); if ( (_ViewSysFiles) || (allowAccessToThisFile(fn)) ) { - ESPxWebFlMgr_FileSystem.remove( subdir + "/" + fn); // Add slash + int x = ESPxWebFlMgr_FileSystem.remove( subdir + "/" + fn); // Add slash + //delay(1000); + if (!x) { + Serial.print("remove failed, try rmdir "); + Serial.print( subdir + "/" + fn ); + int y = ESPxWebFlMgr_FileSystem.rmdir( "/" + fn); // Add slash + //delay(1000); + if (!y) { + Serial.print("rmdir failed, directory must be empty! "); + } + } } } @@ -889,8 +911,9 @@ void ESPxWebFlMgr::fileManagerCommandExecutor(void) { if ( (_ViewSysFiles) || (allowAccessToThisFile(fn)) ) { String fn2 = CheckFileNameLengthLimit(fileManager->arg(1)); if ( (_ViewSysFiles) || (allowAccessToThisFile(fn2)) ) { - //Serial.println(fn); - //Serial.println(fn2); + Serial.println(subdir); + Serial.println(fn); + Serial.println(fn2); ESPxWebFlMgr_FileSystem.rename( subdir + "/" + fn, subdir + "/" + fn2); } } diff --git a/v58/ESPxWebFlMgr.h b/v58/ESPxWebFlMgr.h index b99963e..42e5d36 100644 --- a/v58/ESPxWebFlMgr.h +++ b/v58/ESPxWebFlMgr.h @@ -1,4 +1,5 @@ // mods by James Zahary Dec 28, 2021 https://github.com/jameszah/ESPxWebFlMgr +// Jan 12, 2022 - adds dates/times to display // based on https://github.com/holgerlembke/ESPxWebFlMgr // inline guard. Did I mention that c/c++ is broken by design? diff --git a/v58/ESPxWebFlMgrWp.h b/v58/ESPxWebFlMgrWp.h index 02715e8..e04d9c5 100644 --- a/v58/ESPxWebFlMgrWp.h +++ b/v58/ESPxWebFlMgrWp.h @@ -1,4 +1,5 @@ // mods by James Zahary Dec 28, 2021 https://github.com/jameszah/ESPxWebFlMgr +// Jan 12, 2022 - adds dates/times to display // based on https://github.com/holgerlembke/ESPxWebFlMgr // inline guard. Did I mention that c/c++ is broken by design? @@ -526,9 +527,13 @@ div { text-align: right; } +.ccz { + text-align: right; +} + .gc { display: grid; - grid-template-columns: repeat(3, max-content); + grid-template-columns: repeat(4, max-content); } )==g==";