From 0bde2d3d93186226e98a1e094b5083b101b4f006 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 20 Aug 2019 08:46:08 +0200 Subject: [PATCH] [X9D+ 2019] RSSI source added --- radio/src/gui/128x64/model_telemetry.cpp | 36 +++++------ radio/src/gui/212x64/model_telemetry.cpp | 77 ++++++++++++++++-------- 2 files changed, 69 insertions(+), 44 deletions(-) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 3b98cad70..a4b333950 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -54,28 +54,25 @@ enum MenuModelTelemetryFrskyItems { #define TELEM_COL3 (17 * FW) -#define CHANNELS_ROWS -#define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) -#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), SENSOR_ROWS(32), SENSOR_ROWS(33), SENSOR_ROWS(34), SENSOR_ROWS(35), SENSOR_ROWS(36), SENSOR_ROWS(37), SENSOR_ROWS(38), SENSOR_ROWS(39), 0, 0, 0, 0, - -#define USRDATA_ROWS - -#define RSSI_ROWS LABEL(RSSI), 0, 0, 0, 1, - -#define SCREEN_TYPE_ROWS 0 - -#define VARIO_ROWS LABEL(Vario), 0, 1, 2, - -#if defined (PCBTARANIS) - #define TELEMETRY_TYPE_SHOW_TELEMETRY (! IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW +#define RSSI_ROWS LABEL(RSSI), 0, 0, 0, 0, +#define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW) +#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), SENSOR_ROWS(32), SENSOR_ROWS(33), SENSOR_ROWS(34), SENSOR_ROWS(35), SENSOR_ROWS(36), SENSOR_ROWS(37), SENSOR_ROWS(38), SENSOR_ROWS(39), 0, 0, 0, 0, +#if defined(VARIO) + #define VARIO_ROWS LABEL(Vario), 0, 1, 2, #else - #define TELEMETRY_TYPE_SHOW_TELEMETRY (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW + #define VARIO_ROWS +#endif + +#if defined(PCBTARANIS) + #define TELEMETRY_TYPE_ROW (!IS_INTERNAL_MODULE_ENABLED() && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW +#else + #define TELEMETRY_TYPE_ROW (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW #endif #if defined(REVX) - #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_SHOW_TELEMETRY, TELEMETRY_TYPE_SHOW_TELEMETRY, + #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_ROW, TELEMETRY_TYPE_ROW, #else - #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_SHOW_TELEMETRY, + #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_ROW, #endif void onSensorMenu(const char * result) @@ -123,11 +120,11 @@ void onDeleteAllSensorsConfirm(const char * result) void menuModelTelemetryFrsky(event_t event) { - MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY_FRSKY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS CHANNELS_ROWS RSSI_ROWS SENSORS_ROWS USRDATA_ROWS VARIO_ROWS}); + MENU(STR_MENUTELEMETRY, menuTabModel, MENU_MODEL_TELEMETRY_FRSKY, HEADER_LINE+ITEM_TELEMETRY_MAX, { HEADER_LINE_COLUMNS TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS }); uint8_t sub = menuVerticalPosition - HEADER_LINE; - for (uint8_t i=0; i= 0) { TelemetrySensor & sourceSensor = g_model.telemetrySensors[index]; TelemetrySensor & newSensor = g_model.telemetrySensors[newIndex]; @@ -90,27 +90,35 @@ void onSensorMenu(const char * result) } } -void menuModelTelemetryFrsky(event_t event) +void onDeleteAllSensorsConfirm(const char * result) { - if (warningResult) { - warningResult = 0; + if (result == STR_OK) { for (int i=0; i= (int)DIM(mstate_tab)) { + return; + } + } } LcdFlags blink = ((s_editMode>0) ? BLINK|INVERS : INVERS); - LcdFlags attr = (menuVerticalPosition == k ? blink : 0); + LcdFlags attr = (sub == k ? blink : 0); + if (k >= ITEM_TELEMETRY_SENSOR_FIRST && k <= ITEM_TELEMETRY_SENSOR_LAST) { int index = k - ITEM_TELEMETRY_SENSOR_FIRST; @@ -124,9 +132,11 @@ void menuModelTelemetryFrsky(event_t event) if (telemetryItem.isAvailable()) { bool isOld = telemetryItem.isOld(); lcdNextPos = TELEM_COL2; - if (isOld) lcdDrawChar(lcdNextPos, y, '['); + if (isOld) + lcdDrawChar(lcdNextPos, y, '['); drawSensorCustomValue(lcdNextPos, y, index, getValue(MIXSRC_FIRST_TELEM+3*index), LEFT); - if (isOld) lcdDrawChar(lcdLastRightPos, y, ']'); + if (isOld) + lcdDrawChar(lcdLastRightPos, y, ']'); } else { lcdDrawText(TELEM_COL2, y, "---", 0); // TODO shortcut @@ -164,7 +174,9 @@ void menuModelTelemetryFrsky(event_t event) case ITEM_TELEMETRY_PROTOCOL_TYPE: lcdDrawTextAlignedLeft(y, STR_TELEMETRY_TYPE); lcdDrawTextAtIndex(TELEM_COL2, y, STR_TELEMETRY_PROTOCOLS, g_model.telemetryProtocol, attr); - g_model.telemetryProtocol = checkIncDec(event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable); + if (attr) { + g_model.telemetryProtocol = checkIncDec(event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable); + } break; case ITEM_TELEMETRY_SENSORS_LABEL: @@ -200,11 +212,12 @@ void menuModelTelemetryFrsky(event_t event) case ITEM_TELEMETRY_DELETE_ALL_SENSORS: lcdDrawText(0, y, STR_DELETE_ALL_SENSORS, attr); - if (attr) + if (attr) { s_editMode = 0; - if (attr && event==EVT_KEY_LONG(KEY_ENTER)) { - killEvents(KEY_ENTER); - POPUP_CONFIRMATION(STR_CONFIRMDELETE, nullptr); + if (event == EVT_KEY_BREAK(KEY_ENTER)) { + killEvents(KEY_ENTER); + POPUP_CONFIRMATION(STR_CONFIRMDELETE, onDeleteAllSensorsConfirm); + } } break; @@ -214,17 +227,32 @@ void menuModelTelemetryFrsky(event_t event) case ITEM_TELEMETRY_RSSI_LABEL: #if defined(MULTIMODULE) - if (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_XJT_PXX1 && - g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && - g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) + if (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MODULE_SUBTYPE_MULTI_FS_AFHDS2A) lcdDrawTextAlignedLeft(y, "RSNR"); else -#endif + lcdDrawTextAlignedLeft(y, "RSSI"); +#else lcdDrawTextAlignedLeft(y, "RSSI"); +#endif break; + case ITEM_TELEMETRY_RSSI_SOURCE: { + lcdDrawTextAlignedLeft(y, INDENT TR_SOURCE); + drawSource(TELEM_COL2, y, g_model.rssiSource ? MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1) : 0, attr); + if (g_model.rssiSource) { + TelemetrySensor * sensor = &g_model.telemetrySensors[g_model.rssiSource - 1]; + lcdDrawText(lcdNextPos, y, " ", attr); + drawReceiverName(lcdNextPos, y, sensor->frskyInstance.rxIndex >> 2, sensor->frskyInstance.rxIndex & 0x03, attr); + } + if (attr) { + g_model.rssiSource = checkIncDec(event, g_model.rssiSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL | NO_INCDEC_MARKS, isRssiSensorAvailable); + } + break; + } + case ITEM_TELEMETRY_RSSI_ALARM1: - case ITEM_TELEMETRY_RSSI_ALARM2: { + case ITEM_TELEMETRY_RSSI_ALARM2: + { bool warning = (k==ITEM_TELEMETRY_RSSI_ALARM1); lcdDrawTextAlignedLeft(y, (warning ? STR_LOWALARM : STR_CRITICALALARM)); lcdDrawNumber(TELEM_COL2, y, warning? g_model.rssiAlarms.getWarningRssi() : g_model.rssiAlarms.getCriticalRssi(), LEFT|attr, 3); @@ -236,6 +264,7 @@ void menuModelTelemetryFrsky(event_t event) } break; } + case ITEM_TELEMETRY_DISABLE_ALARMS: g_model.rssiAlarms.disabled = editCheckBox(g_model.rssiAlarms.disabled, TELEM_COL3, y, STR_DISABLE_ALARM, attr, event); break;