mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add ritctl model to rigCaps

merge-requests/5/merge
Phil Taylor 2021-08-07 18:34:34 +01:00
rodzic bbb45a01c7
commit 3a2db789a2
3 zmienionych plików z 20 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
rigcommander.cpp
Wyświetl plik

@ -2858,6 +2858,7 @@ void rigCommander::determineRigCaps()
switch(model){
case model7300:
rigCaps.modelName = QString("IC-7300");
rigCaps.rigctlModel = 3073;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 11;
rigCaps.spectAmpMax = 160;
@ -2881,6 +2882,7 @@ void rigCommander::determineRigCaps()
break;
case modelR8600:
rigCaps.modelName = QString("IC-R8600");
rigCaps.rigctlModel = 3079;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 11;
rigCaps.spectAmpMax = 160;
@ -2915,6 +2917,7 @@ void rigCommander::determineRigCaps()
break;
case model9700:
rigCaps.modelName = QString("IC-9700");
rigCaps.rigctlModel = 3081;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 11;
rigCaps.spectAmpMax = 160;
@ -2942,6 +2945,7 @@ void rigCommander::determineRigCaps()
break;
case model910h:
rigCaps.modelName = QString("IC-910H");
rigCaps.rigctlModel = 3044;
rigCaps.hasSpectrum = false;
rigCaps.hasLan = false;
rigCaps.hasEthernet = false;
@ -2963,6 +2967,7 @@ void rigCommander::determineRigCaps()
break;
case model7600:
rigCaps.modelName = QString("IC-7600");
rigCaps.rigctlModel = 3063;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputACC);
rigCaps.inputs.append(inputUSB);
@ -2986,6 +2991,7 @@ void rigCommander::determineRigCaps()
break;
case model7610:
rigCaps.modelName = QString("IC-7610");
rigCaps.rigctlModel = 3078;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 15;
rigCaps.spectAmpMax = 200;
@ -3016,6 +3022,7 @@ void rigCommander::determineRigCaps()
break;
case model7850:
rigCaps.modelName = QString("IC-785x");
rigCaps.rigctlModel = 3075;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 15;
rigCaps.spectAmpMax = 136;
@ -3047,6 +3054,7 @@ void rigCommander::determineRigCaps()
break;
case model705:
rigCaps.modelName = QString("IC-705");
rigCaps.rigctlModel = 3085;
rigCaps.hasSpectrum = true;
rigCaps.spectSeqMax = 11;
rigCaps.spectAmpMax = 160;
@ -3082,6 +3090,7 @@ void rigCommander::determineRigCaps()
break;
case model7000:
rigCaps.modelName = QString("IC-7000");
rigCaps.rigctlModel = 3060;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputACC);
rigCaps.hasLan = false;
@ -3103,6 +3112,7 @@ void rigCommander::determineRigCaps()
break;
case model7410:
rigCaps.modelName = QString("IC-7410");
rigCaps.rigctlModel = 3067;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputACC);
rigCaps.hasLan = false;
@ -3123,6 +3133,7 @@ void rigCommander::determineRigCaps()
break;
case model7100:
rigCaps.modelName = QString("IC-7100");
rigCaps.rigctlModel = 3070;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputUSB);
rigCaps.inputs.append(inputACC);
@ -3149,6 +3160,7 @@ void rigCommander::determineRigCaps()
break;
case model7200:
rigCaps.modelName = QString("IC-7200");
rigCaps.rigctlModel = 3061;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputUSB);
rigCaps.inputs.append(inputACC);
@ -3168,6 +3180,7 @@ void rigCommander::determineRigCaps()
break;
case model7700:
rigCaps.modelName = QString("IC-7700");
rigCaps.rigctlModel = 3062;
rigCaps.hasSpectrum = false;
rigCaps.inputs.append(inputLAN);
//rigCaps.inputs.append(inputSPDIF);
@ -3193,6 +3206,7 @@ void rigCommander::determineRigCaps()
break;
case model706:
rigCaps.modelName = QString("IC-706");
rigCaps.rigctlModel = 3009;
rigCaps.hasSpectrum = false;
rigCaps.inputs.clear();
rigCaps.hasLan = false;
@ -3211,6 +3225,7 @@ void rigCommander::determineRigCaps()
break;
case model718:
rigCaps.modelName = QString("IC-718");
rigCaps.rigctlModel = 3013;
rigCaps.hasSpectrum = false;
rigCaps.inputs.clear();
rigCaps.hasLan = false;
@ -3233,6 +3248,7 @@ void rigCommander::determineRigCaps()
break;
case model756pro:
rigCaps.modelName = QString("IC-756 Pro");
rigCaps.rigctlModel = 3027;
rigCaps.hasSpectrum = false;
rigCaps.inputs.clear();
rigCaps.hasLan = false;
@ -3251,6 +3267,7 @@ void rigCommander::determineRigCaps()
break;
case model756proii:
rigCaps.modelName = QString("IC-756 Pro II");
rigCaps.rigctlModel = 3027;
rigCaps.hasSpectrum = false;
rigCaps.inputs.clear();
rigCaps.hasLan = false;
@ -3269,6 +3286,7 @@ void rigCommander::determineRigCaps()
break;
case model756proiii:
rigCaps.modelName = QString("IC-756 Pro III");
rigCaps.rigctlModel = 3027;
rigCaps.hasSpectrum = false;
rigCaps.inputs.clear();
rigCaps.hasLan = false;

2
rigctld.cpp
Wyświetl plik

@ -144,7 +144,7 @@ void rigCtlClient::socketReadyRead()
{
// Currently send "fake" state information until I can work out what is required!
response.append("1");
response.append("1");
response.append(QString("%1").arg(rigCaps.rigctlModel));
response.append("0");
for (bandType band : rigCaps.bands)
{

3
rigidentities.h
Wyświetl plik

@ -90,10 +90,9 @@ model_kind determineRadioModel(unsigned char rigID);
struct rigCapabilities {
model_kind model;
quint8 civ;
quint8 modelID;
int rigctlModel;
QString modelName;
bool hasLan; // OEM ethernet or wifi connection