diff --git a/src/APIClient.cpp b/src/APIClient.cpp index 850e8f3..735e015 100644 --- a/src/APIClient.cpp +++ b/src/APIClient.cpp @@ -71,7 +71,6 @@ bool APIClient::uploadMeasurement(const String &filePath) { // Multipart body: head + file data + tail client.print(head); - ESP_LOGI(TAG_API, "DEBUG: Beginning file read loop"); uint8_t buffer[2048]; while (file.available()) { @@ -80,10 +79,8 @@ bool APIClient::uploadMeasurement(const String &filePath) { Watchdog::feed(); } - ESP_LOGI(TAG_API, "DEBUG: File read loop finished. Writing tail."); client.print(tail); file.close(); - ESP_LOGI(TAG_API, "DEBUG: Tail written. Waiting for response..."); // --- Parsowanie odpowiedzi --- int httpCode = 0; @@ -101,7 +98,6 @@ bool APIClient::uploadMeasurement(const String &filePath) { } Watchdog::feed(); } - ESP_LOGI(TAG_API, "DEBUG: Header parsing loop finished. httpCode: %d", httpCode); String responseBody = ""; while (client.available()) { diff --git a/src/UploadManager.cpp b/src/UploadManager.cpp index 095acd3..16c418b 100644 --- a/src/UploadManager.cpp +++ b/src/UploadManager.cpp @@ -63,9 +63,7 @@ void UploadManager::uploadFile(const String& filePath) { return; } - ESP_LOGI(TAG_UPLOAD, "DEBUG: Before apiClient.uploadMeasurement"); bool success = apiClient.uploadMeasurement(filePath); - ESP_LOGI(TAG_UPLOAD, "DEBUG: After apiClient.uploadMeasurement. Success: %d", success); if (success) { appendLog(filePath, "OK"); } else { @@ -88,14 +86,11 @@ void UploadManager::processPendingUploads() { } ESP_LOGI(TAG_UPLOAD, "Checking for pending uploads..."); - ESP_LOGI(TAG_UPLOAD, "DEBUG: findHighestNumericDir()"); uint32_t highestDir = capture_.findHighestNumericDir(); - ESP_LOGI(TAG_UPLOAD, "DEBUG: highestDir: %u", highestDir); if (highestDir == 0) return; for (uint32_t d = 1; d <= highestDir; d++) { String path = capture_.dirPath(d); - ESP_LOGI(TAG_UPLOAD, "DEBUG: Scanning dir: %s", path.c_str()); File dir = SD.open(path); if (!dir || !dir.isDirectory()) { if(dir) dir.close(); @@ -112,9 +107,7 @@ void UploadManager::processPendingUploads() { if (childPath.endsWith(".wmt")) { if (!isAlreadyUploaded(childPath)) { ESP_LOGI(TAG_UPLOAD, "Found pending file: %s", childPath.c_str()); - ESP_LOGI(TAG_UPLOAD, "DEBUG: Calling uploadFile()"); uploadFile(childPath); - ESP_LOGI(TAG_UPLOAD, "DEBUG: Finished uploadFile(), delaying 1000ms"); delay(1000); } } diff --git a/src/main.cpp b/src/main.cpp index 596d40d..3bb3b89 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -55,7 +55,6 @@ Thread wifiTestThread = Thread(); // Cykliczny test WiFi Thread offlineThread = Thread(); // Jeśli offline Thread measureThread = Thread(); // Pomiar i zapis na SD Thread uploadThread = Thread(); // Background upload -Thread configSyncThread = Thread(); // Polling WiFi config z API //////// PROTOTYPY ///////////////// void setup(); @@ -230,9 +229,6 @@ void setup() { if(config.connect){ uploadThread.onRun([]() { uploadManager.processPendingUploads(); }); uploadThread.setInterval(60000); // Co 1 minutę sprawdzaj zaległe - - configSyncThread.onRun([]() { apiClient.fetchWiFiConfig(); }); - configSyncThread.setInterval(60000); // Odpytywanie o WiFi też co minutę } // Dodanie taska loop do WDT @@ -354,7 +350,6 @@ void measure(){ Watchdog::feed(); if(!capture.isExit){ capture.printLastFileInfoSerial(); - ESP_LOGI(TAG_MAIN, "DEBUG: before readHeaderAndPrint"); capture.readHeaderAndPrint(capture.generateNextFilename().c_str()); ESP_LOGI(TAG_MAIN, "MEASURE FINISH"); } else { @@ -362,12 +357,9 @@ void measure(){ //runMeasure = false; } - ESP_LOGI(TAG_MAIN, "DEBUG: Checking WiFi status for upload"); if (config.connect && WiFi.status() == WL_CONNECTED) { ESP_LOGI(TAG_MAIN, "TRIGGER UPLOAD PENDING..."); - ESP_LOGI(TAG_MAIN, "DEBUG: Before uploadManager.processPendingUploads()"); uploadManager.processPendingUploads(); - ESP_LOGI(TAG_MAIN, "DEBUG: After uploadManager.processPendingUploads()"); } runMeasure = false; @@ -456,8 +448,9 @@ void loop() { if(config.connect){ uploadThread.run(); - configSyncThread.run(); - } if(offlineThread.shouldRun() && (!config.connect)){ + } + + if(offlineThread.shouldRun() && (!config.connect)){ offlineThread.run(); }