From a4e92e88212ce2c47a264ddf8fcd9b6dff2368e5 Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Sun, 19 Aug 2018 20:03:02 +1000
Subject: [PATCH] Refactor center beep

---
 companion/src/modelprinter.cpp | 40 ++++++++--------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp
index 91a81eaa2..1b3cddee9 100644
--- a/companion/src/modelprinter.cpp
+++ b/companion/src/modelprinter.cpp
@@ -277,38 +277,16 @@ QString ModelPrinter::printHeliSwashType ()
 QString ModelPrinter::printCenterBeep()
 {
   QStringList strl;
-  if (model.beepANACenter & 0x01)
-    strl << tr("Rudder");
-  if (model.beepANACenter & 0x02)
-    strl << tr("Elevator");
-  if (model.beepANACenter & 0x04)
-    strl << tr("Throttle");
-  if (model.beepANACenter & 0x08)
-    strl << tr("Aileron");
-  if (IS_HORUS(firmware->getBoard())) {
-    // TODO
-    qDebug() << "ModelPrinter::printCenterBeep() TODO";
-  }
-  else if (IS_TARANIS(firmware->getBoard())) {
-    if (model.beepANACenter & 0x10)
-      strl << "S1";
-    if (model.beepANACenter & 0x20)
-      strl << "S2";
-    if (model.beepANACenter & 0x40)
-      strl << "S3";
-    if (model.beepANACenter & 0x80)
-      strl << "LS";
-    if (model.beepANACenter & 0x100)
-      strl << "RS";
-  }
-  else {
-    if (model.beepANACenter & 0x10)
-      strl << "P1";
-    if (model.beepANACenter & 0x20)
-      strl << "P2";
-    if (model.beepANACenter & 0x40)
-      strl << "P3";
+  Board::Type board = firmware->getBoard();
+  int analogs = CPN_MAX_STICKS + getBoardCapability(board, Board::Pots) + getBoardCapability(board, Board::Sliders);
+
+  for (int i=0; i < analogs + firmware->getCapability(RotaryEncoders); i++) {
+    RawSource src((i < analogs) ? SOURCE_TYPE_STICK : SOURCE_TYPE_ROTARY_ENCODER, (i < analogs) ? i : analogs - i);
+    if (model.beepANACenter & (0x01 << i)) {
+      strl << src.toString(&model, &generalSettings);
+    }
   }
+
   return (strl.isEmpty() ? tr("None") : strl.join(" "));
 }