From f3a01d7ee7588100cd532daf53beeed32b7c25af Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 20 Jun 2021 15:33:32 +0200
Subject: [PATCH] Fixed missing sliders on main screen and calibration

---
 radio/src/gui/colorlcd/view_main_decoration.cpp | 12 ++++++------
 radio/src/targets/horus/board.h                 |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp
index 19684d928..f99e526b3 100644
--- a/radio/src/gui/colorlcd/view_main_decoration.cpp
+++ b/radio/src/gui/colorlcd/view_main_decoration.cpp
@@ -53,7 +53,7 @@ void ViewMainDecoration::setSlidersVisible(bool visible)
   //
   sliders[SLIDERS_REAR_LEFT]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
 
-#if defined(HARDWARE_EXT1)
+#if defined(HARDWARE_EXT1) || defined(PCBX12S)
   if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
     sliders[SLIDERS_EXT1]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
   }
@@ -61,7 +61,7 @@ void ViewMainDecoration::setSlidersVisible(bool visible)
 
   sliders[SLIDERS_REAR_RIGHT]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
     
-#if defined(HARDWARE_EXT2)
+#if defined(HARDWARE_EXT2) || defined(PCBX12S)
   if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
     sliders[SLIDERS_EXT2]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
   }
@@ -140,7 +140,7 @@ void ViewMainDecoration::adjustDecoration()
   sliders[SLIDERS_REAR_LEFT]->setLeft(pos);
   sliders[SLIDERS_REAR_LEFT]->setTop(vertTop);
 
-#if defined(HARDWARE_EXT1)
+#if defined(HARDWARE_EXT1) || defined(PCBX12S)
   sliders[SLIDERS_EXT1]->setLeft(pos);
   if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
     auto rl = sliders[SLIDERS_REAR_LEFT];
@@ -167,7 +167,7 @@ void ViewMainDecoration::adjustDecoration()
   sliders[SLIDERS_REAR_RIGHT]->setLeft(pos);
   sliders[SLIDERS_REAR_RIGHT]->setTop(vertTop);
 
-#if defined(HARDWARE_EXT2)
+#if defined(HARDWARE_EXT2) || defined(PCBX12S)
   sliders[SLIDERS_EXT2]->setLeft(pos);
   if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
     auto rr = sliders[SLIDERS_REAR_RIGHT];
@@ -268,11 +268,11 @@ void ViewMainDecoration::createSliders()
   sliders[SLIDERS_REAR_LEFT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_LEFT);
   sliders[SLIDERS_REAR_RIGHT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_RIGHT);
 
-#if defined(HARDWARE_EXT1)
+#if defined(HARDWARE_EXT1) || defined(PCBX12S)
   sliders[SLIDERS_EXT1] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT1);
 #endif
 
-#if defined(HARDWARE_EXT2)
+#if defined(HARDWARE_EXT2) || defined(PCBX12S)
   sliders[SLIDERS_EXT2] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT2);
 #endif
 }
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index 8150ed589..bc1be0d09 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -379,6 +379,11 @@ enum Analogs {
   NUM_ANALOGS
 };
 
+#if defined(PCBX12S)
+#define EXT1 SLIDER_FRONT_LEFT
+#define EXT2 SLIDER_FRONT_RIGHT
+#endif
+
 #define SLIDER1 SLIDER_FRONT_LEFT
 #define SLIDER2 SLIDER_FRONT_RIGHT
 
@@ -411,7 +416,9 @@ enum CalibratedAnalogs {
   CALIBRATED_POT3,
 #if defined(PCBX12S)
   CALIBRATED_SLIDER_FRONT_LEFT,
+  CALIBRATED_POT_EXT1 = CALIBRATED_SLIDER_FRONT_LEFT,
   CALIBRATED_SLIDER_FRONT_RIGHT,
+  CALIBRATED_POT_EXT2 = CALIBRATED_SLIDER_FRONT_RIGHT,
   CALIBRATED_SLIDER_REAR_LEFT,
   CALIBRATED_SLIDER_REAR_RIGHT,
 #else