reverting version

include/Global.h

@@ -0,0 +1,221 @@
+#pragma once
+
+/*
+* Libraries
+*/
+#include <Arduino.h>
+#include <ArduinoJson.h>
+
+#include "ESP32.h"
+#include "ESP8266.h"
+//
+#include "Consts.h"
+#include "Errors.h"
+#include "GyverFilters.h"
+#include "Upgrade.h"
+#include "Clock.h"
+
+#include "MqttClient.h"
+#include "Utils\FileUtils.h"
+#include "Utils\JsonUtils.h"
+#include "Utils\StringUtils.h"
+#include "Utils\SysUtils.h"
+#include "Utils\PrintMessage.h"
+#include "Utils\WiFiUtils.h"
+
+//=========ПОДКЛЮЧЕНИЕ ОБЩИХ БИБЛИОТЕК===============
+
+#include <Adafruit_BME280.h>
+#include <Adafruit_BMP280.h>
+#include <Bounce2.h>
+#include <DHTesp.h>
+#include <DallasTemperature.h>
+#include <OneWire.h>
+#include <PubSubClient.h>
+#include <StringCommand.h>
+#include <TickerScheduler.h>
+#include <Wire.h>
+#include <time.h>
+#include <ArduinoOTA.h>
+
+
+#ifdef WEBSOCKET_ENABLED
+extern AsyncWebSocket ws;
+//extern AsyncEventSource events;
+#endif
+
+extern Clock* timeNow;
+
+extern TickerScheduler ts;
+
+
+
+extern WiFiClient espClient;
+
+extern PubSubClient mqtt;
+
+extern StringCommand sCmd;
+
+extern AsyncWebServer server;
+
+extern DallasTemperature sensors;
+
+extern OneWire *oneWire;
+
+extern boolean but[NUM_BUTTONS];
+
+extern Bounce* buttons;
+
+/*
+* Global vars
+*/
+
+extern boolean just_load;
+
+// Json
+extern String configSetupJson;   //все настройки
+extern String configLiveJson;    //все данные с датчиков (связан с mqtt)
+extern String configOptionJson;  //для трансфера
+
+// Mqtt
+extern String chipId;
+extern String prex;
+
+extern String all_widgets;
+
+extern String scenario;
+
+//orders and events
+extern String orderBuf;
+extern String eventBuf;
+
+extern String itemsFile;
+extern String itemsLine;
+
+// Sensors
+extern String sensorReadingMap;
+
+
+
+
+extern String analog_value_names_list;
+extern int enter_to_analog_counter;
+
+extern String dallas_value_name;
+extern int enter_to_dallas_counter;
+
+extern String levelPr_value_name;
+extern String ultrasonicCm_value_name;
+
+extern String dhtT_value_name;
+extern String dhtH_value_name;
+
+extern String bmp280T_value_name;
+extern String bmp280P_value_name;
+
+extern String bme280T_value_name;
+extern String bme280P_value_name;
+extern String bme280H_value_name;
+extern String bme280A_value_name;
+
+extern String logging_value_names_list;
+extern int enter_to_logging_counter;
+
+extern int scenario_line_status[40];
+
+extern String lastVersion;
+
+extern boolean checkUpdatesFlag;
+extern boolean updateFlag;
+extern boolean mqttParamsChanged;
+extern boolean udp_data_parse;
+extern boolean mqtt_send_settings_to_udp;
+extern boolean delElementFlag;
+extern boolean getJsonListFromCsvFlag;
+
+extern String csvFile;
+extern int colum;
+
+/*
+* Запрос на скарнирование шины
+*/
+extern boolean busScanFlag;
+/*
+* Запрос на сканирование шины, указание какую
+*/
+extern BusScanner_t busToScan;
+
+extern boolean fsCheckFlag;
+
+extern int sensors_reading_map[15];
+
+/*
+* Global functions
+*/
+
+
+
+
+// Logging
+extern void logging();
+extern void deleteOldDate(String filename, size_t max_lines, String date_to_add);
+extern void clean_log_date();
+extern void choose_log_date_and_send();
+
+// Main
+extern void setChipId();
+extern void saveConfig();
+extern void setConfigParam(const char* param, const String& value);
+
+extern String getURL(const String& urls);
+extern void do_fscheck();
+extern void doBusScan();
+extern void servo_();
+extern void clock_init();
+
+extern void setLedStatus(LedStatus_t);
+
+//Scenario
+extern void eventGen(String event_name, String number);
+extern String add_set(String param_name);
+
+
+
+//Timers
+extern void Timer_countdown_init();
+extern void timerStart_();
+extern void addTimer(String number, String time);
+extern void timerStop_();
+extern void delTimer(String number);
+extern int readTimer(int number);
+
+extern void upgradeInit();
+
+// widget
+extern void createWidgetByType(String widget_name, String page_name, String page_number, String file, String topic);
+extern void createWidgetParam(String widget_name, String page_name, String page_number, String file, String topic, String name1, String param1, String name2, String param2, String name3, String param3);
+extern void createWidget(String widget_name, String page_name, String page_number, String type, String topik);
+extern void createChart(String widget_name, String page_name, String page_number, String file, String topic, String maxCount);
+
+// PushingBox
+extern void pushControl();
+
+// UDP
+extern void udpInit();
+extern void do_udp_data_parse();
+extern void do_mqtt_send_settings_to_udp();
+
+extern void addCommandLoop(const String& cmdStr);
+extern void loopSerial();
+extern void loopCmd();
+extern void loopScenario();
+extern void loopUdp();
+
+extern void do_update();
+
+// Init
+extern void uptime_init();
+
+// Web
+extern void web_init();
+extern void telemetry_init();