web interface changed

This commit is contained in:
Dmitry Borisenko
2020-06-11 22:51:34 +02:00
parent e79be004b9
commit be5bd3ede4
67 changed files with 718 additions and 720 deletions

15
set.h
View File

@@ -1,7 +1,7 @@
/*******************************************************************
**********************FIRMWARE SETTINGS****************************
******************************************************************/
//dev
//dev
String firmware_version = "2.3.3";
boolean mb_4_of_memory = true;
//#define OTA_enable
@@ -97,9 +97,12 @@ AsyncEventSource events("/events");
#include <time.h>
#include <TickerScheduler.h>
enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, SENSORS, STEPPER1, STEPPER2, LOG1, LOG2, LOG3, LOG4, LOG5, TIMER_COUNTDOWN, TIME, TIME_SYNC, STATISTICS, UDP, UDP_DB, TEST };
enum {ROUTER_SEARCHING, WIFI_MQTT_CONNECTION_CHECK, SENSORS, STEPPER1, STEPPER2, LOG1, LOG2, LOG3, LOG4, LOG5, TIMER_COUNTDOWN, TIME, TIME_SYNC, STATISTICS, UPTIME, UDP, UDP_DB, TEST };
TickerScheduler ts(TEST + 1);
#include <UpTime.h>
uptime_interval myUpTime(10);
#include <PubSubClient.h>
WiFiClient espClient;
PubSubClient client_mqtt(espClient);
@@ -124,7 +127,7 @@ OneWire *oneWire;
DallasTemperature sensors;
#endif
#ifdef dht_enable
#ifdef dht_enable
#include <DHTesp.h>
DHTesp dht;
#endif
@@ -154,9 +157,9 @@ Adafruit_Sensor *bme_humidity = bme.getHumiditySensor();
boolean just_load = true;
const char* hostName = "IoT Manager";
//JSON
String configSetup = "{}";
String configJson = "{}";
String optionJson = "{}";
String configSetupJson = "{}"; //все настройки
String configLiveJson = "{}"; //все данные с датчиков (связан с mqtt)
String configOptionJson = "{}"; //для трансфера
//MQTT
String chipID = "";
String prex;