piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Use existing getStringAtIndex as considers length

Browse Source
This commit is contained in:
Peter Feerick
2022-03-21 11:48:51 +01:00
committed by Raphael Coeffic
parent 21f776d40c
commit 19b1db7275
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_setup.cpp
+2 -1
View File
@@ -607,7 +607,8 @@ class ModuleWindow : public FormGroup {
});
if (moduleIdx == INTERNAL_MODULE && isModuleCrossfire(moduleIdx)) {
new StaticText(this, grid.getFieldSlot(2, 1), getStringAtIndex(STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate)), 0,COLOR_THEME_PRIMARY1);
char buf[6];
new StaticText(this, grid.getFieldSlot(2, 1), getStringAtIndex(buf, STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate)), 0,COLOR_THEME_PRIMARY1);
}
// Module parameters
radio/src/strhelpers.cpp
-7
View File
@@ -158,13 +158,6 @@ char *getStringAtIndex(char *dest, const char *s, int idx)
return dest;
}
const char *getStringAtIndex(const char *s, int idx)
{
uint8_t len = s[0];
return s + 1 + len * idx;
}
char *strAppendStringWithIndex(char *dest, const char *s, int idx)
{
return strAppendUnsigned(strAppend(dest, s), abs(idx));
radio/src/strhelpers.h
-1
View File
@@ -66,7 +66,6 @@ char *strAppendFilename(char *dest, const char *filename, const int size);
#if !defined(BOOT)
char *getStringAtIndex(char *dest, const char *s, int idx);
const char *getStringAtIndex(const char *s, int idx);
char *strAppendStringWithIndex(char *dest, const char *s, int idx);
#define LEN_TIMER_STRING 10 // "-00:00:00"
char *getTimerString(char *dest, int32_t tme, TimerOptions timerOptions = {.options = 0});