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

3djc/x7 rssi levels (#4236)

Browse Source 
* Remove color leveled RSSI warning in line with X9 and Horus

* Some AVR love (or not !)
This commit is contained in:
3djc
2017-01-15 15:26:53 +01:00
committed by Bertrand Songis
parent 985dff2af7
commit dcf9870b3a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_telemetry.cpp
+14 -3
View File
@@ -149,7 +149,11 @@ enum MenuModelTelemetryFrskyItems {
#define USRDATA_ROWS 0, 0, IF_FAS_OFFSET(0)
#endif
#define RSSI_ROWS LABEL(RSSI), 1, 1,
#if defined(CPUARM)
#define RSSI_ROWS LABEL(RSSI), 0, 0,
#else
#define RSSI_ROWS LABEL(RSSI), 1, 1,
#endif
#if defined(CPUARM) || defined(GAUGES)
#define SCREEN_TYPE_ROWS 0
@@ -698,11 +702,17 @@ void menuModelTelemetryFrsky(event_t event)
case ITEM_TELEMETRY_RSSI_ALARM1:
case ITEM_TELEMETRY_RSSI_ALARM2: {
uint8_t alarm = k-ITEM_TELEMETRY_RSSI_ALARM1;
#if defined(CPUARM)
lcdDrawTextAlignedLeft(y, (alarm==0 ? STR_LOWALARM : STR_CRITICALALARM));
lcdDrawNumber(LCD_W, y, getRssiAlarmValue(alarm), RIGHT | attr, 3);
if (attr && s_editMode>0) {
CHECK_INCDEC_MODELVAR(event, g_model.frsky.rssiAlarms[alarm].value, -30, 30);
}
#else // CPUARM
lcdDrawTextAlignedLeft(y, STR_ALARM);
lcdDrawTextAtIndex(TELEM_COL2, y, STR_VALARM, ((2+alarm+g_model.frsky.rssiAlarms[alarm].level)%4), menuHorizontalPosition<=0 ? attr : 0);
lcdDrawChar(TELEM_COL2+4*FW, y, '<');
lcdDrawNumber(TELEM_COL2+6*FW, y, getRssiAlarmValue(alarm), LEFT|(menuHorizontalPosition!=0 ? attr : 0), 3);
if (attr && (s_editMode>0 || p1valdiff)) {
switch (menuHorizontalPosition) {
case 0:
@@ -712,7 +722,8 @@ void menuModelTelemetryFrsky(event_t event)
CHECK_INCDEC_MODELVAR(event, g_model.frsky.rssiAlarms[alarm].value, -30, 30);
break;
}
}
}
#endif // CPUARM
break;
}