iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from IoTManagerProject/platformio

Browse Source 
sync to base
This commit is contained in:
Yuri Trikoz
2020-06-20 17:17:56 +03:00
committed by GitHub
parent de5a9c01d0 52599fe02c
commit db5b8d7258
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/Global.h
View File

@@ -1,5 +1,9 @@
#pragma once #pragma once
/*
* Libraries
*/
#include <Arduino.h> #include <Arduino.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ESP8266HTTPUpdateServer.h> #include <ESP8266HTTPUpdateServer.h>
@@ -33,6 +37,32 @@
#include <ArduinoOTA.h> #include <ArduinoOTA.h>
#endif #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, enum { ROUTER_SEARCHING,
WIFI_MQTT_CONNECTION_CHECK, WIFI_MQTT_CONNECTION_CHECK,
SENSORS, SENSORS,
@@ -52,20 +82,6 @@ enum { ROUTER_SEARCHING,
UDP_DB, UDP_DB,
TEST }; 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; extern boolean just_load;

12
src/Global.cpp
View File

@@ -8,15 +8,21 @@
AsyncWebSocket ws; AsyncWebSocket ws;
//AsyncEventSource events; //AsyncEventSource events;
#endif #endif
TickerScheduler ts(TEST + 1); TickerScheduler ts(TEST + 1);
WiFiClient espClient;
PubSubClient client_mqtt(espClient); PubSubClient client_mqtt(espClient);
StringCommand sCmd; StringCommand sCmd;
AsyncWebServer server(80); AsyncWebServer server(80);
//AsyncWebSocket ws("/ws");
//AsyncEventSource events("/events");
DallasTemperature sensors; DallasTemperature sensors;
WiFiClient espClient;
/* /*
* Global vars * Global vars
*/ */