From cbd3499528e83c51bc60de2ec6a6fd700940f00a Mon Sep 17 00:00:00 2001
From: Daniel <danielgorbea@hotmail.com>
Date: Mon, 8 Feb 2021 11:43:02 +0100
Subject: [PATCH] Companion

---
 companion/src/firmwares/modeldata.h | 3 ++-
 companion/src/modeledit/setup.cpp   | 1 +
 companion/src/modelprinter.cpp      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/companion/src/firmwares/modeldata.h b/companion/src/firmwares/modeldata.h
index 7eacdc26d..9b6d1bf5d 100644
--- a/companion/src/firmwares/modeldata.h
+++ b/companion/src/firmwares/modeldata.h
@@ -61,7 +61,8 @@ class TimerData {
       COUNTDOWN_SILENT,
       COUNTDOWN_BEEPS,
       COUNTDOWN_VOICE,
-      COUNTDOWN_HAPTIC
+      COUNTDOWN_HAPTIC,
+      COUNTDOWN_HAPTIC_VOICE
     };
     TimerData() { clear(); }
     RawSwitch    mode;
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index e4f67178d..508998207 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -66,6 +66,7 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
   ui->countdownBeep->addItem(tr("Beeps"), TimerData::COUNTDOWN_BEEPS);
   ui->countdownBeep->addItem(tr("Voice"), TimerData::COUNTDOWN_VOICE);
   ui->countdownBeep->addItem(tr("Haptic"), TimerData::COUNTDOWN_HAPTIC);
+  ui->countdownBeep->addItem(tr("Haptic & Voice"), TimerData::COUNTDOWN_HAPTIC_VOICE);
 
   ui->value->setMaximumTime(firmware->getMaxTimerStart());
 
diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp
index 61bfedda9..96f90d359 100644
--- a/companion/src/modelprinter.cpp
+++ b/companion/src/modelprinter.cpp
@@ -949,6 +949,8 @@ QString ModelPrinter::printTimerCountdownBeep(unsigned int countdownBeep)
       return tr("Voice");
     case TimerData::COUNTDOWN_HAPTIC:
       return tr("Haptic");
+    case TimerData::COUNTDOWN_HAPTIC_VOICE:
+      return tr("Haptic & Voice");
     default:
       return CPN_STR_UNKNOWN_ITEM;
   }