diff -r d43b393a4461 -r f3451031d6c6 main/task_sdcard.c --- a/main/task_sdcard.c Thu Oct 25 20:22:18 2018 +0200 +++ b/main/task_sdcard.c Thu Oct 25 21:10:29 2018 +0200 @@ -130,12 +130,6 @@ fprintf(f, "\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); } fprintf(f, "\"Label\":\"%s\"}", json_log->time); -// printf("{\"MLT_sp\":\"%.3f\",\"MLT_pv\":\"%.3f\",\"MLT_pwm\":\"%d\",\"MLT_tr\":\"%d\",\"Pump\":\"%d\",", -// json_log->mlt_sp, json_log->mlt_pv, json_log->mlt_power, json_log->mlt_tempreached, json_log->pump_run); -// if (json_log->hlt_sp > 0.0) { -// printf("\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); -// } -// printf("\"Label\":\"%s\"}\n", json_log->time); fclose(f); } } @@ -369,67 +363,6 @@ -/** - * @brief Sync directories. - * @param fromdir Source directory - * @param todir Destination directory - */ -#if 0 -void SyncDirs(char *fromdir, char *todir) -{ - char ff[64], tf[64]; - struct stat fs, ts; - int rc; - - ESP_LOGI(TAG, "SyncDirs(%s, %s)", fromdir, todir); - - DIR *dir = opendir(fromdir); - struct dirent* de = readdir(dir); - while (de) { - if (de->d_type == DT_REG) { - sprintf(ff, "%s/%s", fromdir, de->d_name); - if (stat(ff, &fs) == ESP_OK) { - - sprintf(tf, "%s/%s", todir, de->d_name); - if (stat(tf, &ts) != ESP_OK) { - ts.st_size = 0; - } - - if (fs.st_size && (fs.st_size != ts.st_size)) { - rc = FileCopy(ff, tf); - ESP_LOGI(TAG, "Copy %s to %s, %ld bytes, rc=%d", ff, todir, fs.st_size, rc); - } - } - } - de = readdir(dir); - vTaskDelay(50 / portTICK_PERIOD_MS); - } - closedir(dir); - - /* - * Now see if we need to remove files. - */ - dir = opendir(todir); - de = readdir(dir); - while (de) { - sprintf(tf, "%s/%s", todir, de->d_name); - sprintf(ff, "%s/%s", fromdir, de->d_name); - - if (stat(ff, &fs) != ESP_OK) { - if (unlink(tf) == ESP_OK) { - ESP_LOGI(TAG, "Removed %s", tf); - } - } - - de = readdir(dir); - vTaskDelay(50 / portTICK_PERIOD_MS); - } - closedir(dir); -} -#endif - - - void task_sdcard(void *pvParameter) { sdmmc_card_t* card; @@ -504,24 +437,6 @@ } else { closedir(dir); } - - -// SyncDirs("/sdcard/w", "/spiffs/w"); -// SyncDirs("/sdcard/w/js", "/spiffs/w/js"); -// SyncDirs("/sdcard/w/css", "/spiffs/w/css"); -// SyncDirs("/sdcard/w/js/modl" , "/spiffs/w/js/modl"); // -// SyncDirs("/sdcard/w/js/utils", "/spiffs/w/js/utils"); -// SyncDirs("/sdcard/w/js/zlib", "/spiffs/w/js/zlib"); -// SyncDirs("/sdcard/w/core", "/spiffs/w/core"); -// SyncDirs("/sdcard/w/core/input", "/spiffs/w/core/input"); -// SyncDirs("/sdcard/w/core/util", "/spiffs/w/core/util"); -// SyncDirs("/sdcard/w/app", "/spiffs/w/app"); -// SyncDirs("/sdcard/w/app/images", "/spiffs/w/app/images"); -// SyncDirs("/sdcard/w/app/locale", "/spiffs/w/app/locale"); -// SyncDirs("/sdcard/w/app/sounds", "/spiffs/w/app/sounds"); // -// SyncDirs("/sdcard/w/app/styles", "/spiffs/w/app/styles"); -// SyncDirs("/sdcard/fonts", "/spiffs/fonts"); // - } } else { /*