Fixed missing sliders on main screen and calibration

This commit is contained in:
Raphael Coeffic
2021-06-23 06:43:26 +02:00
parent 063eef1eeb
commit f3a01d7ee7
2 changed files with 13 additions and 6 deletions
@@ -53,7 +53,7 @@ void ViewMainDecoration::setSlidersVisible(bool visible)
// //
sliders[SLIDERS_REAR_LEFT]->setWidth(visible ? TRIM_SQUARE_SIZE : 0); 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)) { if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
sliders[SLIDERS_EXT1]->setWidth(visible ? TRIM_SQUARE_SIZE : 0); 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); 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)) { if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
sliders[SLIDERS_EXT2]->setWidth(visible ? TRIM_SQUARE_SIZE : 0); 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]->setLeft(pos);
sliders[SLIDERS_REAR_LEFT]->setTop(vertTop); sliders[SLIDERS_REAR_LEFT]->setTop(vertTop);
#if defined(HARDWARE_EXT1) #if defined(HARDWARE_EXT1) || defined(PCBX12S)
sliders[SLIDERS_EXT1]->setLeft(pos); sliders[SLIDERS_EXT1]->setLeft(pos);
if (IS_POT_SLIDER_AVAILABLE(EXT1)) { if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
auto rl = sliders[SLIDERS_REAR_LEFT]; auto rl = sliders[SLIDERS_REAR_LEFT];
@@ -167,7 +167,7 @@ void ViewMainDecoration::adjustDecoration()
sliders[SLIDERS_REAR_RIGHT]->setLeft(pos); sliders[SLIDERS_REAR_RIGHT]->setLeft(pos);
sliders[SLIDERS_REAR_RIGHT]->setTop(vertTop); sliders[SLIDERS_REAR_RIGHT]->setTop(vertTop);
#if defined(HARDWARE_EXT2) #if defined(HARDWARE_EXT2) || defined(PCBX12S)
sliders[SLIDERS_EXT2]->setLeft(pos); sliders[SLIDERS_EXT2]->setLeft(pos);
if (IS_POT_SLIDER_AVAILABLE(EXT2)) { if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
auto rr = sliders[SLIDERS_REAR_RIGHT]; 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_LEFT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_LEFT);
sliders[SLIDERS_REAR_RIGHT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_RIGHT); 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); sliders[SLIDERS_EXT1] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT1);
#endif #endif
#if defined(HARDWARE_EXT2) #if defined(HARDWARE_EXT2) || defined(PCBX12S)
sliders[SLIDERS_EXT2] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT2); sliders[SLIDERS_EXT2] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT2);
#endif #endif
} }
+7
View File
@@ -379,6 +379,11 @@ enum Analogs {
NUM_ANALOGS NUM_ANALOGS
}; };
#if defined(PCBX12S)
#define EXT1 SLIDER_FRONT_LEFT
#define EXT2 SLIDER_FRONT_RIGHT
#endif
#define SLIDER1 SLIDER_FRONT_LEFT #define SLIDER1 SLIDER_FRONT_LEFT
#define SLIDER2 SLIDER_FRONT_RIGHT #define SLIDER2 SLIDER_FRONT_RIGHT
@@ -411,7 +416,9 @@ enum CalibratedAnalogs {
CALIBRATED_POT3, CALIBRATED_POT3,
#if defined(PCBX12S) #if defined(PCBX12S)
CALIBRATED_SLIDER_FRONT_LEFT, CALIBRATED_SLIDER_FRONT_LEFT,
CALIBRATED_POT_EXT1 = CALIBRATED_SLIDER_FRONT_LEFT,
CALIBRATED_SLIDER_FRONT_RIGHT, CALIBRATED_SLIDER_FRONT_RIGHT,
CALIBRATED_POT_EXT2 = CALIBRATED_SLIDER_FRONT_RIGHT,
CALIBRATED_SLIDER_REAR_LEFT, CALIBRATED_SLIDER_REAR_LEFT,
CALIBRATED_SLIDER_REAR_RIGHT, CALIBRATED_SLIDER_REAR_RIGHT,
#else #else