Temporary commit for X10 conversions fixes

This commit is contained in:
Bertrand Songis
2019-08-23 14:21:02 +02:00
parent 6794212ada
commit a9255e802a
12 changed files with 95 additions and 25 deletions
+16 -5
View File
@@ -134,16 +134,27 @@ uint16_t getAnalogValue(uint8_t index)
return anaIn(index);
}
static char _zchar2stringResult[200];
static char _stringResult[200];
const char * zchar2string(const char * zstring, int size)
{
if (size > (int)sizeof(_zchar2stringResult) ) {
return 0;
if (size > (int)sizeof(_stringResult) ) {
return nullptr;
}
zchar2str(_zchar2stringResult, zstring, size);
return _zchar2stringResult;
zchar2str(_stringResult, zstring, size);
return _stringResult;
}
const char * nchar2string(const char * string, int size)
{
if (size > (int)sizeof(_stringResult) ) {
return nullptr;
}
strncpy(_stringResult, string, size);
_stringResult[size] = '\0';
return _stringResult;
}
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);