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

Cleanups

Browse Source
This commit is contained in:
3djc
2019-04-27 12:07:11 +02:00
parent bf10c912bc
commit 628e3ed609
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_module_options.cpp
+3 -3
View File
@@ -138,7 +138,7 @@ bool menuModelModuleOptions(event_t event)
switch (i) {
case ITEM_MODULE_SETTINGS_RF_PROTOCOL:
lcdDrawText(0, y, "RF Protocol");
lcdDrawText(MENUS_MARGIN_LEFT, y, "RF Protocol");
lcdDrawTextAtIndex(RECEIVER_OPTIONS_2ND_COLUMN, y, STR_XJT_PROTOCOLS, reusableBuffer.hardwareAndSettings.moduleSettings.rfProtocol + 1, attr);
if (attr) {
reusableBuffer.hardwareAndSettings.moduleSettings.rfProtocol = checkIncDec(event, reusableBuffer.hardwareAndSettings.moduleSettings.rfProtocol, RF_PROTO_X16, RF_PROTO_LAST, 0, nullptr);
@@ -149,7 +149,7 @@ bool menuModelModuleOptions(event_t event)
break;
case ITEM_MODULE_SETTINGS_EXTERNAL_ANTENNA:
lcdDrawText(0, y, "Ext. antenna");
lcdDrawText(MENUS_MARGIN_LEFT, y, "Ext. antenna");
reusableBuffer.hardwareAndSettings.moduleSettings.externalAntenna = editCheckBox(reusableBuffer.hardwareAndSettings.moduleSettings.externalAntenna, RECEIVER_OPTIONS_2ND_COLUMN, y, attr, event);
if (attr && checkIncDec_Ret) {
reusableBuffer.hardwareAndSettings.moduleSettingsDirty = true;
@@ -157,7 +157,7 @@ bool menuModelModuleOptions(event_t event)
break;
case ITEM_MODULE_SETTINGS_POWER:
lcdDrawText(0, y, "Power");
lcdDrawText(MENUS_MARGIN_LEFT, y, "Power");
lcdDrawNumber(RECEIVER_OPTIONS_2ND_COLUMN, y, reusableBuffer.hardwareAndSettings.moduleSettings.txPower, attr);
lcdDrawText(lcdNextPos, y, "dBm(");
drawPower(lcdNextPos, y, reusableBuffer.hardwareAndSettings.moduleSettings.txPower);
radio/src/gui/480x272/model_receiver_options.cpp
+3 -2
View File
@@ -20,7 +20,7 @@
#include <opentx.h>
#define RECEIVER_OPTIONS_2ND_COLUMN 80
#define RECEIVER_OPTIONS_2ND_COLUMN 200
extern uint8_t g_moduleIdx;
@@ -123,7 +123,7 @@ bool menuModelReceiverOptions(event_t event)
if (pin < reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount) {
uint8_t channel = g_model.moduleData[g_moduleIdx].channelsStart + reusableBuffer.hardwareAndSettings.receiverSettings.outputsMapping[pin];
int32_t channelValue = channelOutputs[channel];
lcdDrawText(0, y, "Pin");
lcdDrawText(MENUS_MARGIN_LEFT, y, "Pin");
lcdDrawNumber(lcdNextPos + 1, y, pin + 1);
putsChn(80, y, channel + 1, attr);
@@ -153,4 +153,5 @@ bool menuModelReceiverOptions(event_t event)
else {
lcdDrawCenteredText(LCD_H/2, "Waiting for RX...");
}
return true;
}