Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 00:35:14 +03:00
Code Activity

AR9X simu added

Browse source
This commit is contained in:
Andre Bernet 2015-09-06 16:03:08 +02:00
parent 45801a89ea
commit 45d22c83d4
5 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/constants.h
View file

@ -7,8 +7,8 @@ enum BoardEnum {
BOARD_MEGA2560, BOARD_MEGA2560,
BOARD_GRUVIN9X, BOARD_GRUVIN9X,
BOARD_SKY9X, BOARD_SKY9X,
BOARD_AR9X,
BOARD_9XRPRO, BOARD_9XRPRO,
BOARD_AR9X,
BOARD_TARANIS, BOARD_TARANIS,
BOARD_TARANIS_PLUS, BOARD_TARANIS_PLUS,
BOARD_TARANIS_X9E BOARD_TARANIS_X9E

2
companion/src/eeprominterface.cpp
View file

@ -1684,6 +1684,8 @@ QString getBoardName(BoardEnum board)
return "Sky9x"; return "Sky9x";
case BOARD_9XRPRO: case BOARD_9XRPRO:
return "9XR-PRO"; return "9XR-PRO";
case BOARD_AR9X:
return "AR9X";
default: default:
return "Unknown"; return "Unknown";
} }

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

@ -93,7 +93,7 @@ const int OpenTxEepromInterface::getEEpromSize()
case BOARD_SKY9X: case BOARD_SKY9X:
return EESIZE_SKY9X; return EESIZE_SKY9X;
case BOARD_9XRPRO: case BOARD_9XRPRO:
case BOARD_AR9X: case BOARD_AR9X:
return EESIZE_9XRPRO; return EESIZE_9XRPRO;
case BOARD_TARANIS: case BOARD_TARANIS:
case BOARD_TARANIS_PLUS: case BOARD_TARANIS_PLUS:

8
companion/src/firmwares/opentx/simulator/CMakeLists.txt
View file

@ -80,6 +80,7 @@ add_library(opentx-gruvin9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-mega2560${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES}) add_library(opentx-mega2560${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-sky9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES}) add_library(opentx-sky9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-9xrpro${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES}) add_library(opentx-9xrpro${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-ar9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-taranis${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-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES}) add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
@ -92,6 +93,7 @@ add_dependencies(opentx-gruvin9x${SUFFIX}-simulator about_lbm_9x commondeps)
add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x commondeps) add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x commondeps)
add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x commondeps) add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x commondeps)
add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x commondeps) add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x commondeps)
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-taranis${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
add_dependencies(opentx-taranisplus${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-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
@ -105,6 +107,7 @@ set(OPENTX_LIBRARIES
opentx-mega2560${SUFFIX}-simulator opentx-mega2560${SUFFIX}-simulator
opentx-sky9x${SUFFIX}-simulator opentx-sky9x${SUFFIX}-simulator
opentx-9xrpro${SUFFIX}-simulator opentx-9xrpro${SUFFIX}-simulator
opentx-ar9x${SUFFIX}-simulator
opentx-taranis${SUFFIX}-simulator opentx-taranis${SUFFIX}-simulator
opentx-taranisplus${SUFFIX}-simulator opentx-taranisplus${SUFFIX}-simulator
opentx-taranisx9e${SUFFIX}-simulator opentx-taranisx9e${SUFFIX}-simulator
@ -154,6 +157,11 @@ target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_
target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE SDCARD ${COMMON_DEFINITIONS}) target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES}) target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
# AR9X
target_include_directories(opentx-ar9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
target_compile_definitions(opentx-ar9x${SUFFIX}-simulator PRIVATE PCBSKY9X AR9X CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
target_link_libraries(opentx-ar9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
# Taranis standard # Taranis standard
target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis) target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS}) target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})

4
companion/src/firmwares/opentx/simulator/opentxsimulator.h
View file

@ -35,6 +35,10 @@
#define FLAVOUR "9xrpro" #define FLAVOUR "9xrpro"
#define NAMESPACE Sky9xPro #define NAMESPACE Sky9xPro
#define EEPROM_VARIANT 0 #define EEPROM_VARIANT 0
#elif defined(PCBSKY9X) && defined(AR9X)
#define FLAVOUR "ar9x"
#define NAMESPACE Ar9x
#define EEPROM_VARIANT 0
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define FLAVOUR "sky9x" #define FLAVOUR "sky9x"
#define NAMESPACE Sky9X #define NAMESPACE Sky9X