iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 06:32:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

clock fix

Browse Source
This commit is contained in:
Yuri Trikoz
2020-06-27 04:20:48 +03:00
parent 39a3cb04ed
commit 7ac0691347
7 changed files with 69 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Clock.h
View File

@@ -113,7 +113,7 @@ class Clock {
* Локальное время "дд.ММ.гг"
*/
const String getDateDigitalFormated() {
char buf[16];
char buf[32];
sprintf(buf, "%02d.%02d.%02d", _time_local.day_of_month, _time_local.month, _time_local.year);
return String(buf);
}
@@ -122,16 +122,22 @@ class Clock {
* Локальное время "чч:мм:cc"
*/
const String getTime() {
char buf[16];
char buf[32];
sprintf(buf, "%02d:%02d:%02d", _time_local.hour, _time_local.minute, _time_local.second);
return String(buf);
}
const String getTimeJson() {
char buf[32];
sprintf(buf, "%02d-%02d-%02d", _time_local.hour, _time_local.minute, _time_local.second);
return String(buf);
}
/*
* Локальное время "чч:мм"
*/
const String getTimeWOsec() {
char buf[16];
char buf[32];
sprintf(buf, "%02d:%02d", _time_local.hour, _time_local.minute);
return String(buf);
}

13
include/Global.h
View File

@@ -127,7 +127,7 @@ extern int sensors_reading_map[15];
*/
// Cmd
extern void CMD_init();
extern void cmd_init();
extern void button();
extern void buttonSet();
extern void buttonChange();
@@ -161,12 +161,11 @@ extern void fileExecute(const String& filename);
extern void stringExecute(String& cmdStr);
// Init
extern void loadConfig();
extern void All_init();
extern void all_init();
extern void statistics_init();
extern void loadScenario();
extern void Device_init();
extern void prsets_init();
extern void up_time();
// Logging
extern void logging();
@@ -178,8 +177,10 @@ extern void choose_log_date_and_send();
extern void setChipId();
extern void saveConfig();
extern String getURL(const String& urls);
extern void do_check_fs();
extern void do_scan_bus();
extern void servo_();
extern void clock_init();
extern void setLedStatus(LedStatus_t);
@@ -251,7 +252,6 @@ extern void UDP_init();
extern void do_udp_data_parse();
extern void do_mqtt_send_settings_to_udp();
// iot_firmware
extern void addCommandLoop(const String& cmdStr);
extern void loopSerial();
extern void loopCmd();
@@ -266,5 +266,4 @@ extern void uptime_init();
// Web
extern void web_init();
extern void telemetry_init();
extern void telemetry_init();

8
include/Utils/JsonUtils.h
View File

@@ -6,10 +6,10 @@ String jsonReadStr(String& json, String name);
int jsonReadInt(String& json, String name);
String jsonWriteStr(String& json, String name, String volume);
boolean jsonReadBool(String& json, String name);
String jsonWriteInt(String& json, String name, int volume);
String jsonWriteStr(String& json, String name, String value);
String jsonWriteFloat(String& json, String name, float volume);
String jsonWriteInt(String& json, String name, int value);
boolean jsonReadBool(String& json, String name);
String jsonWriteFloat(String& json, String name, float value);