Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Update to latest libopenui

Browse source
This commit is contained in:
Bertrand Songis 2020-10-26 16:13:24 +01:00
parent df7b1ba235
commit cd6aa7af00
4 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/opentx_helpers.h
View file

@ -22,13 +22,16 @@
#define _OPENTX_HELPERS_H_
#include <string.h>
#include "thirdparty/libopenui/src/libopenui_helpers.h"
#if defined(COLORLCD)
#include "thirdparty/libopenui/src/libopenui_helpers.h"
#else
template<class T>
inline T sgn(T a)
{
return a > 0 ? 1 : (a < 0 ? -1 : 0);
}
#endif
template<class T>
inline void SWAP(T & a, T & b)

2
radio/src/thirdparty/libopenui vendored

@ -1 +1 @@
Subproject commit 9e24ec470546fb5c2af3994ea071fb1c345adf33
Subproject commit 6c31676e1b9a729cda00e9a772eeac3f81603ff3

6
radio/src/translations.cpp
View file

@ -858,13 +858,12 @@ const char STR_AFHDS3_ONE_TO_MANY[] = TR_AFHDS3_ONE_TO_MANY;
const char STR_SUBTYPE[] = TR_SUBTYPE;
#endif
#if defined(SDCARD)
const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL;
const char STR_RESTORE_MODEL[] = TR_RESTORE_MODEL;
const char STR_DELETE_ERROR[] = TR_DELETE_ERROR;
const char STR_SDCARD_ERROR[] = TR_SDCARD_ERROR;
const char STR_SDCARD[] = TR_SDCARD;
const char STR_NO_FILES_ON_SD[] = TR_NO_FILES_ON_SD;
#define STR_SDCARD TR_SDCARD
#define STR_NO_FILES_ON_SD TR_NO_FILES_ON_SD
const char STR_NO_SDCARD[] = TR_NO_SDCARD;
const char STR_SDCARD_FULL[] = TR_SDCARD_FULL;
const char STR_INCOMPATIBLE[] = TR_INCOMPATIBLE;
@ -872,7 +871,6 @@ const char STR_LOGS_PATH[] = LOGS_PATH;
const char STR_LOGS_EXT[] = LOGS_EXT;
const char STR_MODELS_PATH[] = MODELS_PATH;
const char STR_MODELS_EXT[] = MODELS_EXT;
#endif
const char STR_TEST_WARNING[] = TR_TEST_WARNING;
const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE;

28
radio/src/translations.h
View file

@ -557,22 +557,18 @@ extern const char STR_WAITING_FOR_RX[];
extern const char STR_WAITING_FOR_TX[];
extern const char STR_WARN_5VOLTS[];
#if defined(SDCARD)
extern const char STR_BACKUP_MODEL[];
extern const char STR_RESTORE_MODEL[];
extern const char STR_DELETE_ERROR[];
extern const char STR_SDCARD_ERROR[];
extern const char STR_SDCARD[];
extern const char STR_NO_FILES_ON_SD[];
extern const char STR_NO_SDCARD[];
extern const char STR_SDCARD_FULL[];
extern const char STR_INCOMPATIBLE[];
extern const char STR_LOGS_PATH[];
extern const char STR_LOGS_EXT[];
extern const char STR_MODELS_PATH[];
extern const char STR_MODELS_EXT[];
#define STR_UPDATE_LIST STR_DELAYDOWN
#endif
extern const char STR_BACKUP_MODEL[];
extern const char STR_RESTORE_MODEL[];
extern const char STR_DELETE_ERROR[];
extern const char STR_SDCARD_ERROR[];
extern const char STR_NO_SDCARD[];
extern const char STR_SDCARD_FULL[];
extern const char STR_INCOMPATIBLE[];
extern const char STR_LOGS_PATH[];
extern const char STR_LOGS_EXT[];
extern const char STR_MODELS_PATH[];
extern const char STR_MODELS_EXT[];
#define STR_UPDATE_LIST STR_DELAYDOWN
extern const char STR_NEEDS_FILE[];
extern const char STR_EXT_MULTI_SPEC[];