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

Companion compilation fixes

Browse source
This commit is contained in:
bsongis 2015-01-05 20:07:27 +01:00
parent 7a135a75c4
commit 20122512cb
7 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/CMakeLists.txt
View file

@ -75,7 +75,8 @@ set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
add_custom_command( add_custom_command(
OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
COMMAND make lbm COMMAND make lbm PCB=9X
COMMAND make lbm PCB=TARANIS
DEPENDS ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm DEPENDS ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
) )

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

@ -97,16 +97,16 @@ inline int geteepromsize() {
#include "radio/src/gui/menus.cpp" #include "radio/src/gui/menus.cpp"
#include "radio/src/gui/menu_model.cpp" #include "radio/src/gui/menu_model.cpp"
#include "radio/src/gui/menu_model_select.cpp" #include "radio/src/gui/menu_model_select.cpp"
#include "radio/src/gui/menu_model_setup.cpp" #include "radio/src/gui/Taranis/menu_model_setup.cpp"
#include "radio/src/gui/menu_model_heli.cpp" #include "radio/src/gui/menu_model_heli.cpp"
#include "radio/src/gui/menu_model_flightmodes.cpp" #include "radio/src/gui/Taranis/menu_model_flightmodes.cpp"
#include "radio/src/gui/menu_model_inputs_mixes.cpp" #include "radio/src/gui/menu_model_inputs_mixes.cpp"
#include "radio/src/gui/menu_model_curves.cpp" #include "radio/src/gui/menu_model_curves.cpp"
#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp" #include "radio/src/gui/Taranis/menu_model_logical_switches.cpp"
#include "radio/src/gui/menu_model_custom_functions.cpp" #include "radio/src/gui/menu_model_custom_functions.cpp"
#include "radio/src/gui/menu_model_custom_scripts.cpp" #include "radio/src/gui/menu_model_custom_scripts.cpp"
#include "radio/src/gui/menu_model_gvars.cpp" #include "radio/src/gui/menu_model_gvars.cpp"
#include "radio/src/gui/menu_model_limits.cpp" #include "radio/src/gui/Taranis/menu_model_limits.cpp"
#include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_model_telemetry.cpp"
#include "radio/src/gui/menu_general.cpp" #include "radio/src/gui/menu_general.cpp"
#include "radio/src/gui/menu_general_setup.cpp" #include "radio/src/gui/menu_general_setup.cpp"

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

@ -99,11 +99,11 @@ inline int geteepromsize() {
#include "radio/src/gui/menus.cpp" #include "radio/src/gui/menus.cpp"
#include "radio/src/gui/menu_model.cpp" #include "radio/src/gui/menu_model.cpp"
#include "radio/src/gui/menu_model_select.cpp" #include "radio/src/gui/menu_model_select.cpp"
#include "radio/src/gui/menu_model_setup.cpp" #include "radio/src/gui/Taranis/menu_model_setup.cpp"
#include "radio/src/gui/menu_model_heli.cpp" #include "radio/src/gui/menu_model_heli.cpp"
#include "radio/src/gui/menu_model_flightmodes.cpp" #include "radio/src/gui/Taranis/menu_model_flightmodes.cpp"
#include "radio/src/gui/menu_model_inputs_mixes.cpp" #include "radio/src/gui/menu_model_inputs_mixes.cpp"
#include "radio/src/gui/menu_model_limits.cpp" #include "radio/src/gui/Taranis/menu_model_limits.cpp"
#include "radio/src/gui/menu_model_curves.cpp" #include "radio/src/gui/menu_model_curves.cpp"
#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp" #include "radio/src/gui/Taranis/menu_model_logical_switches.cpp"
#include "radio/src/gui/menu_model_custom_functions.cpp" #include "radio/src/gui/menu_model_custom_functions.cpp"

1
radio/src/Makefile
View file

@ -1615,6 +1615,7 @@ clean_list :
$(REMOVE) *.lbm $(REMOVE) *.lbm
$(REMOVE) bitmaps/*.lbm $(REMOVE) bitmaps/*.lbm
$(REMOVE) bitmaps/*/*.lbm $(REMOVE) bitmaps/*/*.lbm
$(REMOVE) bitmaps/*/*/*.lbm
$(REMOVE) fonts/*.lbm $(REMOVE) fonts/*.lbm
$(REMOVE) fonts/*/*.lbm $(REMOVE) fonts/*/*.lbm
$(REMOVE) lua_exports.txt lua_exports.cpp lua_fields.txt $(REMOVE) lua_exports.txt lua_exports.cpp lua_fields.txt

2
radio/src/gui/Taranis/menu_model_flightmodes.cpp
View file

@ -33,7 +33,7 @@
* *
*/ */
#include "../opentx.h" #include "../../opentx.h"
void displayFlightModes(coord_t x, coord_t y, FlightModesType value) void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
{ {

2
radio/src/gui/Taranis/menu_model_limits.cpp
View file

@ -33,7 +33,7 @@
* *
*/ */
#include "../opentx.h" #include "../../opentx.h"
bool isThrottleOutput(uint8_t ch) bool isThrottleOutput(uint8_t ch)
{ {

2
radio/src/gui/Taranis/menu_model_setup.cpp
View file

@ -33,7 +33,7 @@
* *
*/ */
#include "../opentx.h" #include "../../opentx.h"
uint8_t g_moduleIdx; uint8_t g_moduleIdx;
void menuModelFailsafe(uint8_t event); void menuModelFailsafe(uint8_t event);