Merge pull request 'WMT_PW' (#1) from WMT_PW into main

Reviewed-on: #1

src/APIClient.cpp

@@ -71,6 +71,7 @@ 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()) {
@@ -79,8 +80,10 @@ 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;
@@ -98,6 +101,7 @@ 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()) {

src/Network.cpp

@@ -275,6 +275,11 @@ bool WiFiManager::performOTAUpdate(bool allowInsecureTLS, std::function<void(int
 }
 
 void WiFiManager::startCaptivePortal() {
+  if (captivePortalActive) {
+    ESP_LOGI(WIFI, "Captive Portal is already running.");
+    return;
+  }
+  
   ESP_LOGI(WIFI, "Starting Captive Portal");
   setupAccessPoint(ssidAP.c_str(), passwordAP.c_str());
   

src/UploadManager.cpp

@@ -63,7 +63,9 @@ 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 {
@@ -79,11 +81,14 @@ void UploadManager::processPendingUploads() {
     if (WiFi.status() != WL_CONNECTED) return;
     
     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();
@@ -100,7 +105,9 @@ 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); 
                 }
             }

src/main.cpp

@@ -347,6 +347,7 @@ 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 {
@@ -354,9 +355,12 @@ 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;
@@ -399,13 +403,13 @@ void loop() {
   if(settings.isPressed(3)) settingsDevice(); // DOWN
   if(settings.isPressed(1)) toogleMode();     // UP
 
-  if (settings.readBtnUp() && settings.readBtnDown()) {
+  if (settings.readBtnUp() && settings.readBtnOk()) {
     ESP_LOGI(TAG_MAIN, "Manual AP Mode trigger");
     wifi.startCaptivePortal();
     display.clear();
     display.textCenter(1, "AP MODE");
     display.textCenter(2, "192.168.4.1");
-    while(settings.readBtnUp() && settings.readBtnDown()) {
+    while(settings.readBtnUp() && settings.readBtnOk()) {
       Watchdog::feed();
       delay(50);
     }