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

[Taranis] Vario on A1/A2 re-enabled (issue 96) - Caution, c9x will shift the values, a little mod will be needed

Browse Source 
[Taranis] Copy/Paste on CSW/FSW will work only when in line select mode (issue 97)
This commit is contained in:
bsongis@gmail.com
2013-08-10 12:15:52 +00:00
parent d5e7bf2433
commit 34445b6f15
17 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/menu_model.cpp
+11 -17
View File
@@ -4052,12 +4052,13 @@ void menuModelCustomSwitches(uint8_t event)
#endif
#if defined(PCBTARANIS)
if (sub >= 0 && event == EVT_KEY_LONG(KEY_ENTER)) {
if (sub>=0 && horz<0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
MENU_ADD_ITEM(STR_COPY);
CustomSwData * cs = cswAddress(sub);
if (cs->func) MENU_ADD_ITEM(STR_COPY);
if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_SWITCH)
MENU_ADD_ITEM(STR_PASTE);
MENU_ADD_ITEM(STR_DELETE);
if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw) MENU_ADD_ITEM(STR_DELETE);
menuHandler = onCustomSwitchesMenu;
}
#endif
@@ -4274,12 +4275,13 @@ void menuModelCustomFunctions(uint8_t event)
int8_t sub = m_posVert - 1;
#if defined(PCBTARANIS)
if (sub >= 0 && event == EVT_KEY_LONG(KEY_ENTER)) {
if (sub>=0 && m_posHorz<0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
MENU_ADD_ITEM(STR_COPY);
CustomFnData *sd = &g_model.funcSw[sub];
if (sd->swtch && sd->func) MENU_ADD_ITEM(STR_COPY);
if (clipboard.type == CLIPBOARD_TYPE_CUSTOM_FUNCTION)
MENU_ADD_ITEM(STR_PASTE);
MENU_ADD_ITEM(STR_DELETE);
if (sd->swtch || sd->func) MENU_ADD_ITEM(STR_DELETE);
menuHandler = onCustomFunctionsMenu;
}
#endif
@@ -4571,7 +4573,7 @@ enum menuModelTelemetryItems {
ITEM_TELEMETRY_USR_VOLTAGE_SOURCE,
ITEM_TELEMETRY_USR_CURRENT_SOURCE,
IF_VARIO(ITEM_TELEMETRY_VARIO_LABEL)
#if defined(VARIO) && !defined(FRSKY_SPORT)
#if defined(VARIO)
ITEM_TELEMETRY_VARIO_SOURCE,
#endif
IF_VARIO(ITEM_TELEMETRY_VARIO_RANGE)
@@ -4603,12 +4605,6 @@ enum menuModelTelemetryItems {
#define USRDATA_LINES
#endif
#if defined(VARIO) && !defined(FRSKY_SPORT)
#define VARIO_SOURCE_ROWS 0,
#else
#define VARIO_SOURCE_ROWS
#endif
#if defined(FRSKY)
#if LCD_W >= 212
#define TELEM_COL1 (1*FW)
@@ -4651,7 +4647,7 @@ enum menuModelTelemetryItems {
void menuModelTelemetry(uint8_t event)
{
MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_VARIO((uint8_t)-1) VARIO_SOURCE_ROWS IF_VARIO(VARIO_RANGE_ROWS) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_VARIO((uint8_t)-1) IF_VARIO(0) IF_VARIO(VARIO_RANGE_ROWS) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
uint8_t sub = m_posVert - 1;
@@ -4827,13 +4823,11 @@ void menuModelTelemetry(uint8_t event)
lcd_putsLeft(y, STR_VARIO);
break;
#if !defined(FRSKY_SPORT)
case ITEM_TELEMETRY_VARIO_SOURCE:
lcd_putsLeft(y, STR_SOURCE);
lcd_putsiAtt(TELEM_COL2, y, STR_VARIOSRC, g_model.frsky.varioSource, attr);
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioSource, VARIO_SOURCE_FIRST, VARIO_SOURCE_LAST);
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioSource, 0, VARIO_SOURCE_LAST);
break;
#endif
case ITEM_TELEMETRY_VARIO_RANGE:
lcd_putsLeft(y, STR_LIMIT);