[Horus] Companion simulator
This commit is contained in:
@@ -75,6 +75,10 @@ const char * OpenTxEepromInterface::getName()
|
||||
return "OpenTX for 9XR-PRO";
|
||||
case BOARD_AR9X:
|
||||
return "OpenTX for ar9x board / 9X";
|
||||
case BOARD_FLAMENCO:
|
||||
return "OpenTX for Flamenco experimental";
|
||||
case BOARD_HORUS:
|
||||
return "OpenTX for FrSky Horus";
|
||||
default:
|
||||
return "OpenTX for an unknown board";
|
||||
}
|
||||
@@ -98,6 +102,8 @@ const int OpenTxEepromInterface::getEEpromSize()
|
||||
case BOARD_TARANIS:
|
||||
case BOARD_TARANIS_PLUS:
|
||||
case BOARD_TARANIS_X9E:
|
||||
case BOARD_FLAMENCO:
|
||||
case BOARD_HORUS:
|
||||
return EESIZE_TARANIS;
|
||||
default:
|
||||
return 0;
|
||||
@@ -403,6 +409,8 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
|
||||
case BOARD_SKY9X:
|
||||
case BOARD_AR9X:
|
||||
case BOARD_9XRPRO:
|
||||
case BOARD_FLAMENCO:
|
||||
case BOARD_HORUS:
|
||||
version = 218;
|
||||
break;
|
||||
case BOARD_GRUVIN9X:
|
||||
@@ -1432,6 +1440,14 @@ void registerOpenTxFirmwares()
|
||||
addOpenTxCommonOptions(firmware);
|
||||
firmwares.push_back(firmware);
|
||||
|
||||
/* Horus board */
|
||||
firmware = new OpenTxFirmware("opentx-horus", QObject::tr("FrSky Horus"), BOARD_HORUS);
|
||||
firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
|
||||
firmware->addOption("nogvars", QObject::tr("Disable Global variables"));
|
||||
firmware->addOption("lua", QObject::tr("Support for Lua model scripts"));
|
||||
addOpenTxCommonOptions(firmware);
|
||||
firmwares.push_back(firmware);
|
||||
|
||||
default_firmware_variant = GetFirmware("opentx-taranisplus-en");
|
||||
current_firmware_variant = default_firmware_variant;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,16 @@ add_custom_target(about_lbm_taranis
|
||||
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
|
||||
)
|
||||
|
||||
add_custom_target(about_lbm_flamenco
|
||||
make lbm PCB=FLAMENCO
|
||||
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
|
||||
)
|
||||
|
||||
add_custom_target(about_lbm_horus
|
||||
make lbm PCB=HORUS
|
||||
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
|
||||
)
|
||||
|
||||
add_custom_target(commondeps
|
||||
make stamp_header tra
|
||||
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
|
||||
@@ -20,8 +30,11 @@ add_custom_target(commondeps
|
||||
|
||||
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${RADIO_SRC_DIRECTORY}/stamp-opentx.h)
|
||||
|
||||
add_custom_target(lua_exports
|
||||
make PCB=TARANIS lua_exports_taranis.inc
|
||||
add_custom_target(lua_exports
|
||||
COMMAND make PCB=TARANIS lua_exports_taranis.inc
|
||||
COMMAND make PCB=FLAMENCO lua_exports_flamenco.inc
|
||||
COMMAND make PCB=HORUS lua_exports_horus.inc
|
||||
DEPENDS ${RADIO_SRC_DIRECTORY}/myeeprom.h
|
||||
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
|
||||
)
|
||||
|
||||
@@ -84,6 +97,7 @@ add_library(opentx-ar9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
|
||||
add_library(opentx-taranis${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
|
||||
add_library(opentx-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
|
||||
add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
|
||||
add_library(opentx-horus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
|
||||
|
||||
add_dependencies(opentx-9x${SUFFIX}-simulator about_lbm_9x commondeps)
|
||||
add_dependencies(opentx-9xr${SUFFIX}-simulator about_lbm_9x commondeps)
|
||||
@@ -97,6 +111,7 @@ add_dependencies(opentx-ar9x${SUFFIX}-simulator about_lbm_9x commondeps)
|
||||
add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
|
||||
add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
|
||||
add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
|
||||
add_dependencies(opentx-horus${SUFFIX}-simulator about_lbm_horus commondeps lua_exports)
|
||||
|
||||
set(OPENTX_LIBRARIES
|
||||
opentx-9x${SUFFIX}-simulator
|
||||
@@ -111,6 +126,7 @@ set(OPENTX_LIBRARIES
|
||||
opentx-taranis${SUFFIX}-simulator
|
||||
opentx-taranisplus${SUFFIX}-simulator
|
||||
opentx-taranisx9e${SUFFIX}-simulator
|
||||
opentx-horus${SUFFIX}-simulator
|
||||
)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
@@ -177,6 +193,11 @@ target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_
|
||||
target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
|
||||
target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
|
||||
|
||||
# Horus
|
||||
target_include_directories(opentx-horus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/Horus)
|
||||
target_compile_definitions(opentx-horus${SUFFIX}-simulator PRIVATE PCBHORUS CPUARM CPUSTM32 STM32F40_41xxx COLORLCD VOICE SDCARD ${COMMON_DEFINITIONS})
|
||||
target_link_libraries(opentx-horus${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
|
||||
|
||||
add_custom_target(opentx-simulators
|
||||
DEPENDS ${OPENTX_LIBRARIES}
|
||||
)
|
||||
|
||||
@@ -40,7 +40,11 @@
|
||||
#define AUTOSWITCH
|
||||
#define GRAPHICS
|
||||
#define CURVES
|
||||
#if defined(PCBTARANIS)
|
||||
#if defined(PCBFLAMENCO) || defined(PCBHORUS)
|
||||
#define RTCLOCK
|
||||
#define XCURVES
|
||||
#define VIRTUALINPUTS
|
||||
#elif defined(PCBTARANIS)
|
||||
#define RTCLOCK
|
||||
#define XCURVES
|
||||
#define VIRTUALINPUTS
|
||||
@@ -97,6 +101,7 @@ namespace NAMESPACE {
|
||||
#include "radio/src/pulses/pulses_avr.cpp"
|
||||
#endif
|
||||
|
||||
#include "radio/src/storage/storage_common.cpp"
|
||||
#if defined(EEPROM_RLC)
|
||||
#include "radio/src/storage/eeprom_common.cpp"
|
||||
#include "radio/src/storage/eeprom_rlc.cpp"
|
||||
@@ -127,7 +132,79 @@ namespace NAMESPACE {
|
||||
#include "radio/src/vario.cpp"
|
||||
#include "radio/src/trainer_input.cpp"
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#if defined(PCBHORUS)
|
||||
#include "radio/src/gui/Horus/bitmaps.cpp"
|
||||
#include "radio/src/gui/Horus/fonts.cpp"
|
||||
#include "radio/src/gui/Horus/widgets.cpp"
|
||||
#include "radio/src/gui/Horus/navigation.cpp"
|
||||
#include "radio/src/gui/Horus/popups.cpp"
|
||||
#include "radio/src/gui/Horus/helpers.cpp"
|
||||
#include "radio/src/gui/Horus/menus.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_select.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_setup.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_heli.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_flightmodes.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_inputs_mixes.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_curves.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_logical_switches.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_custom_functions.cpp"
|
||||
// #include "radio/src/gui/Horus/menu_model_custom_scripts.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_gvars.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_limits.cpp"
|
||||
#include "radio/src/gui/Horus/menu_model_telemetry.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general_setup.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general_sdmanager.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general_trainer.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general_version.cpp"
|
||||
// #include "radio/src/gui/Horus/menu_general_hardware.cpp"
|
||||
#include "radio/src/gui/Horus/menu_general_calib.cpp"
|
||||
#include "radio/src/gui/Horus/view_main.cpp"
|
||||
#include "radio/src/gui/Horus/view_statistics.cpp"
|
||||
#include "radio/src/gui/Horus/view_channels.cpp"
|
||||
#include "radio/src/gui/Horus/view_telemetry.cpp"
|
||||
#include "radio/src/gui/Horus/view_text.cpp"
|
||||
#include "radio/src/gui/Horus/view_about.cpp"
|
||||
#include "radio/src/gui/Horus/lcd.cpp"
|
||||
#include "radio/src/gui/Horus/splash.cpp"
|
||||
#elif defined(PCBFLAMENCO)
|
||||
#include "radio/src/gui/Flamenco/fonts.cpp"
|
||||
#include "radio/src/gui/Flamenco/widgets.cpp"
|
||||
#include "radio/src/gui/Flamenco/navigation.cpp"
|
||||
#include "radio/src/gui/Flamenco/popups.cpp"
|
||||
#include "radio/src/gui/Flamenco/helpers.cpp"
|
||||
#include "radio/src/gui/Flamenco/menus.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_select.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_setup.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_heli.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_flightmodes.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_inputs_mixes.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_curves.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_logical_switches.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_custom_functions.cpp"
|
||||
// #include "radio/src/gui/Flamenco/menu_model_custom_scripts.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_gvars.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_limits.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_model_telemetry.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general_setup.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general_sdmanager.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general_trainer.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general_version.cpp"
|
||||
// #include "radio/src/gui/Flamenco/menu_general_hardware.cpp"
|
||||
#include "radio/src/gui/Flamenco/menu_general_calib.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_main.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_statistics.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_channels.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_telemetry.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_text.cpp"
|
||||
#include "radio/src/gui/Flamenco/view_about.cpp"
|
||||
#include "radio/src/gui/Flamenco/lcd.cpp"
|
||||
#include "radio/src/gui/Flamenco/splash.cpp"
|
||||
#include "radio/src/targets/Flamenco/tw8823_driver.cpp"
|
||||
#elif defined(PCBTARANIS)
|
||||
#include "radio/src/bmp.cpp"
|
||||
#include "radio/src/gui/Taranis/fonts.cpp"
|
||||
#include "radio/src/gui/Taranis/widgets.cpp"
|
||||
@@ -224,7 +301,26 @@ namespace NAMESPACE {
|
||||
#include "radio/src/buzzer.cpp"
|
||||
#endif
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#if defined(PCBHORUS)
|
||||
#include "radio/src/targets/Horus/board_horus.cpp"
|
||||
#include "radio/src/targets/Horus/keys_driver.cpp"
|
||||
#include "radio/src/targets/Horus/audio_driver.cpp"
|
||||
#include "radio/src/targets/Horus/telemetry_driver.cpp"
|
||||
// #include "radio/src/targets/Horus/haptic_driver.cpp"
|
||||
#include "radio/src/targets/Horus/pulses_driver.cpp"
|
||||
// #include "radio/src/targets/Horus/rtc_driver.cpp"
|
||||
#include "radio/src/targets/Horus/trainer_driver.cpp"
|
||||
#elif defined(PCBFLAMENCO)
|
||||
#include "radio/src/targets/Flamenco/board_flamenco.cpp"
|
||||
#include "radio/src/targets/Flamenco/keys_driver.cpp"
|
||||
#include "radio/src/targets/Flamenco/audio_driver.cpp"
|
||||
#include "radio/src/targets/Flamenco/telemetry_driver.cpp"
|
||||
#include "radio/src/targets/Flamenco/eeprom_driver.cpp"
|
||||
// #include "radio/src/targets/Flamenco/haptic_driver.cpp"
|
||||
#include "radio/src/targets/Flamenco/pulses_driver.cpp"
|
||||
// #include "radio/src/targets/Flamenco/rtc_driver.cpp"
|
||||
#include "radio/src/targets/Flamenco/trainer_driver.cpp"
|
||||
#elif defined(PCBTARANIS)
|
||||
#include "radio/src/targets/Taranis/board_taranis.cpp"
|
||||
#include "radio/src/targets/Taranis/keys_driver.cpp"
|
||||
#include "radio/src/targets/Taranis/audio_driver.cpp"
|
||||
@@ -255,7 +351,11 @@ namespace NAMESPACE {
|
||||
#elif defined(PCBMEGA2560)
|
||||
#include "radio/src/targets/Mega2560/board_mega2560.cpp"
|
||||
#else
|
||||
#include "../../../../../radio/src/targets/9x/board_stock.cpp"
|
||||
#include "radio/src/targets/9x/board_stock.cpp"
|
||||
#endif
|
||||
|
||||
#if defined(CPUARM)
|
||||
#include "radio/src/gui/gui_helpers.cpp"
|
||||
#endif
|
||||
|
||||
#include "radio/src/keys.cpp"
|
||||
@@ -526,7 +626,11 @@ class OpenTxSimulatorFactory: public SimulatorFactory
|
||||
|
||||
virtual BoardEnum type()
|
||||
{
|
||||
#if defined(PCBTARANIS)
|
||||
#if defined(PCBHORUS)
|
||||
return BOARD_HORUS;
|
||||
#elif defined(PCBFLAMENCO)
|
||||
return BOARD_FLAMENCO;
|
||||
#elif defined(PCBTARANIS)
|
||||
return BOARD_TARANIS;
|
||||
#else
|
||||
return BOARD_STOCK;
|
||||
|
||||
@@ -19,7 +19,15 @@
|
||||
|
||||
#include "simulatorinterface.h"
|
||||
|
||||
#if defined(PCBTARANIS) && defined(REV9E)
|
||||
#if defined(PCBHORUS)
|
||||
#define FLAVOUR "horus"
|
||||
#define NAMESPACE HORUS
|
||||
#define EEPROM_VARIANT 0
|
||||
#elif defined(PCBFLAMENCO)
|
||||
#define FLAVOUR "flamenco"
|
||||
#define NAMESPACE FLAMENCO
|
||||
#define EEPROM_VARIANT 0
|
||||
#elif defined(PCBTARANIS) && defined(REV9E)
|
||||
#define FLAVOUR "taranisx9e"
|
||||
#define NAMESPACE TaranisX9E
|
||||
#define EEPROM_VARIANT 0x8000
|
||||
|
||||
Reference in New Issue
Block a user