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

Merge pull request #6655 from opentx/3djc/multi+crsf-as-baseline

Browse Source 
Make crossfire, multi and luac baseline
This commit is contained in:
Bertrand Songis
2019-08-22 16:21:19 +02:00
committed by GitHub
parent a84faca04a 9ec069d09b
commit 5ca25c8d04
7 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxinterface.cpp
+2 -14
View File
@@ -792,14 +792,9 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
case PULSES_DSM2:
case PULSES_DSMX:
case PULSES_SBUS:
return 1;
case PULSES_MULTIMODULE:
if(IS_JUMPER_T12(board))
return 1;
else
return id.contains("multimodule") ? 1 : 0;
case PULSES_CROSSFIRE:
return id.contains("crossfire") ? 1 : 0;
return 1;
case PULSES_ACCESS_R9M_LITE:
case PULSES_ACCESS_R9M_LITE_PRO:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board)) ? 1 : 0;
@@ -836,9 +831,8 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
case PULSES_DSM2:
case PULSES_DSMX:
case PULSES_SBUS:
return 1;
case PULSES_MULTIMODULE:
return id.contains("multimodule") ? 1 : 0;
return 1;
default:
return 0;
}
@@ -1155,7 +1149,6 @@ void addOpenTxRfOptions(OpenTxFirmware * firmware, bool flex = true)
{
static const Firmware::Option opt_eu("eu", Firmware::tr("Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
static const Firmware::Option opt_fl("flexr9m", Firmware::tr("Enable non certified firmwares"));
firmware->addOption("multimodule", Firmware::tr("Support for the DIY-Multiprotocol-TX-Module"));
if (flex)
firmware->addOptionsGroup({opt_eu, opt_fl});
else
@@ -1173,8 +1166,6 @@ void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
firmware->addOption("noheli", Firmware::tr("Disable HELI menu and cyclic mix support"));
firmware->addOption("nogvars", Firmware::tr("Disable Global variables"));
firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
firmware->addOption("luac", Firmware::tr("Enable Lua compiler"));
firmware->addOption("crossfire", Firmware::tr("Support for Crossfire TX Module"));
addOpenTxRfOptions(firmware);
}
@@ -1276,12 +1267,9 @@ void registerOpenTxFirmwares()
/* Jumper T12 board */
firmware = new OpenTxFirmware("opentx-t12", QCoreApplication::translate("Firmware", "Jumper T12"), BOARD_JUMPER_T12);
addOpenTxCommonOptions(firmware);
firmware->addOption("multimodule", Firmware::tr("Support for the DIY-Multiprotocol-TX-Module"));
firmware->addOption("noheli", Firmware::tr("Disable HELI menu and cyclic mix support"));
firmware->addOption("nogvars", Firmware::tr("Disable Global variables"));
firmware->addOption("lua", Firmware::tr("Enable Lua custom scripts screen"));
firmware->addOption("luac", Firmware::tr("Enable Lua compiler"));
firmware->addOption("crossfire", Firmware::tr("Support for Crossfire TX Module"));
addOpenTxFontOptions(firmware);
registerOpenTxFirmware(firmware);
radio/src/targets/common/arm/CMakeLists.txt
+2 -2
View File
@@ -12,8 +12,8 @@ option(MODULE_SIZE_STD "Standard size TX Module" ON)
option(PPM "PPM TX Module" ON)
option(DSM2 "DSM2 TX Module" ON)
option(SBUS "SBUS TX Module" ON)
option(CROSSFIRE "Crossfire TX Module" OFF)
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" OFF)
option(CROSSFIRE "Crossfire TX Module" ON)
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
option(MULTI_SPORT "SPORT telemetry support" OFF)
option(SUPPORT_D16_EU_ONLY "XJT module only supports D16-EU and LR12-EU" OFF) # TODO rename to XJT_EU_ONLY
option(DEBUG_INTERRUPTS "Count interrupts" OFF)
radio/src/targets/common/arm/stm32/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
set(LUA "NO" CACHE STRING "Lua scripts (YES/NO/NO_MODEL_SCRIPTS)")
set_property(CACHE LUA PROPERTY STRINGS YES NO NO_MODEL_SCRIPTS)
set(LUA_SCRIPT_LOAD_MODE "" CACHE STRING "Script loading mode and compilation flags [btTxcd] (see loadScript() API docs). Blank for default ('bt' on radio, 'T' on SIMU/DEBUG builds)")
option(LUA_COMPILER "Pre-compile and save Lua scripts" OFF)
option(LUA_COMPILER "Pre-compile and save Lua scripts" ON)
option(LUA_ALLOCATOR_TRACER "Trace Lua memory (de)allocations to debug port (also needs DEBUG=YES NANO=NO)" OFF)
option(USB_SERIAL "Enable USB serial (CDC)" OFF)
radio/src/targets/horus/CMakeLists.txt
+1
View File
@@ -202,3 +202,4 @@ if(PYTHONINTERP_FOUND)
DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
)
endif()
radio/src/targets/sky9x/CMakeLists.txt
+1
View File
@@ -129,3 +129,4 @@ set(SRC
${SRC}
debug.cpp
)
radio/src/targets/sky9x/board.h
+8
View File
@@ -228,6 +228,11 @@ uint32_t readTrims();
// Pulses driver
void extmoduleSerialStart(uint32_t baudrate, uint32_t period_half_us, bool inverted);
void extmoduleSendNextFrame();
void module_output_active();
inline void EXTERNAL_MODULE_ON()
{
module_output_active();
}
// SD driver
#if defined(SIMU)
@@ -377,6 +382,9 @@ void debugPutc(const char c);
// Telemetry driver
void telemetryPortInit(uint32_t baudrate, uint8_t mode);
inline void telemetryPortSetDirectionOutput()
{
}
uint32_t telemetryTransmitPending();
void telemetryTransmitBuffer(const uint8_t * buffer, uint32_t size);
void rxPdcUsart( void (*pChProcess)(uint8_t x) );
radio/util/fwoptions.py
-18
View File
@@ -40,7 +40,6 @@ options_sky9x = {
"faimode": ("FAI", "YES", None),
"faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -62,7 +61,6 @@ options_ar9x = {
"faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
# "rtc": ("RTCLOCK", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -80,8 +78,6 @@ options_taranis_x9d = {
"internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -99,8 +95,6 @@ options_taranis_x9dp = {
"internalppm": ("INTERNAL_MODULE_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -118,9 +112,7 @@ options_taranis_x9lite = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -136,8 +128,6 @@ options_taranis_xlite = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -154,9 +144,7 @@ options_taranis_xlites = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -174,8 +162,6 @@ options_taranis_x9e = {
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"horussticks": ("STICKS", "HORUS", "STANDARD"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -189,9 +175,7 @@ options_horus_x12s = {
"faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"pcbdev": ("PCBREV", "10", None),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}
@@ -205,7 +189,5 @@ options_horus_x10 = {
"faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"crossfire": ("CROSSFIRE", "YES", "NO"),
"flexr9m": ("R9M_PROTO_FLEX", "YES", None)
}