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

New UI merged

Browse source
This commit is contained in:
Bertrand Songis 2019-08-28 17:11:55 +02:00
parent 1f41076b0e
commit f4f8893ae9
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
806 changed files with 30838 additions and 11706 deletions
Download patch file Download diff file Expand all files Collapse all files

80
radio/src/strhelpers.cpp
View file

@ -19,9 +19,10 @@
*/
#include "opentx.h"
#include "strhelpers.h"
#if !defined(BOOT)
const char s_charTab[] = "_-.,";
const char s_charTab[] = "_-.,";
char hex2zchar(uint8_t hex)
{
@ -241,6 +242,40 @@ char * getGVarString(char * dest, int idx)
return dest;
}
char * getFlightModeString(char * dest, int8_t idx)
{
char * s = dest;
if (idx==0) {
strcpy(s, "---");
return dest;
}
if (idx < 0) {
*s++ = '!';
idx = -idx;
}
s = strAppend(s, STR_FM);
strAppendUnsigned(s, idx - 1);
return dest;
}
char * getSwitchWarningString(char * dest, swsrc_t idx)
{
char * s = dest;
uint8_t state = g_model.switchWarningState >> (3*idx) & 0x07;
*s++ = 'A' + idx;
if (state == 0)
*s = '\0';
else {
*s++ = "x\300-\301"[state];
*s = '\0';
}
return dest;
}
#if !defined(PCBSKY9X)
char * getSwitchName(char * dest, swsrc_t idx)
{
@ -292,8 +327,8 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
getStringAtIndex(s, STR_VSWITCHES, idx);
}
#else
#define IDX_TRIMS_IN_STR_VSWITCHES (1)
#define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1)
#define IDX_TRIMS_IN_STR_VSWITCHES (1)
#define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1)
if (idx <= SWSRC_LAST_SWITCH) {
div_t swinfo = switchInfo(idx);
s = getSwitchName(s, idx);
@ -303,7 +338,7 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
#endif // PCBSKY9X
#if NUM_XPOTS > 0
else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) {
else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) {
div_t swinfo = div(int(idx - SWSRC_FIRST_MULTIPOS_SWITCH), XPOTS_MULTIPOS_COUNT);
char temp[LEN_ANA_NAME+1];
getSourceString(temp, MIXSRC_FIRST_POT+swinfo.quot);
@ -313,7 +348,7 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
#endif
#if defined(PCBSKY9X)
else if (idx <= SWSRC_REa) {
else if (idx <= SWSRC_REa) {
getStringAtIndex(s, STR_VSWITCHES, IDX_TRIMS_IN_STR_VSWITCHES+idx-SWSRC_FIRST_TRIM);
}
#else
@ -357,13 +392,13 @@ char * getSourceString(char * dest, mixsrc_t idx)
}
else if (idx <= MIXSRC_LAST_INPUT) {
idx -= MIXSRC_FIRST_INPUT;
*dest++ = '\314';
*dest = '\314';
if (ZEXIST(g_model.inputNames[idx])) {
zchar2str(dest, g_model.inputNames[idx], LEN_INPUT_NAME);
dest[LEN_INPUT_NAME] = '\0';
zchar2str(dest+1, g_model.inputNames[idx], LEN_INPUT_NAME);
dest[LEN_INPUT_NAME+1] = '\0';
}
else {
strAppendUnsigned(dest, idx+1, 2);
strAppendUnsigned(dest+1, idx+1, 2);
}
}
#if defined(LUA_INPUTS)
@ -547,3 +582,30 @@ char * strAppendDate(char * str, bool time)
}
}
#endif
static char tmpHelpersString[32];
char * getSwitchWarningString(swsrc_t idx)
{
return getSwitchWarningString(tmpHelpersString, idx);
}
char * getSourceString(mixsrc_t idx)
{
return getSourceString(tmpHelpersString, idx);
}
char * getCurveString(int idx)
{
return getCurveString(tmpHelpersString, idx);
}
char * getTimerString(int32_t tme, uint8_t hours)
{
return getTimerString(tmpHelpersString, tme, hours);
}
char * getSwitchPositionName(swsrc_t idx)
{
return getSwitchPositionName(tmpHelpersString, idx);
}