Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 03:49:52 +03:00
Code Issues Wiki Activity

Merge with latest 2.3

Browse source
This commit is contained in:
Bertrand Songis 2020-05-30 11:57:03 +02:00
commit bddccb9765
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
240 changed files with 16053 additions and 14407 deletions
Download patch file Download diff file Expand all files Collapse all files

20
radio/src/strhelpers.cpp
View file

@ -84,20 +84,10 @@ int zchar2str(char * dest, const char * src, int size)
return size+1;
}
bool cmpStrWithZchar(const char * charString, const char * zcharString, int size)
{
for (int i=0; i<size; i++) {
if (charString[i] != zchar2char(zcharString[i])) {
return false;
}
}
return true;
}
unsigned int effectiveLen(const char * str, unsigned int size)
{
while (size > 0) {
if (str[size-1] != ' ')
if (str[size-1] != ' ' && str[size-1] != '\0')
return size;
size--;
}
@ -137,9 +127,7 @@ char * strcat_zchar(char * dest, const char * name, uint8_t size, const char * d
if (!len && dest[i])
len = i+1;
if (len) {
if (dest[i])
dest[i] = zchar2char(dest[i]);
else
if (!dest[i])
dest[i] = '_';
}
i--;
@ -392,7 +380,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
}
else if (idx <= MIXSRC_LAST_INPUT) {
idx -= MIXSRC_FIRST_INPUT;
*dest = '\314';
*dest = CHAR_INPUT;
if (strlen(g_model.inputNames[idx])) {
memset(dest + 1, 0, LEN_INPUT_NAME);
strncpy(dest + 1, g_model.inputNames[idx], LEN_INPUT_NAME);
@ -406,7 +394,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
#if defined(LUA_MODEL_SCRIPTS)
div_t qr = div(idx-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
*dest++ = '\322';
*dest++ = CHAR_LUA;
// *dest++ = '1'+qr.quot;
strcpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name);
}