andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

replace list with vector (makes no diff)

Browse Source
This commit is contained in:
Proddy
2024-02-04 14:49:59 +01:00
parent 40a685aeb2
commit 22b70ac378
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/framework/SecuritySettingsService.h
View File

@@ -33,7 +33,8 @@
class SecuritySettings { class SecuritySettings {
public: public:
String jwtSecret; String jwtSecret;
std::list<User> users; std::vector<User> users;
// std::list<User> users;
static void read(SecuritySettings & settings, JsonObject root) { static void read(SecuritySettings & settings, JsonObject root) {
// secret // secret

4
lib/framework/StatefulService.h
View File

@@ -4,6 +4,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <vector>
#include <list> #include <list>
#include <functional> #include <functional>
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
@@ -129,7 +130,8 @@ class StatefulService {
private: private:
SemaphoreHandle_t _accessMutex; SemaphoreHandle_t _accessMutex;
std::list<StateUpdateHandlerInfo_t> _updateHandlers; std::vector<StateUpdateHandlerInfo_t> _updateHandlers;
// std::list<StateUpdateHandlerInfo_t> _updateHandlers;
}; };
#endif #endif

7
src/web/WebCustomEntityService.h
View File

@@ -43,7 +43,8 @@ class CustomEntityItem {
class WebCustomEntity { class WebCustomEntity {
public: public:
std::list<CustomEntityItem> customEntityItems; std::vector<CustomEntityItem> customEntityItems;
// std::list<CustomEntityItem> customEntityItems;
static void read(WebCustomEntity & webEntity, JsonObject root); static void read(WebCustomEntity & webEntity, JsonObject root);
static StateUpdateResult update(JsonObject root, WebCustomEntity & webEntity); static StateUpdateResult update(JsonObject root, WebCustomEntity & webEntity);
@@ -78,7 +79,9 @@ class WebCustomEntityService : public StatefulService<WebCustomEntity> {
HttpEndpoint<WebCustomEntity> _httpEndpoint; HttpEndpoint<WebCustomEntity> _httpEndpoint;
FSPersistence<WebCustomEntity> _fsPersistence; FSPersistence<WebCustomEntity> _fsPersistence;
std::list<CustomEntityItem> * customEntityItems; // pointer to the list of entity items std::vector<CustomEntityItem> * customEntityItems; // pointer to the list of entity items
// std::list<CustomEntityItem> * customEntityItems; // pointer to the list of entity items
bool ha_registered_ = false; bool ha_registered_ = false;
}; };