uart working version

This commit is contained in:
Dmitry Borisenko
2020-12-10 19:12:15 +03:00
parent d17112b3ff
commit f487a691fb
26 changed files with 119 additions and 118 deletions

View File

@@ -10,9 +10,10 @@ const String filepath(const String& filename) {
bool fileSystemInit() {
if (!LittleFS.begin()) {
SerialPrint("[E]","Files","init");
SerialPrint("E", F("FS"), F("FS Init ERROR, may be FS was not flashed"));
return false;
}
SerialPrint("I", F("FS"), F("FS Init"));
return true;
}

View File

@@ -2,8 +2,8 @@
#include "Global.h"
#include "Utils/StringUtils.h"
static const uint8_t days_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
static const char* week_days[7] = {"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat"};
static const uint8_t days_in_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
static const char* week_days[7] = { "Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat" };
// String getTimeUnix() {
// time_t t;
@@ -118,7 +118,8 @@ const String prettySeconds(unsigned long time_s) {
if (days) {
sprintf_P(buf, TIME_FORMAT_WITH_DAYS, days, hours, minutes, seconds);
} else {
}
else {
sprintf_P(buf, TIME_FORMAT, hours, minutes, seconds);
}
return String(buf);
@@ -138,15 +139,18 @@ unsigned long millis_passed(unsigned long start, unsigned long finish) {
unsigned long passed = finish - start;
if (passed <= __LONG_MAX__) {
result = static_cast<long>(passed);
} else {
}
else {
result = static_cast<long>((__LONG_MAX__ - finish) + start + 1u);
}
} else {
}
else {
unsigned long passed = start - finish;
if (passed <= __LONG_MAX__) {
result = static_cast<long>(passed);
result = -1 * result;
} else {
}
else {
result = static_cast<long>((__LONG_MAX__ - start) + finish + 1u);
result = -1 * result;
}
@@ -194,16 +198,19 @@ void breakEpochToTime(unsigned long epoch, Time_t& tm) {
if (1 == month) { // february
if (LEAP_YEAR(year)) {
month_length = 29;
} else {
}
else {
month_length = 28;
}
} else {
}
else {
month_length = days_in_month[month];
}
if (time >= month_length) {
time -= month_length;
} else {
}
else {
break;
}
}
@@ -212,7 +219,7 @@ void breakEpochToTime(unsigned long epoch, Time_t& tm) {
tm.valid = (epoch > MIN_DATETIME);
}
void handle_time_init() {
void timeInit() {
ts.add(
TIME, 1000, [&](void*) {
String timenow = timeNow->getTimeWOsec();
@@ -224,4 +231,5 @@ void handle_time_init() {
}
},
nullptr, true);
SerialPrint("I", F("Time"), F("Handle time init"));
}

View File

@@ -8,7 +8,8 @@ String getURL(const String& urls) {
int httpCode = http.GET();
if (httpCode == HTTP_CODE_OK) {
res = http.getString();
} else {
}
else {
res = "error";
}
http.end();
@@ -68,9 +69,11 @@ const String getRequestInfo(AsyncWebServerRequest* request) {
AsyncWebParameter* p = request->getParam(i);
if (p->isFile()) {
res += "FILE";
} else if (p->isPost()) {
}
else if (p->isPost()) {
res += "POST";
} else {
}
else {
res += "GET";
}
res += ' ';
@@ -86,3 +89,34 @@ const String getRequestInfo(AsyncWebServerRequest* request) {
}
return res;
}
void wifiSignalInit() {
ts.add(
SYGNAL, 1000 * 60, [&](void*) {
SerialPrint("I", "System", printMemoryStatus());
switch (RSSIquality()) {
case 0:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>не подключено к роутеру</font>"));
break;
case 1:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>нет сигнала</font>"));
break;
case 2:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='red'>очень низкий</font>"));
break;
case 3:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='orange'>низкий</font>"));
break;
case 4:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>хороший</font>"));
break;
case 5:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>очень хороший</font>"));
break;
case 6:
jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: <font color='green'>отличный</font>"));
break;
}
},
nullptr, true);
}

View File

@@ -1,13 +1,16 @@
#include "Utils/WiFiUtils.h"
void routerConnect() {
WiFi.setAutoConnect(false);
WiFi.persistent(false);
setLedStatus(LED_SLOW);
WiFi.mode(WIFI_STA);
byte tries = 20;
String _ssid = jsonReadStr(configSetupJson, "routerssid");
String _password = jsonReadStr(configSetupJson, "routerpass");
//WiFi.persistent(false);
if (_ssid == "" && _password == "") {
WiFi.begin();
@@ -39,6 +42,7 @@ void routerConnect() {
setLedStatus(LED_OFF);
mqttInit();
}
SerialPrint("I", F("WIFI"), F("Network Init"));
}
bool startAPMode() {

View File

@@ -25,6 +25,7 @@ void initSt() {
},
nullptr, true);
}
SerialPrint("I", F("Stat"), F("Stat Init"));
}
void decide() {