Better support for R9M EU (#5487)

* POC for X9, requires -DBINDING_OPTIONS=YES

* There are apparently 4 valid choices

* - make BINDING_OPTIONS part of standard code
- adapt R9M EU LBT dialog to choice on bind

* - remove option from Companion
- cosmetics

* Compilation fixes
This commit is contained in:
3djc
2017-12-09 10:17:56 +01:00
committed by Bertrand Songis
parent f489742c9e
commit 8e5027dcb2
20 changed files with 105 additions and 88 deletions
+5 -10
View File
@@ -245,8 +245,7 @@ options_taranis = {
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"bindopt": ("BINDING_OPTIONS", "YES", "NO")
"multimodule": ("MULTIMODULE", "YES", "NO")
}
options_taranisplus = {
@@ -263,8 +262,7 @@ options_taranisplus = {
"internalppm": ("TARANIS_INTERNAL_PPM", "YES", "NO"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"bindopt": ("BINDING_OPTIONS", "YES", "NO")
"multimodule": ("MULTIMODULE", "YES", "NO")
}
options_taranisx9e = {
@@ -282,8 +280,7 @@ options_taranisx9e = {
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"horussticks": ("STICKS", "HORUS", "STANDARD"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"bindopt": ("BINDING_OPTIONS", "YES", "NO")
"multimodule": ("MULTIMODULE", "YES", "NO")
}
options_x12s = {
@@ -297,8 +294,7 @@ options_x12s = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"pcbdev": ("PCBREV", "10", None),
"bindopt": ("BINDING_OPTIONS", "YES", "NO")
"pcbdev": ("PCBREV", "10", None)
}
options_x10 = {
@@ -311,6 +307,5 @@ options_x10 = {
"faichoice": ("FAI", "CHOICE", None),
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"),
"bindopt": ("BINDING_OPTIONS", "YES", "NO")
"multimodule": ("MULTIMODULE", "YES", "NO")
}