Merging with master

This commit is contained in:
2022-01-05 12:08:59 +03:00
18 changed files with 128 additions and 41659 deletions

View File

@@ -1052,7 +1052,7 @@ return false;
int itemCmd::doReverseMapping (aJsonObject *mappingData)
{
return 0;
return 0;
}
int itemCmd::doMappingCmd(aJsonObject *mappingData)
@@ -1063,8 +1063,7 @@ int itemCmd::doMappingCmd(aJsonObject *mappingData)
int itemCmd::doReverseMappingCmd (aJsonObject *mappingData)
{
return 0;
return 0;
}
char * itemCmd::toString(char * Buffer, int bufLen, int sendFlags, bool scale100 )

View File

@@ -1505,9 +1505,9 @@ int cmdFunctionIp(int arg_cnt, char **args)
/*
#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__) || defined(NRF5)
DNSClient dns;
#define inet_aton(cp, addr) dns.inet_aton(cp, addr)
#define _inet_aton(cp, addr) dns._inet_aton(cp, addr)
#else
#define inet_aton(cp, addr) inet_aton(cp, addr)
#define _inet_aton(cp, addr) _inet_aton(cp, addr)
#endif
*/