fixed small issue in the install stuff

Add AppStream metainfo file, standard size icon

Thank you, AsciiWolf, for helping us with flatpak (and flathub). 

See merge request eliggett/wfview!19

INSTALL.md

@@ -80,8 +80,7 @@ install wfview on suse 15.3 & up, sles 15.x or tumbleweed; this was done on a cl
 we need to add packages to be able to build the stuff.
 
 - sudo zypper in --type pattern devel_basis
-- sudo zypper in libQt5Widgets-devel libqt5-qtbase-common-devel libqt5-qtserialport-devel libQt5SerialPort5 qcustomplot-devel libqcustomplot2 libQt5PrintSupport-devel libqt5-qtmultimedia-devel lv2-devel libopus-devel eigen3-devel libQt5Xml-devel portaudio-devel rtaudio-devel libqt5-qtgamepad-dev
-libQt5Gamepad5
+- sudo zypper in libQt5Widgets-devel libqt5-qtbase-common-devel libqt5-qtserialport-devel libQt5SerialPort5 qcustomplot-devel libqcustomplot2 libQt5PrintSupport-devel libqt5-qtmultimedia-devel lv2-devel libopus-devel eigen3-devel libQt5Xml-devel portaudio-devel rtaudio-devel libqt5-qtgamepad-devel libQt5Gamepad5
 
 optional (mainly for development specifics): get and install qt5:
 

resources/install.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 echo "This script copies the following items into your system:" 
 echo ""
-echo "icon: wfview.png to /usr/share/pixmaps/"
+echo "icon: unix_icons/wfview.png to /usr/share/icons/hicolor/256x256/apps/"
 echo "wfview application to /usr/local/bin/"
 echo "wfview.desktop to /usr/share/applications/"
-echo "qdarkstyle stylesheet to /usr/share/wfview/stylesheets"
+echo "org.wfview.wfview.metainfo.xml metadata file to /usr/share/metainfo/"
+echo "qdarkstyle stylesheet to /usr/share/wfview/stylesheets/"
 
 echo ""
 echo "This script MUST be run from the build directory. Do not run it from the source directory!"
@@ -30,7 +31,8 @@ echo ""
 
 cp wfview /usr/local/bin/wfview
 cp wfview.desktop /usr/share/applications/
-cp wfview.png /usr/share/pixmaps/
+cp unix_icons/wfview.png /usr/share/icons/hicolor/256x256/apps/
+cp org.wfview.wfview.metainfo.xml /usr/share/metainfo/
 mkdir -p /usr/share/wfview/stylesheets
 cp -r qdarkstyle /usr/share/wfview/stylesheets/
 

resources/org.wfview.wfview.metainfo.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.wfview.wfview</id>
+  <launchable type="desktop-id">wfview.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  <name>wfview</name>
+  <developer_name>Elliott H. Liggett</developer_name>
+  <summary>Open Source interface for Icom transceivers</summary>
+  <description>
+    <p>
+      wfview is a program developed by amateur radio enthusiasts to control modern Icom ham radios. It provides the user with controls
+      that may be comfortably operated from a keyboard, mouse, or touch screen interface. wfview is free and open source software.
+    </p>
+    <p>
+      wfview has been developed with an eye towards compatibility. Even though our target platform consists of modern-era transceivers,
+      wfview’s command dictionary is focused on commands with the most compatibility. Many of Icom’s transceivers from the last 20 years
+      will work to some degree with wfview, and we are always adding more.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source">https://wfview.org/wp-content/uploads/2021/11/7300-remote-screenshot.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://wfview.org</url>
+  <url type="bugtracker">https://gitlab.com/eliggett/wfview/-/issues</url>
+  <content_rating type="oars-1.1"/>
+</component>

usbcontroller.cpp

@@ -18,22 +18,23 @@ usbController::usbController()
     loadKnobs();
 
     // This is a the "master" list of supported devices. Maybe move to settings at some point?
-    // usbDeviceType, manufacturer, product, usage, usagePage, butons, knobs, leds, maxPayload, iconSize
-    knownDevices.append(USBTYPE(shuttleXpress,0x0b33,0x0020,0x0000,0x0000,15,2,0,5,0));
-    knownDevices.append(USBTYPE(shuttlePro2,0x0b33,0x0030,0x0000,0x0000,15,2,0,5,0));
-    knownDevices.append(USBTYPE(shuttlePro2,0x0b33,0x0011,0x0000,0x0000,15,2,0,5,0)); // Actually a ShuttlePro but hopefully will work?
-    knownDevices.append(USBTYPE(RC28,0x0c26,0x001e,0x0000,0x0000,3,1,3,64,0));
-    knownDevices.append(USBTYPE(eCoderPlus, 0x1fc9, 0x0003,0x0000,0x0000,22,4,0,32,0)); // Actually 20 but some bit0 and bit15 aren't used
-    knownDevices.append(USBTYPE(QuickKeys, 0x28bd, 0x5202,0x0001,0xff0a,10,1,0,32,0));
-    knownDevices.append(USBTYPE(StreamDeckMini, 0x0fd9, 0x0063, 0x0000, 0x0000,6,0,0,1024,80));
-    knownDevices.append(USBTYPE(StreamDeckMiniV2, 0x0fd9, 0x0090, 0x0000, 0x0000,6,0,0,1024,80));
-    knownDevices.append(USBTYPE(StreamDeckOriginal, 0x0fd9, 0x0060, 0x0000, 0x0000,15,0,0,8191,72));
-    knownDevices.append(USBTYPE(StreamDeckOriginalV2, 0x0fd9, 0x006d, 0x0000, 0x0000,15,0,0,1024,72));
-    knownDevices.append(USBTYPE(StreamDeckOriginalMK2, 0x0fd9, 0x0080, 0x0000, 0x0000,15,0,0,1024,72));
-    knownDevices.append(USBTYPE(StreamDeckXL, 0x0fd9, 0x006c, 0x0000, 0x0000,32,0,0,1024,96));
-    knownDevices.append(USBTYPE(StreamDeckXLV2, 0x0fd9, 0x008f, 0x0000, 0x0000,32,0,0,1024,96));
-    knownDevices.append(USBTYPE(StreamDeckPedal, 0x0fd9, 0x0086, 0x0000, 0x0000,3,0,0,1024,0));
-    knownDevices.append(USBTYPE(StreamDeckPlus, 0x0fd9, 0x0084, 0x0000, 0x0000,12,4,0,1024,120));
+    // usbDeviceType, manufacturer, product, usage, usagePage, buttons, columns, knobs, leds, maxPayload, iconSize
+    knownDevices.append(USBTYPE(shuttleXpress,0x0b33,0x0020,0x0000,0x0000,15,0,2,0,5,0));
+    knownDevices.append(USBTYPE(shuttlePro2,0x0b33,0x0030,0x0000,0x0000,15,0,2,0,5,0));
+    knownDevices.append(USBTYPE(shuttlePro2,0x0b33,0x0011,0x0000,0x0000,15,0,2,0,5,0)); // Actually a ShuttlePro but hopefully will work?
+    knownDevices.append(USBTYPE(RC28,0x0c26,0x001e,0x0000,0x0000,3,0,1,3,64,0));
+    knownDevices.append(USBTYPE(eCoderPlus, 0x1fc9, 0x0003,0x0000,0x0000,22,0,4,0,32,0)); // Actually 20 but some bit0 and bit15 aren't used
+    knownDevices.append(USBTYPE(QuickKeys, 0x28bd, 0x5202,0x0001,0xff0a,10,0,1,0,32,0));
+    knownDevices.append(USBTYPE(StreamDeckMini, 0x0fd9, 0x0063, 0x0000, 0x0000,6,0,0,0,1024,80));
+    knownDevices.append(USBTYPE(StreamDeckMiniV2, 0x0fd9, 0x0090, 0x0000, 0x0000,6,0,0,0,1024,80));
+    knownDevices.append(USBTYPE(StreamDeckOriginal, 0x0fd9, 0x0060, 0x0000, 0x0000,15,5,0,0,8191,72));
+    knownDevices.append(USBTYPE(StreamDeckOriginalV2, 0x0fd9, 0x006d, 0x0000, 0x0000,15,5,0,0,1024,72));
+    knownDevices.append(USBTYPE(StreamDeckOriginalMK2, 0x0fd9, 0x0080, 0x0000, 0x0000,15,5,0,0,1024,72));
+    knownDevices.append(USBTYPE(StreamDeckXL, 0x0fd9, 0x006c, 0x0000, 0x0000,32,8,0,0,1024,96));
+    knownDevices.append(USBTYPE(StreamDeckXLV2, 0x0fd9, 0x008f, 0x0000, 0x0000,32,8,0,0,1024,96));
+    knownDevices.append(USBTYPE(StreamDeckPedal, 0x0fd9, 0x0086, 0x0000, 0x0000,3,0,0,0,1024,0));
+    knownDevices.append(USBTYPE(StreamDeckPlus, 0x0fd9, 0x0084, 0x0000, 0x0000,12,0,4,0,1024,120));
+    knownDevices.append(USBTYPE(XKeysXK3, 0x05f3, 0x04c5, 0x0001, 0x000c,3,0,0,2,32,0)); // So-called "splat" interface?
 }
 
 usbController::~usbController()
@@ -606,61 +607,73 @@ void usbController::runTimer()
             else if (res>=dev->type.buttons && dev->type.model != usbNone)
             {
                 // Main buttons
-                if ((quint8)data[1] == 0x00)
+                if (dev->type.model == usbDeviceType::StreamDeckOriginal)
                 {
-                    for (int i=dev->type.buttons-dev->type.knobs;i>0;i--) {
-                        tempButtons |= ((quint8)data[i+3] & 0x01) << (i-1);
+
+                    for (int i = dev->type.buttons-1;i>=0;i--) {
+                        quint8 val = ((i - (i % dev->type.cols)) + (dev->type.cols-1)) - (i % dev->type.cols);
+                        tempButtons |= ((quint8)data[val+1] & 0x01) << (i);
                     }
+
+                    qInfo(logUsbControl()) << "RX:" << data.toHex(' ');
                 }
-
-                // Knobs and secondary buttons
-                if (dev->type.model == StreamDeckPlus) {
-                    if ((quint8)data[1] == 0x03 && (quint8)data[2] == 0x05)
+                else
+                {
+                    if ((quint8)data[1] == 0x00)
                     {
-                        // Knob action!
-                        switch ((quint8)data[4])
-                        {
-                        case 0x00:
-                            // Knob button
-                            for (int i=dev->type.buttons;i>7;i--)
-                            {
-                                tempButtons |= ((quint8)data[i-4] & 0x01) << (i-1);
-                            }
-                            break;
-                        case 0x01:
-                            // Knob moved
-                            for (int i=0;i<dev->type.knobs;i++)
-                            {
-                                dev->knobValues[i].value += (qint8)data[i+5];
-                            }
-                            break;
+                        for (int i = dev->type.buttons - dev->type.knobs;i>0;i--) {
+                            tempButtons |= ((quint8)data[i+3] & 0x01) << (i-1);
                         }
                     }
-                    else if ((quint8)data[1] == 0x02 && (quint8)data[2] == 0x0E)
-                    {
-                        // LCD touch event
-                        int x = ((quint8)data[7] << 8) | ((quint8)data[6] & 0xff);
-                        int y = ((quint8)data[9] << 8) | ((quint8)data[8] & 0xff);
-                        int x2=0;
-                        int y2=0;
-                        QString tt="";
-                        switch ((quint8)data[4])
-                        {
-                        case 0x01:
-                            tt="Short";
-                            break;
-                        case 0x02:
-                            tt="Long";
-                            break;
-                        case 0x03:
-                            tt="Swipe";
-                            x2 = ((quint8)data[11] << 8) | ((quint8)data[10] & 0xff);
-                            y2 = ((quint8)data[13] << 8) | ((quint8)data[12] & 0xff);
-                            break;
-                        }
-                        qInfo(logUsbControl()) << QString("%0 touch: %1,%2 to %3,%4").arg(tt).arg(x).arg(y).arg(x2).arg(y2);
-                    }
 
+                    // Knobs and secondary buttons
+                    if (dev->type.model == StreamDeckPlus) {
+                        if ((quint8)data[1] == 0x03 && (quint8)data[2] == 0x05)
+                        {
+                            // Knob action!
+                            switch ((quint8)data[4])
+                            {
+                            case 0x00:
+                                // Knob button
+                                for (int i=dev->type.buttons;i>7;i--)
+                                {
+                                    tempButtons |= ((quint8)data[i-4] & 0x01) << (i-1);
+                                }
+                                break;
+                            case 0x01:
+                                // Knob moved
+                                for (int i=0;i<dev->type.knobs;i++)
+                                {
+                                    dev->knobValues[i].value += (qint8)data[i+5];
+                                }
+                                break;
+                            }
+                        }
+                        else if ((quint8)data[1] == 0x02 && (quint8)data[2] == 0x0E)
+                        {
+                            // LCD touch event
+                            int x = ((quint8)data[7] << 8) | ((quint8)data[6] & 0xff);
+                            int y = ((quint8)data[9] << 8) | ((quint8)data[8] & 0xff);
+                            int x2=0;
+                            int y2=0;
+                            QString tt="";
+                            switch ((quint8)data[4])
+                            {
+                            case 0x01:
+                                tt="Short";
+                                break;
+                            case 0x02:
+                                tt="Long";
+                                break;
+                            case 0x03:
+                                tt="Swipe";
+                                x2 = ((quint8)data[11] << 8) | ((quint8)data[10] & 0xff);
+                                y2 = ((quint8)data[13] << 8) | ((quint8)data[12] & 0xff);
+                                break;
+                            }
+                            qInfo(logUsbControl()) << QString("%0 touch: %1,%2 to %3,%4").arg(tt).arg(x).arg(y).arg(x2).arg(y2);
+                        }
+                    }
                 }
             }
 
@@ -966,7 +979,9 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val,
     case StreamDeckXLV2:
     case StreamDeckPlus:
     case StreamDeckPedal:
-        data.resize(32);
+        if (!sdv1)
+            data.resize(32);
+
         switch (feature)
         {
         case usbFeatureType::featureFirmware:
@@ -1171,7 +1186,8 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val,
                 ((dev->type.model == usbDeviceType::StreamDeckPlus  && val < 8) ||
                 (val < dev->type.buttons)))
             {
-                if (val < 8) {
+                if (val < 8 || dev->type.model != usbDeviceType::StreamDeckPlus) {
+
                     QImage butImage(dev->type.iconSize,dev->type.iconSize, QImage::Format_RGB888);
                     if (color != Q_NULLPTR)
                         butImage.fill(*color);
@@ -1181,7 +1197,11 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val,
                     QPainter butPaint(&butImage);
 
                     if ( img == Q_NULLPTR) {
-                        butPaint.setFont(QFont("times",16));
+                        if (dev->type.iconSize == 72)
+                            butPaint.setFont(QFont("times",10));
+                        else
+                            butPaint.setFont(QFont("times",16));
+
                         butPaint.drawText(butImage.rect(),Qt::AlignCenter | Qt::AlignVCenter, text);
                     } else {
                         butPaint.setCompositionMode(QPainter::CompositionMode_SourceAtop);
@@ -1189,12 +1209,27 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val,
                     }
 
                     QBuffer butBuffer(&data2);
+                    QTransform myTransform;
+                    if (dev->type.model == usbDeviceType::StreamDeckOriginal || dev->type.model == usbDeviceType::StreamDeckXL)
+                    {
+                        myTransform.rotate(180);
+                    }
+                    QImage myImage = butImage.transformed(myTransform);
 
                     if (sdv1)
                     {
-                        butImage.save(&butBuffer, "BMP");
+
+                        myImage.save(&butBuffer, "BMP");
+                        quint16 payloadLen = dev->type.maxPayload - sizeof(streamdeck_v1_image_header);
+
+                        if (dev->type.model == usbDeviceType::StreamDeckOriginal) {
+                            // Special case for buttons on original StreamDeck
+                            val = ((val - (val % dev->type.cols)) + (dev->type.cols-1)) - (val % dev->type.cols) + 1;
+                            payloadLen = data2.size()/2;
+                        }
+
                         quint32 rem = data2.size();
-                        quint16 index = 0;
+                        quint16 index = 1;
                         streamdeck_v1_image_header h1;
                         memset(h1.packet, 0x0, sizeof(h1)); // We can't be sure it is initialized with 0x00!
                         h1.cmd = 0x02;
@@ -1202,24 +1237,24 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val,
                         h1.button = val;
                         while (rem > 0)
                         {
-                            quint16 length = qMin(quint16(rem),quint16(dev->type.maxPayload-sizeof(h1)));
+                            quint32 length = qMin(quint16(rem),quint16(payloadLen));
                             data.clear();
-                            h1.isLast = (quint8)(rem <= dev->type.maxPayload-sizeof(h1) ? 1 : 0); // isLast ? 1 : 0,3
+                            data.squeeze();
+                            h1.isLast = (quint8)(rem <= payloadLen ? 1 : 0); // isLast ? 1 : 0,3
                             h1.index = index;
-                            data.append(QByteArray::fromRawData((const char*)h1.packet,sizeof(h1)));
-                            rem -= length;
-                            data.append(data2.mid(0,length));
+                            data.append(QByteArray::fromRawData((const char*)h1.packet,0x16));
                             data.resize(dev->type.maxPayload);
-                            memset(data.data()+length+sizeof(h1),0x0,data.size()-(length+sizeof(h1)));
+                            rem -= length;
+                            data=data.replace(0x10,length,data2.mid(0,length));
                             res=hid_write(dev->handle, (const unsigned char*)data.constData(), data.size());
-                            //qInfo(logUsbControl()) << "Sending" << (((quint8)data[7] << 8) | ((quint8)data[6] & 0xff)) << "total=" << data.size()  << "payload=" << (((quint8)data[5] << 8) | ((quint8)data[4] & 0xff)) << "last" << (quint8)data[3];
+                            //qInfo(logUsbControl()) << "Sending len=" << dev->type.maxPayload << h1.index << "total=" << data.size()  << "payload=" << length << "last" << h1.isLast;
                             data2.remove(0,length);
                             index++;
                         }
                     }
                     else
                     {
-                        butImage.save(&butBuffer, "JPG");
+                        myImage.save(&butBuffer, "JPG");
                         quint32 rem = data2.size();
                         quint16 index = 0;
                         streamdeck_image_header h;
@@ -1414,11 +1449,11 @@ void usbController::loadButtons()
     defaultButtons.append(BUTTON(StreamDeckOriginal, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginal, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginal, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 10, QRect(65, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 11, QRect(165, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 12, QRect(263, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 13, QRect(364, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 14, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckOriginalMK2
     defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
@@ -1431,11 +1466,11 @@ void usbController::loadButtons()
     defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 10, QRect(65, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 11, QRect(165, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 12, QRect(263, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 13, QRect(364, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 14, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckOriginalV2
     defaultButtons.append(BUTTON(StreamDeckOriginalV2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
@@ -1448,11 +1483,11 @@ void usbController::loadButtons()
     defaultButtons.append(BUTTON(StreamDeckOriginalV2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginalV2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckOriginalV2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 10, QRect(65, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 11, QRect(165, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 12, QRect(263, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 13, QRect(364, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 14, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckMini
     defaultButtons.append(BUTTON(StreamDeckMini, 0, QRect(113, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));

usbcontroller.h

@@ -70,18 +70,19 @@ using namespace std;
 
 struct USBTYPE {
     USBTYPE() {}
-    USBTYPE(usbDeviceType model,quint32 manufacturerId, quint32 productId , quint32 usage, quint32 usagePage, int buttons, int knobs, int leds,  int maxPayload, int iconSize) :
-        model(model), manufacturerId(manufacturerId), productId(productId), usage(usage), usagePage(usagePage), buttons(buttons), knobs(knobs), leds(leds), maxPayload(maxPayload), iconSize(iconSize) {}
+    USBTYPE(usbDeviceType model,quint32 manufacturerId, quint32 productId , quint32 usage, quint32 usagePage, int buttons, int cols, int knobs, int leds,  int maxPayload, int iconSize) :
+        model(model), manufacturerId(manufacturerId), productId(productId), usage(usage), usagePage(usagePage), buttons(buttons), cols(cols), knobs(knobs), leds(leds), maxPayload(maxPayload), iconSize(iconSize) {}
 
     usbDeviceType model = usbNone;
     quint32 manufacturerId=0;
     quint32 productId=0;
     quint32 usage=0;
     quint32 usagePage=0;
-    int buttons=0;
-    int knobs=0;
-    int leds=0;
-    int maxPayload=0;
+    int buttons=0; // How many buttons
+    int cols=0; // How many columns of buttons
+    int knobs=0;    // How many knobs
+    int leds=0;     // how many leds
+    int maxPayload=0;   // Max allowed payload
     int iconSize=0;
 };
 

wfmain.cpp

@@ -1040,7 +1040,7 @@ void wfmain::setupMainUI()
     ui->tuningStepCombo->addItem("1 kHz",     (unsigned int)    1000);
     ui->tuningStepCombo->addItem("2.5 kHz",   (unsigned int)    2500);
     ui->tuningStepCombo->addItem("5 kHz",     (unsigned int)    5000);
-    ui->tuningStepCombo->addItem("6.125 kHz", (unsigned int)    6125);	// PMR
+    ui->tuningStepCombo->addItem("6.25 kHz",  (unsigned int)    6250);	// PMR
     ui->tuningStepCombo->addItem("8.333 kHz", (unsigned int)    8333);	// airband stepsize
     ui->tuningStepCombo->addItem("9 kHz",     (unsigned int)    9000);	// European medium wave stepsize
     ui->tuningStepCombo->addItem("10 kHz",    (unsigned int)   10000);

wfserver.pro

@@ -13,7 +13,7 @@ TEMPLATE = app
 
 CONFIG += console
 
-DEFINES += WFVIEW_VERSION=\\\"1.63\\\"
+DEFINES += WFVIEW_VERSION=\\\"1.65\\\"
 
 DEFINES += BUILD_WFSERVER
 

wfview.pro

@@ -21,7 +21,7 @@ contains(DEFINES,USB_CONTROLLER){
 TARGET = wfview
 TEMPLATE = app
 
-DEFINES += WFVIEW_VERSION=\\\"1.64\\\"
+DEFINES += WFVIEW_VERSION=\\\"1.65\\\"
 
 DEFINES += BUILD_WFVIEW
 
@@ -116,17 +116,22 @@ unix:target.path = $$PREFIX/bin
 INSTALLS += target
 
 # Why doesn't this seem to do anything?
-unix:DISTFILES += resources/wfview.png \
+unix:DISTFILES += resources/unix_icons/wfview.png \
     resources/install.sh
 unix:DISTFILES += resources/wfview.desktop
+unix:DISTFILES += resources/org.wfview.wfview.metainfo.xml
 
 unix:applications.files = resources/wfview.desktop
 unix:applications.path = $$PREFIX/share/applications
 INSTALLS += applications
 
-unix:pixmaps.files = resources/wfview.png
-unix:pixmaps.path = $$PREFIX/share/pixmaps
-INSTALLS += pixmaps
+unix:icons.files = resources/unix_icons/wfview.png
+unix:icons.path = $$PREFIX/share/icons/hicolor/256x256/apps
+INSTALLS += icons
+
+unix:metainfo.files = resources/org.wfview.wfview.metainfo.xml
+unix:metainfo.path = $$PREFIX/share/metainfo
+INSTALLS += metainfo
 
 unix:stylesheets.files = qdarkstyle
 unix:stylesheets.path = $$PREFIX/share/wfview

wfviewtypes.h

@@ -203,8 +203,9 @@ enum passbandActions {passbandStatic, pbtInnerMove, pbtOuterMove, pbtMoving, pas
 enum usbDeviceType { usbNone = 0, shuttleXpress, shuttlePro2,
                      RC28, xBoxGamepad, unknownGamepad, eCoderPlus, QuickKeys,
                      StreamDeckMini,StreamDeckMiniV2,StreamDeckOriginal,StreamDeckOriginalV2,
-                     StreamDeckOriginalMK2,StreamDeckXL,StreamDeckXLV2,StreamDeckPedal, StreamDeckPlus
-                   };
+                     StreamDeckOriginalMK2,StreamDeckXL,StreamDeckXLV2,StreamDeckPedal, StreamDeckPlus,
+                     XKeysXK3
+};
 
 enum usbCommandType{ commandButton, commandKnob, commandAny };
 enum usbFeatureType { featureReset,featureResetKeys, featureEventsA, featureEventsB, featureFirmware, featureSerial, featureButton, featureSensitivity, featureBrightness,