From d5fed493a2bd75d9ecf7ffb932527ffcb0c6f542 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 13 Mar 2024 20:47:13 +1100 Subject: [PATCH] fix(cpn): Joystick pots, sliders and 6POS switch not working in simulator (#4730) --- companion/src/simulation/simulatorwidget.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 1373e1c6f..9b1abe3c0 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -907,15 +907,15 @@ void SimulatorWidget::onjoystickAxisValueChanged(int axis, int value) emit stickValueChange(stick, stickval); } else { - stick -= ttlSticks; - if (stick < ttlKnobs) { - GeneralSettings radioSettings = GeneralSettings(); - if (Board::PotType(radioSettings.potConfig[stick]) == Board::POT_MULTIPOS_SWITCH) - stickval += 1024; - emit widgetValueChange(RadioWidget::RADIO_WIDGET_KNOB, stick, stickval); - } else { - stick -= ttlKnobs; - emit widgetValueChange(RadioWidget::RADIO_WIDGET_FADER, stick, stickval); + GeneralSettings radioSettings = GeneralSettings(); + if (radioSettings.isInputAvailable(stick)) { + if (radioSettings.isInputPot(stick)) { + if (radioSettings.inputConfig[stick].flexType == Board::FlexType::FLEX_MULTIPOS) + stickval += 1024; + emit widgetValueChange(RadioWidget::RADIO_WIDGET_KNOB, stick, stickval); + } else if (radioSettings.isInputSlider(stick)) { + emit widgetValueChange(RadioWidget::RADIO_WIDGET_FADER, stick, stickval); + } } }