global cleaning, restructure

This commit is contained in:
Yuri Trikoz
2020-06-20 14:27:58 +03:00
parent ece010976e
commit 6f310e5e07
81 changed files with 11067 additions and 1587 deletions

View File

@@ -1,84 +1,83 @@
#include "Global.h"
void not_async_actions();
void setup() {
//--------------------------------------------------------------
File_system_init();
Serial.println("SPIFFS_init");
//--------------------------------------------------------------
CMD_init();
Serial.println("[V] CMD_init");
//--------------------------------------------------------------
sensors_init();
Serial.println("[V] sensors_init");
//--------------------------------------------------------------
All_init();
Serial.println("[V] All_init");
//--------------------------------------------------------------
ROUTER_Connecting();
Serial.println("[V] ROUTER_Connecting");
//--------------------------------------------------------------
uptime_init();
Serial.println("[V] statistics_init");
//--------------------------------------------------------------
initUpgrade();
Serial.println("[V] initUpgrade");
//--------------------------------------------------------------
Web_server_init();
Serial.println("[V] Web_server_init");
//--------------------------------------------------------------
web_init();
Serial.println("[V] web_init");
//--------------------------------------------------------------
Time_Init();
Serial.println("[V] Time_Init");
//--------------------------------------------------------------
//--------------------------------------------------------------
File_system_init();
Serial.println("SPIFFS_init");
//--------------------------------------------------------------
CMD_init();
Serial.println("[V] CMD_init");
//--------------------------------------------------------------
sensors_init();
Serial.println("[V] sensors_init");
//--------------------------------------------------------------
All_init();
Serial.println("[V] All_init");
//--------------------------------------------------------------
ROUTER_Connecting();
Serial.println("[V] ROUTER_Connecting");
//--------------------------------------------------------------
uptime_init();
Serial.println("[V] statistics_init");
//--------------------------------------------------------------
initUpgrade();
Serial.println("[V] initUpgrade");
//--------------------------------------------------------------
Web_server_init();
Serial.println("[V] Web_server_init");
//--------------------------------------------------------------
web_init();
Serial.println("[V] web_init");
//--------------------------------------------------------------
Time_Init();
Serial.println("[V] Time_Init");
//--------------------------------------------------------------
#ifdef UDP_enable
UDP_init();
Serial.println("[V] UDP_init");
UDP_init();
Serial.println("[V] UDP_init");
#endif
//--------------------------------------------------------------
//--------------------------------------------------------------
ts.add(
TEST, 10000, [&](void*) {
getMemoryLoad("[i] periodic check of");
//ws.textAll(json);
},
nullptr, true);
ts.add(TEST, 10000, [&](void*) {
getMemoryLoad("[i] periodic check of");
//ws.textAll(json);
}, nullptr, true);
just_load = false;
just_load = false;
}
void loop() {
#ifdef OTA_enable
ArduinoOTA.handle();
ArduinoOTA.handle();
#endif
#ifdef WS_enable
ws.cleanupClients();
ws.cleanupClients();
#endif
not_async_actions();
not_async_actions();
handleMQTT();
handleCMD_loop();
handleButton();
handleScenario();
handleMQTT();
handleCMD_loop();
handleButton();
handleScenario();
#ifdef UDP_enable
handleUdp();
handleUdp();
#endif
ts.update();
ts.update();
}
void not_async_actions() {
do_mqtt_connection();
do_upgrade_url();
do_upgrade();
do_mqtt_connection();
do_upgrade_url();
do_upgrade();
#ifdef UDP_enable
do_udp_data_parse();
do_mqtt_send_settings_to_udp();
do_udp_data_parse();
do_mqtt_send_settings_to_udp();
#endif
do_i2c_scanning();
do_i2c_scanning();
}