* Fix issue #4961

Fix yet another reference to HORUS_OR_TARANIS that should be IS_ARM
Also rename C9X function to export/import to be inline with the rest

* Another two IS_ARM/HORUS_TARANIS mixups

* Fix condition

* Simplify/fix two if statements

* Really fix if statement
This commit is contained in:
Arne Schwabe
2017-08-12 00:26:28 +02:00
committed by Bertrand Songis
parent b3e9d8d97d
commit 87295776ff
6 changed files with 28 additions and 32 deletions
+3 -3
View File
@@ -571,9 +571,9 @@ QString MultiModelPrinter::printTelemetry()
MultiColumns columns(modelPrinterMap.size());
columns.append("<table border='0' cellspacing='0' cellpadding='1' width='100%'>");
for (int i=0; i<2; i++) {
columns.append("<tr><td><b>" + QString(i == 0 ? tr("RSSI Alarms") : "") + "</b></td><td>");
if (IS_HORUS_OR_TARANIS(getCurrentBoard())) {
COMPARE(i == 0 ? tr("Low Alarm") : tr("Critical Alarm"));
columns.append("<tr><td><b>" + QString(i==0 ? tr("RSSI Alarms") : "") + "</b></td><td>");
if (IS_ARM(getCurrentBoard())) {
COMPARE(i==0 ? tr("Low Alarm") : tr("Critical Alarm"));
}
else {
COMPARE(getFrSkyAlarmType(model->rssiAlarms.level[i]));