From 02d1ddc7b469e3417976c5137ba5e151a0786498 Mon Sep 17 00:00:00 2001
From: Ilya Belyakov <batata@mail.ru>
Date: Fri, 26 Jan 2024 09:25:56 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC=20IP=20=D0=B2=20=D1=81=D1=86=D0=B5=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/EspFileSystem.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/EspFileSystem.cpp b/src/EspFileSystem.cpp
index 7c8777eb..fc4892c5 100644
--- a/src/EspFileSystem.cpp
+++ b/src/EspFileSystem.cpp
@@ -24,6 +24,8 @@ void globalVarsSync()
 
     mqttRootDevice = mqttPrefix + "/" + chipId;
 
+    jsonWriteStr_(settingsFlashJson, "ip", WiFi.localIP().toString());
+
     // это не используется - удалить в последствии
     jsonWriteStr_(settingsFlashJson, "root", mqttRootDevice);
 }

From 8bb3348f393078760c1c23925e1c26321cb77a76 Mon Sep 17 00:00:00 2001
From: Ilya Belyakov <batata@mail.ru>
Date: Wed, 31 Jan 2024 22:09:30 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=B0=D0=B7=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=81=D1=8C=20=D0=BE=D1=82=20distutils.dir=5Futil,=20?=
 =?UTF-8?q?=D1=82.=D0=BA.=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=D0=B8=20=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=B2=20=D1=81=D0=B2=D0=B5=D0=B6=D0=B8=D1=85=20?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=BB=D0=B4=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PrepareProject.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PrepareProject.py b/PrepareProject.py
index 857026b3..d746f2f6 100644
--- a/PrepareProject.py
+++ b/PrepareProject.py
@@ -32,7 +32,6 @@ import configparser
 import os, json, sys, getopt
 from pathlib import Path
 import shutil
-from distutils.dir_util import copy_tree
 
 
 config = configparser.ConfigParser()  # создаём объекта парсера INI
@@ -128,9 +127,9 @@ deviceName = profJson['projectProp']['platformio']['default_envs']
 
 # заполняем папку /data файлами прошивки в зависимости от устройства
 if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota' or deviceName == 'esp8266_2mb_ota': 
-    copy_tree("data_lite", "data_svelte")
+    shutil.copytree("data_lite", "data_svelte", symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
 else:
-    copy_tree("data_full", "data_svelte")
+    shutil.copytree("data_full", "data_svelte", symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
 
 deviceType = 'esp32*'
 if not 'esp32' in deviceName: