joystick: make joystick buttons and axes configurable

Add joystick axis and button mapping to the settings dialog. The mapping
enables a small number of initial actions that can be mapped as the user
likes, including pan/tilt/zoom for the axes, and selecting previous/next
camera or preset, and recalling presets for the buttons. More actions
will get added in the future.

Fixes: #139
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Author: glikely

src/ptz-controls.hpp

@@ -151,6 +151,10 @@ public slots:
 	void setJoystickAxisAction(size_t axis, ptz_joy_action_id);
 	void setJoystickButtonAction(size_t button, ptz_joy_action_id);
 
+signals:
+	void joystickAxisActionChanged(size_t axis, ptz_joy_action_id action);
+	void joystickButtonActionChanged(size_t button, ptz_joy_action_id action);
+
 #if defined(ENABLE_JOYSTICK)
 public:
 	void joystickSetup();
@@ -171,9 +175,6 @@ protected slots:
 	void joystickAxisEvent(const QJoystickAxisEvent evt);
 	void joystickButtonEvent(const QJoystickButtonEvent evt);
 	void joystickPOVEvent(const QJoystickPOVEvent evt);
-signals:
-	void joystickAxisActionChanged(size_t axis, ptz_joy_action_id action);
-	void joystickButtonActionChanged(size_t button, ptz_joy_action_id action);
 #else
 	void joystickSetup(){};
 #endif /* ENABLE_JOYSTICK */

src/settings.cpp

@@ -109,6 +109,10 @@ PTZSettings::PTZSettings() : QWidget(nullptr), ui(new Ui_PTZSettings)
 		SLOT(setChecked(bool)));
 	connect(ui->livemoveCheckBox, SIGNAL(clicked(bool)), PTZControls::getInstance(),
 		SLOT(setDisableLiveMoves(bool)));
+	connect(PTZControls::getInstance(), SIGNAL(joystickAxisActionChanged(size_t, ptz_joy_action_id)), this,
+		SLOT(joystickAxisMappingChanged(size_t, ptz_joy_action_id)));
+	connect(PTZControls::getInstance(), SIGNAL(joystickButtonActionChanged(size_t, ptz_joy_action_id)), this,
+		SLOT(joystickButtonMappingChanged(size_t, ptz_joy_action_id)));
 
 	ui->speedRampCheckBox->setChecked(PTZControls::getInstance()->speedRampEnabled());
 	connect(PTZControls::getInstance(), SIGNAL(speedRampEnabledChanged(bool)), ui->speedRampCheckBox,
@@ -157,6 +161,8 @@ void PTZSettings::joystickSetup()
 	connect(joysticks, SIGNAL(countChanged()), this, SLOT(joystickUpdate()));
 	connect(joysticks, SIGNAL(axisEvent(const QJoystickAxisEvent)), this,
 		SLOT(joystickAxisEvent(const QJoystickAxisEvent)));
+	connect(joysticks, SIGNAL(buttonEvent(const QJoystickButtonEvent)), this,
+		SLOT(joystickButtonEvent(const QJoystickButtonEvent)));
 
 	auto selectionModel = ui->joystickNamesListView->selectionModel();
 	connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), this,
@@ -180,21 +186,126 @@ void PTZSettings::on_joystickGroupBox_toggled(bool checked)
 	ui->joystickNamesListView->setEnabled(checked);
 }
 
+void PTZSettings::on_joystickAxisActionChanged(int idx)
+{
+	auto controls = PTZControls::getInstance();
+	auto cb = qobject_cast<QComboBox *>(sender());
+	if (cb == nullptr)
+		return;
+	auto axis = cb->property("axis-id");
+	ptz_joy_action_id action = cb->itemData(idx).toInt();
+	if (axis.isValid())
+		controls->setJoystickAxisAction(axis.toInt(), action);
+}
+
+void PTZSettings::on_joystickButtonActionChanged(int idx)
+{
+	auto controls = PTZControls::getInstance();
+	auto cb = qobject_cast<QComboBox *>(sender());
+	if (cb == nullptr)
+		return;
+	auto axis = cb->property("button-id");
+	ptz_joy_action_id action = cb->itemData(idx).toInt();
+	if (axis.isValid())
+		controls->setJoystickButtonAction(axis.toInt(), action);
+}
+
+#define BUTTON_ROW_OFFSET 100
 void PTZSettings::joystickUpdate()
 {
+	auto cbAddJoyAction = [](QComboBox *cb, ptz_joy_action_id action) {
+		cb->addItem(ptz_joy_action_names[action], (int)action);
+	};
+
 	auto joysticks = QJoysticks::getInstance();
 	auto controls = PTZControls::getInstance();
 	m_joystickNamesModel.setStringList(joysticks->deviceNames());
-	auto idx = m_joystickNamesModel.index(controls->joystickId(), 0);
-	if (idx.isValid())
+	auto jid = controls->joystickId();
+	auto idx = m_joystickNamesModel.index(jid, 0);
+	if (idx.isValid()) {
 		ui->joystickNamesListView->setCurrentIndex(idx);
+		for (int i = joystickAxisLabels.count(); i < joysticks->getNumAxes(jid); i++) {
+			auto label = new QLabel(this);
+			auto cb = new QComboBox(this);
+			label->setText(QString("Axis %1").arg(i));
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_NONE);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_PAN);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_TILT);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_ZOOM);
+			cb->setProperty("axis-id", i);
+			joystickAxisLabels.append(label);
+			joystickAxisCBs.append(cb);
+			ui->joystickMapGridLayout->addWidget(label, i, 0);
+			ui->joystickMapGridLayout->addWidget(cb, i, 1);
+			connect(cb, SIGNAL(currentIndexChanged(int)), this, SLOT(on_joystickAxisActionChanged(int)));
+		}
+		for (int i = joystickButtonLabels.count(); i < joysticks->getNumButtons(jid); i++) {
+			auto label = new QLabel(this);
+			auto cb = new QComboBox(this);
+			label->setText(QString("Button %1").arg(i));
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_NONE);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_CAMERA_PREV);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_CAMERA_NEXT);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_PRESET_PREV);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_PRESET_NEXT);
+			cbAddJoyAction(cb, PTZ_JOY_ACTION_PRESET_RECALL);
+			cb->setProperty("button-id", i);
+			joystickButtonLabels.append(label);
+			joystickButtonCBs.append(cb);
+			ui->joystickMapGridLayout->addWidget(label, i + BUTTON_ROW_OFFSET, 0);
+			ui->joystickMapGridLayout->addWidget(cb, i + BUTTON_ROW_OFFSET, 1);
+			connect(cb, SIGNAL(currentIndexChanged(int)), this, SLOT(on_joystickButtonActionChanged(int)));
+		}
+
+		for (int i = 0; i < joystickAxisCBs.size(); i++)
+			joystickAxisMappingChanged(i, controls->joystickAxisAction(i));
+		for (int i = 0; i < joystickButtonCBs.size(); i++)
+			joystickButtonMappingChanged(i, controls->joystickButtonAction(i));
+	}
+}
+
+void PTZSettings::joystickAxisMappingChanged(size_t axis, ptz_joy_action_id action)
+{
+	if (axis >= (size_t)joystickAxisCBs.size())
+		return;
+	auto cb = joystickAxisCBs.at(axis);
+	auto idx = cb->findData(QVariant((int)action));
+	cb->setCurrentIndex(idx >= 0 ? idx : 0);
+}
+
+void PTZSettings::joystickButtonMappingChanged(size_t button, ptz_joy_action_id action)
+{
+	if (button >= (size_t)joystickButtonCBs.size())
+		return;
+	auto cb = joystickButtonCBs.at(button);
+	auto idx = cb->findData(QVariant((int)action));
+	cb->setCurrentIndex(idx >= 0 ? idx : 0);
 }
 
 void PTZSettings::joystickCurrentChanged(QModelIndex current, QModelIndex previous)
 {
 	Q_UNUSED(previous);
 	PTZControls::getInstance()->setJoystickId(current.row());
 }
+
+void PTZSettings::joystickAxisEvent(const QJoystickAxisEvent evt)
+{
+	auto jid = PTZControls::getInstance()->joystickId();
+	if (evt.joystick->id != jid || evt.axis >= joystickAxisLabels.size())
+		return;
+	auto label = joystickAxisLabels.at(evt.axis);
+	label->setText(QString("Axis %1 [%2]").arg(evt.axis).arg(evt.value));
+}
+
+void PTZSettings::joystickButtonEvent(const QJoystickButtonEvent evt)
+{
+	auto jid = PTZControls::getInstance()->joystickId();
+	if (evt.joystick->id != jid || evt.button >= joystickButtonLabels.size())
+		return;
+	auto label = joystickButtonLabels.at(evt.button);
+	label->setText(QString("Button %1 [%2]").arg(evt.button).arg(evt.pressed));
+}
+
 #else
 void PTZSettings::joystickSetup()
 {

src/settings.hpp

@@ -43,12 +43,20 @@ class PTZSettings : public QWidget {
 protected:
 	void joystickSetup();
 	QStringListModel m_joystickNamesModel;
+	QList<QLabel *> joystickAxisLabels, joystickButtonLabels;
+	QList<QComboBox *> joystickAxisCBs, joystickButtonCBs;
 protected slots:
 	void on_joystickGroupBox_toggled(bool checked);
 	void on_joystickSpeedSlider_doubleValChanged(double val);
 	void on_joystickDeadzoneSlider_doubleValChanged(double val);
+	void on_joystickAxisActionChanged(int idx);
+	void on_joystickButtonActionChanged(int idx);
 	void joystickUpdate();
+	void joystickAxisMappingChanged(size_t axis, ptz_joy_action_id action);
+	void joystickButtonMappingChanged(size_t button, ptz_joy_action_id action);
 	void joystickCurrentChanged(QModelIndex, QModelIndex);
+	void joystickAxisEvent(const QJoystickAxisEvent);
+	void joystickButtonEvent(const QJoystickButtonEvent);
 #else  /* ENABLE_JOYSTICK */
 protected:
 	void joystickSetup();

src/settings.ui

@@ -87,27 +87,25 @@
            </layout>
           </item>
           <item>
-           <widget class="QLabel" name="joystickBindingsLabel">
-            <property name="text">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Joysitck Bindings:&lt;/p&gt;
-&lt;p&gt;
-&lt;table&gt;
-&lt;tr&gt;&lt;th&gt;Control&lt;/th&gt;&lt;th&gt;Action&lt;/th&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;Left Joystick&lt;/td&gt;&lt;td&gt;Pan/Tilt&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;Right Joystick&lt;/td&gt;&lt;td&gt;Zoom&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;D-Pad&lt;/td&gt;&lt;td&gt;Select Preset&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;Shoulder buttons&lt;/td&gt;&lt;td&gt;Change Camera&lt;/td&gt;&lt;/tr&gt;
-&lt;tr&gt;&lt;td&gt;A Button&lt;/td&gt;&lt;td&gt;Activate current preset&lt;/td&gt;&lt;/tr&gt;
-&lt;/table&gt;
-&lt;/p&gt;
-&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-            </property>
-            <property name="wordWrap">
+           <widget class="QScrollArea" name="scrollArea">
+            <property name="widgetResizable">
              <bool>true</bool>
             </property>
+            <widget class="QWidget" name="scrollAreaWidgetContents_3">
+             <property name="geometry">
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>330</width>
+               <height>338</height>
+              </rect>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <layout class="QGridLayout" name="joystickMapGridLayout"/>
+              </item>
+             </layout>
+            </widget>
            </widget>
           </item>
          </layout>
@@ -264,30 +262,30 @@
            <property name="sizeConstraint">
             <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
            </property>
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <item>
+              <spacer name="horizontalSpacer">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
-              <layout class="QHBoxLayout" name="horizontalLayout_4">
-               <item>
-                <spacer name="horizontalSpacer">
-                 <property name="orientation">
-                  <enum>Qt::Orientation::Horizontal</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>40</width>
-                   <height>20</height>
-                  </size>
-                 </property>
-                </spacer>
-               </item>
-               <item>
-                <widget class="QPushButton" name="applyButton">
-                 <property name="text">
-                  <string>Apply</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
+              <widget class="QPushButton" name="applyButton">
+               <property name="text">
+                <string>Apply</string>
+               </property>
+              </widget>
              </item>
+            </layout>
+           </item>
           </layout>
          </widget>
         </widget>