From c362c5e0bcf7fa96ade5bea77a10b37838f276c6 Mon Sep 17 00:00:00 2001 From: biver Date: Wed, 8 Feb 2023 11:40:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BD=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/EspFileSystem.h | 2 +- include/classes/IoTItem.h | 2 +- src/EspFileSystem.cpp | 12 ++++++------ src/classes/IoTItem.cpp | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/EspFileSystem.h b/include/EspFileSystem.h index 81a6a660..b77439ba 100644 --- a/include/EspFileSystem.h +++ b/include/EspFileSystem.h @@ -35,7 +35,7 @@ extern FS* filesystem; extern bool fileSystemInit(); extern void globalVarsSync(); -extern String getParamsJson(); +//extern String getParamsJson(); extern void syncSettingsFlashJson(); extern void syncValuesFlashJson(); diff --git a/include/classes/IoTItem.h b/include/classes/IoTItem.h index 41cd0794..c0cce8ed 100644 --- a/include/classes/IoTItem.h +++ b/include/classes/IoTItem.h @@ -90,7 +90,7 @@ class IoTItem { IoTItem* findIoTItem(const String& name); // поиск экземпляра элемента модуля по имени String getItemValue(const String& name); // поиск плюс получение значения bool isItemExist(const String& name); // существует ли айтем -StaticJsonDocument* getLocalItemsAsJSON(); // сбор всех локальных значений Items +//StaticJsonDocument* getLocalItemsAsJSON(); // сбор всех локальных значений Items IoTItem* createItemFromNet(const String& itemId, const String& value, int interval); IoTItem* createItemFromNet(const String& msgFromNet); diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp index 2b45dd7d..21d6f11f 100644 --- a/src/EspFileSystem.cpp +++ b/src/EspFileSystem.cpp @@ -27,12 +27,12 @@ void globalVarsSync() { } //к удалению. не используется -String getParamsJson() { - String json; - serializeJson(*getLocalItemsAsJSON(), json); - jsonWriteStr_(json, "params", ""); - return json; -} +// String getParamsJson() { +// String json; +// serializeJson(*getLocalItemsAsJSON(), json); +// jsonWriteStr_(json, "params", ""); +// return json; +// } void syncSettingsFlashJson() { writeFile(F("settings.json"), settingsFlashJson); diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp index 5cf3688e..5b8c5476 100644 --- a/src/classes/IoTItem.cpp +++ b/src/classes/IoTItem.cpp @@ -301,13 +301,13 @@ void analyzeMsgFromNet(const String& msg, String altId) { } } -StaticJsonDocument docForExport; +//StaticJsonDocument docForExport; -StaticJsonDocument* getLocalItemsAsJSON() { - docForExport.clear(); - for (std::list::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) { - if ((*it)->iAmLocal) docForExport[(*it)->getID()] = (*it)->getValue(); - } +// StaticJsonDocument* getLocalItemsAsJSON() { +// docForExport.clear(); +// for (std::list::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) { +// if ((*it)->iAmLocal) docForExport[(*it)->getID()] = (*it)->getValue(); +// } - return &docForExport; -} \ No newline at end of file +// return &docForExport; +// } \ No newline at end of file