Merge branch 'master' into 'master'

Added IC-746

See merge request eliggett/wfview!9 

Thanks to Philip Kubat

rigcommander.cpp

@@ -3536,6 +3536,34 @@ void rigCommander::determineRigCaps()
                               createMode(modeCW, 0x03, "CW"), createMode(modeCW_R, 0x07, "CW-R"),
                             };
             break;
+        case model746:
+            rigCaps.modelName = QString("IC-746");
+            rigCaps.rigctlModel = 3023;
+            rigCaps.hasSpectrum = false;
+            rigCaps.inputs.clear();
+            rigCaps.hasLan = false;
+            rigCaps.hasEthernet = false;
+            rigCaps.hasWiFi = false;
+            rigCaps.hasFDcomms = false;
+            rigCaps.hasATU = true;
+            rigCaps.hasTBPF = true;
+            rigCaps.hasIFShift = true;
+            rigCaps.hasCTCSS = true;
+            rigCaps.hasDTCS = true;
+            rigCaps.hasAntennaSel = true;
+            rigCaps.preamps.push_back('\x01');
+            rigCaps.preamps.push_back('\x02');
+            rigCaps.attenuators.insert(rigCaps.attenuators.end(),{ '\x20'});
+            // There are two HF and VHF ant, 12-01 adn 12-02 select the HF, the VHF is auto selected
+            // this incorrectly shows up as 2 and 3 in the drop down.
+            rigCaps.antennas = {0x01, 0x02};
+            rigCaps.bands = standardHF;
+            rigCaps.bands.push_back(band2m);
+            rigCaps.bands.push_back(bandGen);
+            rigCaps.modes = commonModes;
+            rigCaps.transceiveCommand = QByteArrayLiteral("\x1a\x05\x00\x00");
+            break;
+
         case model756pro:
             rigCaps.modelName = QString("IC-756 Pro");
             rigCaps.rigctlModel = 3027;

rigidentities.cpp

@@ -58,8 +58,8 @@ model_kind determineRadioModel(unsigned char rigID)
         case model736:
             rig = model736;
             break;
-        case model910h:
-            rig = model910h;
+        case model746:
+            rig = model746;
             break;
         case model756pro:
             rig = model756pro;
@@ -70,6 +70,9 @@ model_kind determineRadioModel(unsigned char rigID)
         case model756proiii:
             rig = model756proiii;
             break;
+        case model910h:
+            rig = model910h;
+            break;
         case model9100:
             rig = model9100;
             break;

rigidentities.h

@@ -31,6 +31,7 @@ enum model_kind {
     model706 = 0x58,
     model718 = 0x5E,
     model736 = 0x40,
+    model746 = 0x56,
     model756pro = 0x5C,
     model756proii = 0x64,
     model756proiii = 0x6E,