Добавляем получение форматированного времени

This commit is contained in:
2022-08-22 21:23:26 +03:00
parent 5aef309154
commit 4ed7996309

View File

@@ -285,13 +285,15 @@ enum SysOp {
sysop_analogRead, // sysop_analogRead, //
sysop_digitalWrite, // sysop_digitalWrite, //
sysop_digitalInvert, // sysop_digitalInvert, //
sysop_deepSleep, // sysop_deepSleep, //
sysop_getTime, //
sysop_getHours, // sysop_getHours, //
sysop_getMinutes, // sysop_getMinutes, //
sysop_getSeconds, // sysop_getSeconds, //
sysop_getMonth, // sysop_getMonth, //
sysop_getDay, sysop_getDay,
sysop_gethhmm,
sysop_gethhmmss,
sysop_getTime,
sysop_getIP, sysop_getIP,
sysop_mqttPub sysop_mqttPub
}; };
@@ -342,13 +344,6 @@ IoTValue sysExecute(SysOp command, std::vector<IoTValue>& param) {
#endif #endif
} }
break; break;
case sysop_getTime:
if (param.size()) {
value.isDecimal = false;
value.valS = getTimeStr(param[0].valS.c_str());
return value;
}
break;
case sysop_getHours: case sysop_getHours:
value.valD = _time_local.hour; value.valD = _time_local.hour;
return value; return value;
@@ -369,6 +364,21 @@ IoTValue sysExecute(SysOp command, std::vector<IoTValue>& param) {
value.valD = _time_local.day_of_month; value.valD = _time_local.day_of_month;
return value; return value;
break; break;
case sysop_gethhmm:
value.isDecimal = false;
value.valS = getTimeLocal_hhmm();
return value;
break;
case sysop_gethhmmss:
value.isDecimal = false;
value.valS = getTimeLocal_hhmmss();
return value;
break;
case sysop_getTime:
value.isDecimal = false;
value.valS = getDateTimeDotFormated();
return value;
break;
case sysop_getIP: case sysop_getIP:
value.valS = jsonReadStr(settingsFlashJson, F("ip")); value.valS = jsonReadStr(settingsFlashJson, F("ip"));
value.isDecimal = false; value.isDecimal = false;
@@ -411,6 +421,9 @@ public:
if (Callee == "getDay") operation = sysop_getDay; else if (Callee == "getDay") operation = sysop_getDay; else
if (Callee == "getIP") operation = sysop_getIP; else if (Callee == "getIP") operation = sysop_getIP; else
if (Callee == "mqttPub") operation = sysop_mqttPub; else if (Callee == "mqttPub") operation = sysop_mqttPub; else
if (Callee == "gethhmm") operation = sysop_gethhmm; else
if (Callee == "gethhmmss") operation = sysop_gethhmmss; else
if (Callee == "getTime") operation = sysop_getTime; else
operation = sysop_notfound; operation = sysop_notfound;
} }