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

Fixed Companion build

Browse source
This commit is contained in:
Damjan Adamic 2014-12-06 15:55:07 +01:00
parent 8aeb35c912
commit e4de0da0bb
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
View file

@ -136,7 +136,7 @@ inline int geteepromsize() {
#include "radio/src/translations/tts_sk.cpp" #include "radio/src/translations/tts_sk.cpp"
#include "radio/src/translations/tts_pl.cpp" #include "radio/src/translations/tts_pl.cpp"
#include "radio/src/translations/tts_hu.cpp" #include "radio/src/translations/tts_hu.cpp"
#include "radio/src/lua.cpp" #include "radio/src/lua_api.cpp"
#include "radio/src/lua/src/lapi.c" #include "radio/src/lua/src/lapi.c"
#include "radio/src/lua/src/lcode.c" #include "radio/src/lua/src/lcode.c"
#include "radio/src/lua/src/lctype.c" #include "radio/src/lua/src/lctype.c"

2
companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
View file

@ -138,7 +138,7 @@ inline int geteepromsize() {
#include "radio/src/translations/tts_sk.cpp" #include "radio/src/translations/tts_sk.cpp"
#include "radio/src/translations/tts_pl.cpp" #include "radio/src/translations/tts_pl.cpp"
#include "radio/src/translations/tts_hu.cpp" #include "radio/src/translations/tts_hu.cpp"
#include "radio/src/lua.cpp" #include "radio/src/lua_api.cpp"
#include "radio/src/lua/src/lapi.c" #include "radio/src/lua/src/lapi.c"
#include "radio/src/lua/src/lcode.c" #include "radio/src/lua/src/lcode.c"
#include "radio/src/lua/src/lctype.c" #include "radio/src/lua/src/lctype.c"

3
radio/src/opentx.cpp
View file

@ -2720,9 +2720,6 @@ void opentxInit(OPENTX_INIT_ARGS)
#endif #endif
#if defined(VOICE) #if defined(VOICE)
#if defined(CPUARM)
currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF;
#endif
setVolume(g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF); setVolume(g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF);
#endif #endif

3
radio/src/targets/taranis/keys_driver.cpp
View file

@ -45,6 +45,9 @@ uint32_t readKeys()
register uint32_t f = GPIOF->IDR; register uint32_t f = GPIOF->IDR;
register uint32_t result = 0; register uint32_t result = 0;
(void)e;
(void)f;
#if defined(REV9E) #if defined(REV9E)
if (f & PIN_BUTTON_ENTER) if (f & PIN_BUTTON_ENTER)
#else #else

2
radio/src/tasks_arm.cpp
View file

@ -37,7 +37,7 @@
#include "opentx.h" #include "opentx.h"
static uint8_t currentSpeakerVolume = 255; static uint8_t currentSpeakerVolume = 255;
uint8_t requiredSpeakerVolume; uint8_t requiredSpeakerVolume = 255;
extern void checkBattery(); extern void checkBattery();