gilex-dev
/
ESP8266-IOT-timer
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

merge fix theoretical overflow with sprintf

This commit is contained in:
gilex-dev 2023-11-15 18:58:14 +01:00
parent dd55af6d9c 782fe8cf04
commit 441a32154d
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/html.cpp
View File

@ -2,23 +2,6 @@
#include <Arduino.h> #include <Arduino.h>
void reload_home() { void reload_home() {
char time_current[3][3] = {"", "", ""};
if (myTime.hour() < 10) {
sprintf(time_current[0], "0%d", myTime.hour());
} else {
sprintf(time_current[0], "%d", myTime.hour());
}
if (myTime.minute() < 10) {
sprintf(time_current[1], "0%d", myTime.minute());
} else {
sprintf(time_current[1], "%d", myTime.minute());
}
if (myTime.second() < 10) {
sprintf(time_current[2], "0%d", myTime.second());
} else {
sprintf(time_current[2], "%d", myTime.second());
}
sprintf(home_html, "<!DOCTYPE html>\ sprintf(home_html, "<!DOCTYPE html>\
<html lang='de'>\ <html lang='de'>\
<head>\ <head>\
@ -79,7 +62,7 @@ void reload_home() {
<body>\ <body>\
<div class='wrapper_main'>\ <div class='wrapper_main'>\
<h1>Übersicht</h1>\ <h1>Übersicht</h1>\
<h2>Uhrzeit: <span>%s:%s:%s</span></h2>\ <h2>Uhrzeit: <span>%02d:%02d:%02d</span></h2>\
<div class='wrapper_form'>\ <div class='wrapper_form'>\
<div>\ <div>\
<span>Ventil 1: </span>\ <span>Ventil 1: </span>\
@ -120,7 +103,7 @@ void reload_home() {
</div>\ </div>\
</body>\ </body>\
</html>", </html>",
time_current[0], time_current[1], time_current[2], stat[0], stat[1], myTime.hour(), myTime.minute(), myTime.second(), stat[0], stat[1],
stat[2], stat[3], stat[4], stat[5], stat[6], stat[7]); stat[2], stat[3], stat[4], stat[5], stat[6], stat[7]);
} }

14
src/main.cpp
View File

@ -159,11 +159,7 @@ void load_EEPROM() {
unsigned int EEPROM_Addr = 0; unsigned int EEPROM_Addr = 0;
for (unsigned int i0 = 0; i0 < 8; i0++) { for (unsigned int i0 = 0; i0 < 8; i0++) {
for (unsigned int i = 0; i < 8; i++) { for (unsigned int i = 0; i < 8; i++) {
if (EEPROM.read(EEPROM_Addr) < 10) { sprintf(time_all[i0][i], "%02d", EEPROM.read(EEPROM_Addr));
sprintf(time_all[i0][i], "0%d", EEPROM.read(EEPROM_Addr));
} else {
sprintf(time_all[i0][i], "%d", EEPROM.read(EEPROM_Addr));
}
EEPROM_Addr += 4; EEPROM_Addr += 4;
yield(); yield();
} }
@ -193,10 +189,10 @@ void handleTime() {
server.arg(args[arg])[1]}; server.arg(args[arg])[1]};
char buff_m[2][2] = {server.arg(args[arg])[3], char buff_m[2][2] = {server.arg(args[arg])[3],
server.arg(args[arg])[4]}; server.arg(args[arg])[4]};
sprintf(time_all[arg * 2][server.arg("rule").toInt()], "%s", sprintf(time_all[arg * 2][server.arg("rule").toInt()], "%s%s",
buff_h); buff_h[0], buff_h[1]);
sprintf(time_all[arg * 2 + 1][server.arg("rule").toInt()], "%s", sprintf(time_all[arg * 2 + 1][server.arg("rule").toInt()], "%s%s",
buff_m); buff_m[0], buff_m[1]);
EEPROM.put(server.arg("rule").toInt() * 4 + arg * 64, EEPROM.put(server.arg("rule").toInt() * 4 + arg * 64,
atoi(time_all[arg * 2][server.arg("rule").toInt()])); atoi(time_all[arg * 2][server.arg("rule").toInt()]));