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

[Horus] Compilation fix

Browse Source
This commit is contained in:
Bertrand Songis
2016-02-26 15:50:06 +01:00
parent de96f607e2
commit 4c342a1883
6 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+2
View File
@@ -79,6 +79,8 @@
#define MIXERS_MONITOR
#endif
#define LANGUAGE_PACKS_DEFINITION
#undef min
#undef max
radio/src/gui/9x/menu_general_setup.cpp
+3 -1
View File
@@ -18,7 +18,9 @@
* GNU General Public License for more details.
*/
#include "../../opentx.h"
#define LANGUAGE_PACKS_DEFINITION
#include "opentx.h"
const pm_uchar sticks[] PROGMEM = {
#include "sticks.lbm"
radio/src/gui/horus/menu_general_setup.cpp
+2
View File
@@ -18,6 +18,8 @@
* GNU General Public License for more details.
*/
#define LANGUAGE_PACKS_DEFINITION
#include "opentx.h"
#define RADIO_SETUP_2ND_COLUMN 220
radio/src/gui/horus/widget.h
+1 -1
View File
@@ -43,7 +43,7 @@ union ZoneOptionValue
#if defined(_MSC_VER)
#define OPTION_DEFAULT_VALUE(...)
#else
#define OPTION_DEFAULT_VALUE(x) x
#define OPTION_DEFAULT_VALUE(...) __VA_ARGS__
#endif
struct ZoneOption
radio/src/gui/taranis/menu_general_setup.cpp
+3 -1
View File
@@ -18,7 +18,9 @@
* GNU General Public License for more details.
*/
#include "../../opentx.h"
#define LANGUAGE_PACKS_DEFINITION
#include "opentx.h"
const pm_uchar sticks[] PROGMEM = {
#include "sticks.lbm"
radio/src/translations.h
+19 -25
View File
@@ -704,14 +704,7 @@ extern const pm_char STR_CONFIRMRESET[];
extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[];
extern const pm_char STR_BLCOLOR[];
#if defined(VOICE) && defined(CPUARM)
#if defined(SIMU)
#define LP_CONST
#else
#define LP_CONST const
#endif
#if defined(CPUARM) && defined(VOICE)
struct LanguagePack {
const char * id;
const char * name;
@@ -722,19 +715,20 @@ extern const pm_char STR_BLCOLOR[];
extern const LanguagePack * currentLanguagePack;
extern uint8_t currentLanguagePackIdx;
extern LP_CONST LanguagePack czLanguagePack;
extern LP_CONST LanguagePack enLanguagePack;
extern LP_CONST LanguagePack esLanguagePack;
extern LP_CONST LanguagePack frLanguagePack;
extern LP_CONST LanguagePack deLanguagePack;
extern LP_CONST LanguagePack itLanguagePack;
extern LP_CONST LanguagePack plLanguagePack;
extern LP_CONST LanguagePack ptLanguagePack;
extern LP_CONST LanguagePack skLanguagePack;
extern LP_CONST LanguagePack seLanguagePack;
extern LP_CONST LanguagePack huLanguagePack;
static const LanguagePack * LP_CONST languagePacks[] = {
extern const LanguagePack czLanguagePack;
extern const LanguagePack enLanguagePack;
extern const LanguagePack esLanguagePack;
extern const LanguagePack frLanguagePack;
extern const LanguagePack deLanguagePack;
extern const LanguagePack itLanguagePack;
extern const LanguagePack plLanguagePack;
extern const LanguagePack ptLanguagePack;
extern const LanguagePack skLanguagePack;
extern const LanguagePack seLanguagePack;
extern const LanguagePack huLanguagePack;
extern const LanguagePack * const languagePacks[];
#if defined(LANGUAGE_PACKS_DEFINITION)
const LanguagePack * const languagePacks[] = {
// alphabetical order
&czLanguagePack,
&deLanguagePack,
@@ -749,11 +743,11 @@ extern const pm_char STR_BLCOLOR[];
&skLanguagePack,
NULL
};
#endif
#if defined(SIMU)
#define LANGUAGE_PACK_DECLARE(lng, name) LP_CONST LanguagePack lng ## LanguagePack = { #lng, name, lng ## _ ## playNumber, lng ## _ ## playDuration }
#define LANGUAGE_PACK_DECLARE(lng, name) const LanguagePack lng ## LanguagePack = { #lng, name, lng ## _ ## playNumber, lng ## _ ## playDuration }
#else
#define LANGUAGE_PACK_DECLARE(lng, name) extern LP_CONST LanguagePack lng ## LanguagePack = { #lng, name, lng ## _ ## playNumber, lng ## _ ## playDuration }
#define LANGUAGE_PACK_DECLARE(lng, name) extern const LanguagePack lng ## LanguagePack = { #lng, name, lng ## _ ## playNumber, lng ## _ ## playDuration }
#endif
#define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name) LANGUAGE_PACK_DECLARE(lng, name); const LanguagePack * currentLanguagePack = & lng ## LanguagePack; uint8_t currentLanguagePackIdx
inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t flags) { currentLanguagePack->playNumber(number, unit, flags, id); }
@@ -829,7 +823,7 @@ extern const pm_char STR_BLCOLOR[];
extern const pm_char STR_SELECT_WIDGET[];
extern const pm_char STR_REMOVE_WIDGET[];
extern const pm_char STR_WIDGET_SETTINGS[];
extern const pm_char STR_REMOVE_SCREEN[];
extern const pm_char STR_REMOVE_SCREEN[];
#endif
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS)