Correctly generate component ids

ayushsharma82 · Dec 11, 2023 · ee42a8c · ee42a8c
1 parent 4547fd2
commit ee42a8c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/src/Card.cpp b/src/Card.cpp
@@ -5,11 +5,7 @@
 */
 Card::Card(ESPDash *dashboard, const int type, const char* name, const char* symbol, const int min, const int max){
   _dashboard = dashboard;
-  #if defined(ESP8266)
-    _id = RANDOM_REG32;
-  #elif defined(ESP32)
-    _id = esp_random();
-  #endif
+  _id = dashboard->nextId();
   _type = type;
   _name = name;
   _symbol = symbol;

diff --git a/src/Chart.cpp b/src/Chart.cpp
@@ -5,11 +5,7 @@
 */
 Chart::Chart(ESPDash *dashboard, const int type, const char* name){
   _dashboard = dashboard;
-  #if defined(ESP8266)
-    _id = RANDOM_REG32;
-  #elif defined(ESP32)
-    _id = esp_random();
-  #endif
+  _id = dashboard->nextId();
   _type = type;
   _name = name;
   _dashboard->add(this);

diff --git a/src/ESPDash.cpp b/src/ESPDash.cpp
@@ -461,6 +461,9 @@ void ESPDash::refreshStatistics() {
   generateLayoutJSON(nullptr, true);
 }
 
+uint32_t ESPDash::nextId() {
+  return _idCounter++;
+}
 
 /*
   Destructor

diff --git a/src/ESPDash.h b/src/ESPDash.h
@@ -78,6 +78,7 @@ class ESPDash{
     bool basic_auth = false;
     char username[64];
     char password[64];
+    uint32_t _idCounter = 0;
 
     // Generate layout json
     size_t generateLayoutJSON(AsyncWebSocketClient *client, bool changes_only = false);
@@ -118,6 +119,8 @@ class ESPDash{
 
     void refreshStatistics();
 
+    uint32_t nextId();
+
     ~ESPDash();
 };
 

diff --git a/src/Statistic.cpp b/src/Statistic.cpp
@@ -2,11 +2,7 @@
 
 Statistic::Statistic(ESPDash *dashboard, const char *key, const char *value) {
     _dashboard = dashboard;
-    #if defined(ESP8266)
-        _id = RANDOM_REG32;
-    #elif defined(ESP32)
-        _id = esp_random();
-    #endif
+    _id = dashboard->nextId();
     // Safe copy
     strncpy(_key, key, sizeof(_key));
     strncpy(_value, value, sizeof(_value));