3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-09 14:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.7.61

Browse source
This commit is contained in:
lumapu 2023-10-01 00:48:51 +02:00
parent bd20eba709
commit c1cb62685d
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hm/hmInverter.h
View file

@ -85,7 +85,7 @@ class CommandAbstract {
}; };
virtual ~CommandAbstract() {}; virtual ~CommandAbstract() {};
const uint8_t getCmd() { uint8_t getCmd() const {
return _Cmd; return _Cmd;
} }

12
src/utils/dbg.h
View file

@ -148,7 +148,7 @@
#define PVERBLN(str) #define PVERBLN(str)
#endif #endif
#define DPRINT(level, str) ({\ #define DPRINT(level, str) do {\
switch(level) {\ switch(level) {\
case DBG_ERROR: PERR(str); break; \ case DBG_ERROR: PERR(str); break; \
case DBG_WARN: PWARN(str); break; \ case DBG_WARN: PWARN(str); break; \
@ -156,13 +156,13 @@
case DBG_DEBUG: PDBG(str); break; \ case DBG_DEBUG: PDBG(str); break; \
default: PVERB(str); break; \ default: PVERB(str); break; \
}\ }\
}) } while (0)
#define DPRINT_IVID(level, id) ({\ #define DPRINT_IVID(level, id) do {\
DPRINT(level, F("(#")); DBGPRINT(String(id)); DBGPRINT(F(") "));\ DPRINT(level, F("(#")); DBGPRINT(String(id)); DBGPRINT(F(") "));\
}) } while (0)
#define DPRINTLN(level, str) ({\ #define DPRINTLN(level, str) do {\
switch(level) {\ switch(level) {\
case DBG_ERROR: PERRLN(str); break; \ case DBG_ERROR: PERRLN(str); break; \
case DBG_WARN: PWARNLN(str); break; \ case DBG_WARN: PWARNLN(str); break; \
@ -170,7 +170,7 @@
case DBG_DEBUG: PDBGLN(str); break; \ case DBG_DEBUG: PDBGLN(str); break; \
default: PVERBLN(str); break; \ default: PVERBLN(str); break; \
}\ }\
}) } while (0)
/*class ahoyLog { /*class ahoyLog {

8
src/utils/helper.h
View file

@ -20,21 +20,21 @@ static Timezone gTimezone(CEST, CET);
#define CHECK_MASK(a,b) ((a & b) == b) #define CHECK_MASK(a,b) ((a & b) == b)
#define CP_U32_LittleEndian(buf, v) ({ \ #define CP_U32_LittleEndian(buf, v) do { \
uint8_t *b = buf; \ uint8_t *b = buf; \
b[0] = ((v >> 24) & 0xff); \ b[0] = ((v >> 24) & 0xff); \
b[1] = ((v >> 16) & 0xff); \ b[1] = ((v >> 16) & 0xff); \
b[2] = ((v >> 8) & 0xff); \ b[2] = ((v >> 8) & 0xff); \
b[3] = ((v ) & 0xff); \ b[3] = ((v ) & 0xff); \
}) } while (0)
#define CP_U32_BigEndian(buf, v) ({ \ #define CP_U32_BigEndian(buf, v) do { \
uint8_t *b = buf; \ uint8_t *b = buf; \
b[3] = ((v >> 24) & 0xff); \ b[3] = ((v >> 24) & 0xff); \
b[2] = ((v >> 16) & 0xff); \ b[2] = ((v >> 16) & 0xff); \
b[1] = ((v >> 8) & 0xff); \ b[1] = ((v >> 8) & 0xff); \
b[0] = ((v ) & 0xff); \ b[0] = ((v ) & 0xff); \
}) } while (0)
namespace ah { namespace ah {
void ip2Arr(uint8_t ip[], const char *ipStr); void ip2Arr(uint8_t ip[], const char *ipStr);

2
src/web/web.h
View file

@ -183,8 +183,8 @@ class Web {
mUploadFp.write(data, len); mUploadFp.write(data, len);
if (final) { if (final) {
mUploadFp.close(); mUploadFp.close();
char pwd[PWD_LEN];
#if !defined(ETHERNET) #if !defined(ETHERNET)
char pwd[PWD_LEN];
strncpy(pwd, mConfig->sys.stationPwd, PWD_LEN); // backup WiFi PWD strncpy(pwd, mConfig->sys.stationPwd, PWD_LEN); // backup WiFi PWD
#endif #endif
if (!mApp->readSettings("/tmp.json")) { if (!mApp->readSettings("/tmp.json")) {