diff --git a/include/Global.h b/include/Global.h index 3569c1d9..9e278511 100644 --- a/include/Global.h +++ b/include/Global.h @@ -1,5 +1,9 @@ #pragma once +/* +* Libraries +*/ + #include #include #include @@ -33,6 +37,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, @@ -52,20 +82,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 */