From 652eaa99d0d48a82b44d468b8e711c82e489c416 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sat, 20 Jun 2020 16:06:51 +0200 Subject: [PATCH] Change order of lines for more good vision. Only order Youra! --- include/Global.h | 44 ++++++++++++++++++++++++++++++-------------- src/Global.cpp | 12 +++++++++--- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/include/Global.h b/include/Global.h index b2cb18f8..868e7bf1 100644 --- a/include/Global.h +++ b/include/Global.h @@ -1,5 +1,9 @@ #pragma once +/* +* Libraries +*/ + #include #include #include @@ -31,6 +35,32 @@ #include #endif +/* +* Objects.h(без данных) +*/ + +#ifdef WS_enable +extern AsyncWebSocket ws; +//extern AsyncEventSource events; +#endif + +extern TickerScheduler ts; + +extern PubSubClient client_mqtt; + +extern StringCommand sCmd; + +extern AsyncWebServer server; + +extern DallasTemperature sensors; + + + + +/* +* Global vars +*/ + enum { ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, SENSORS, @@ -50,20 +80,6 @@ enum { ROUTER_SEARCHING, UDP_DB, TEST }; -/* -* Global vars -*/ -extern TickerScheduler ts; - -#ifdef WS_enable -extern AsyncWebSocket ws; -//extern AsyncEventSource events; -#endif - -extern PubSubClient client_mqtt; -extern StringCommand sCmd; -extern AsyncWebServer server; -extern DallasTemperature sensors; extern boolean just_load; diff --git a/src/Global.cpp b/src/Global.cpp index b9402571..f6890b2b 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -8,15 +8,21 @@ AsyncWebSocket ws; //AsyncEventSource events; #endif + TickerScheduler ts(TEST + 1); -WiFiClient espClient; + PubSubClient client_mqtt(espClient); + StringCommand sCmd; + AsyncWebServer server(80); -//AsyncWebSocket ws("/ws"); -//AsyncEventSource events("/events"); + DallasTemperature sensors; +WiFiClient espClient; + + + /* * Global vars */