src/main.cpp

@@ -2,7 +2,7 @@
 #include <Adafruit_SSD1306.h>
 #include <ESP8266HTTPClient.h>
 #include <ArduinoJson.h>
-#include "config.h"
+#include "example_config.h"
 #include "SmartCube/cubeSound.h"
 #include "SmartCube/cubeButtons.h"
 #include "SmartCube/cubeWifiManager.h"
@@ -12,10 +12,12 @@ cubeWifiManager cubeWifiManager(display);
 
 unsigned long lastRefresh = 0;
 const unsigned long refreshInterval = 60000; // 60 seconds
+unsigned long lastDisplayUpdate = 0;
+const unsigned long displayInterval = 100; // 100 ms
 
 String lastEventId = "";
 String problems[10];
-String problemDescriptions = "Test";
+String problemDescriptions;
 int problemCount = 0;
 int severityCounts[5] = {0};
 bool newProblemsDetected = false;
@@ -53,11 +55,10 @@ void fetchActiveProblems() {
   WiFiClient client;
   HTTPClient http;
   http.begin(client, zabbixServer);
-  http.setTimeout(5000);  // 5-second timeout
   http.addHeader("Content-Type", "application/json");
 
   // JSON payload
-  DynamicJsonDocument doc(2048); // Increased to avoid memory issues
+  DynamicJsonDocument doc(1024);
   doc["jsonrpc"] = "2.0";
   doc["method"] = "problem.get";
   doc["id"] = 1;
@@ -78,53 +79,47 @@ void fetchActiveProblems() {
     String response = http.getString();
 
     // Parse response
-    DynamicJsonDocument responseDoc(8192); // Increased size to fit more data
+    DynamicJsonDocument responseDoc(4096);
-    DeserializationError error = deserializeJson(responseDoc, response);
+    deserializeJson(responseDoc, response);
     
-    if (!error) {
     JsonArray result = responseDoc["result"].as<JsonArray>();
-
+    int newProblemCount = 0;
-      // Clear descriptions and severity counts
+    memset(severityCounts, 0, sizeof(severityCounts)); // Reset severities
-      memset(severityCounts, 0, sizeof(severityCounts));
-      problemDescriptions = ""; // Reset before appending
 
     totalProblems = result.size(); // Set total problems count
 
-      int newProblemCount = 0;
     for (JsonObject problem : result) {
       String eventId = problem["eventid"].as<String>();
       int severity = problem["severity"].as<int>();
       String description = problem["name"].as<String>();
 
-        // Check for new problems by comparing event IDs
+      // Check for new problems by comparing event IDs as integers
       if (eventId.toInt() > lastEventId.toInt()) {
         newProblemsDetected = true;
       }
 
+      // Add new problem descriptions to the array
       if (newProblemCount < 10) {
         problems[newProblemCount] = description;
       }
 
+      // Count severities
       if (severity >= 0 && severity < 5) {
         severityCounts[severity]++;
       }
 
-        problemDescriptions += description + "      ";  // Append description with space for better display
       newProblemCount++;
+      problemDescriptions += description;
     }
 
     problemCount = newProblemCount;
 
+    // Update lastEventId after processing the most recent event
     if (problemCount > 0) {
       lastEventId = result[0]["eventid"].as<String>();
     }
   } else {
-      beep(1000);
+    beep(2000);
-    }
-  } else {    
-    display.clearDisplay();
-    display.setCursor(0,30);
-    display.print("Error querying zabbix API");
   }
 
   http.end();
@@ -158,9 +153,10 @@ void displayProblems() {
   }
   // Draw the file name with current scroll position
   display.setTextSize(2);
-  display.setCursor(scrollPos, 48);
+  display.setCursor(scrollPos, 54);
   display.print(problemDescriptions);
-  display.drawLine(0,46,127,46,1);
+  display.setCursor(0, 44);
+  display.setTextSize(1);
   
   display.display();
 }