3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-18 11:26:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development02' into asyncWeb02

Browse source
This commit is contained in:
lumapu 2022-08-26 21:59:27 +02:00
commit 2556197509
14 changed files with 627 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/esp8266/app.h
View file

@ -71,7 +71,6 @@ class app {
void saveValues(void);
void resetPayload(Inverter<>* iv);
String getStatistics(void);
String getLiveData(void);
String getJson(void);
bool getWifiApActive(void);
@ -80,9 +79,10 @@ class app {
}
uint64_t Serial2u64(const char *val) {
char tmp[3] = {0};
char tmp[3];
uint64_t ret = 0ULL;
uint64_t u64;
memset(tmp, 0, 3);
for(uint8_t i = 0; i < 6; i++) {
tmp[0] = val[i*2];
tmp[1] = val[i*2 + 1];
@ -95,7 +95,7 @@ class app {
}
String getDateTimeStr(time_t t) {
char str[20] = {0};
char str[20];
if(0 == t)
sprintf(str, "n/a");
else
@ -113,9 +113,11 @@ class app {
void eraseSettings(bool all = false) {
//DPRINTLN(DBG_VERBOSE, F("main.h:eraseSettings"));
uint8_t buf[64] = {0};
uint8_t buf[64];
uint16_t addr = (all) ? ADDR_START : ADDR_START_SETTINGS;
uint16_t end;
memset(buf, 0xff, 64);
do {
end = addr + 64;
if(end > (ADDR_SETTINGS_CRC + 2))