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

Merge with 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-29 11:06:31 +02:00
parent 284a9d1f5e 52624710cd
commit fa0ffd6d42
24 changed files with 89 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+1 -2
View File
@@ -909,7 +909,7 @@ void menuModelSetup(event_t event)
else if (old_editMode > 0) {
if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) {
POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1);
POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1);
SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
}
#if POPUP_LEVEL >= 3
@@ -1490,7 +1490,6 @@ void menuModelSetup(event_t event)
if (attr) {
CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX);
if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) {
TRACE("ON Y PASSE");
module.channelsStart = 0;
module.channelsCount = maxModuleChannels_M8(moduleIdx);
if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { //switching between mode 2 and 3 does not require rebind
radio/src/gui/212x64/model_setup.cpp
+1 -1
View File
@@ -906,7 +906,7 @@ void menuModelSetup(event_t event)
else if (old_editMode > 0) {
if (isModuleR9MNonAccess(EXTERNAL_MODULE)) {
if (g_model.moduleData[EXTERNAL_MODULE].subType > MODULE_SUBTYPE_R9M_EU) {
POPUP_WARNING(STR_R9M_PROTO_FLEX_WARN_LINE1);
POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1);
SET_WARNING_INFO(STR_R9M_PROTO_WARN_LINE2, sizeof(TR_R9M_PROTO_WARN_LINE2) - 1, 0);
}
#if POPUP_LEVEL >= 3
radio/src/gui/colorlcd/radio_tools.cpp
+4 -4
View File
@@ -169,7 +169,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
#if defined(PXX2)
// PXX2 modules tools
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT, [=]() -> uint8_t {
new RadioSpectrumAnalyser(INTERNAL_MODULE);
@@ -178,7 +178,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine();
}
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_INT, [=]() -> uint8_t {
// new RadioPowerMeter(INTERNAL_MODULE);
@@ -187,7 +187,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine();
}
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_SPECTRUM_ANALYSER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_EXT, [=]() -> uint8_t {
new RadioSpectrumAnalyser(EXTERNAL_MODULE);
@@ -196,7 +196,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
grid.nextLine();
}
if (isModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
if (isPXX2ModuleOptionAvailable(reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE].information.modelID, MODULE_OPTION_POWER_METER)) {
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND | CENTERED);
new TextButton(window, grid.getFieldSlot(1), STR_POWER_METER_EXT, [=]() -> uint8_t {
// new RadioPowerMeter(EXTERNAL_MODULE);
radio/src/gui/gui_common.cpp
+2 -2
View File
@@ -505,7 +505,7 @@ bool isSourceAvailableInResetSpecialFunction(int index)
bool isR9MModeAvailable(int mode)
{
#if defined(R9M_PROTO_FLEX)
#if defined(MODULE_PROTOCOL_FLEX)
return true;
#else
return mode <= MODULE_SUBTYPE_R9M_EU;
@@ -650,7 +650,7 @@ bool isRfProtocolAvailable(int protocol)
return false;
}
#endif
#if defined(MODULE_D16_EU_ONLY_SUPPORT)
#if !defined(MODULE_PROTOCOL_D8)
if (protocol == MODULE_SUBTYPE_PXX1_ACCST_D8) {
return false;
}