ham-ref/flrig
1
0
Fork 0
mirror of https://git.code.sf.net/p/fldigi/flrig synced 2026-08-13 17:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

KX2

Browse source 
* Add separate class for KX2 based on KX3
    . correct bandwidth table for KX3
This commit is contained in:
dave-w1hkj 2023-06-28 20:52:25 -05:00
parent 1b3cef6e43
commit 0cc4065354
4 changed files with 112 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/include/elecraft/KX3.h
View file

@ -118,4 +118,10 @@ private:
void get_options();
};
class RIG_KX2 : public RIG_KX3 {
public:
RIG_KX2();
~RIG_KX2() {}
};
#endif

85
src/include/rigs.h
View file

@ -196,47 +196,48 @@ extern RIG_ICR71 rig_ICR71; // 63
extern RIG_K2 rig_K2; // 64
extern RIG_K3 rig_K3; // 65
extern RIG_KX3 rig_KX3; // 66
extern RIG_K4 rig_K4; // 67
extern RIG_PCR1000 rig_PCR1000; // 68
extern RIG_RAY152 rig_RAY152; // 69
extern RIG_TMD710 rig_TMD710; // 70
extern RIG_TS440 rig_TS440; // 71
extern RIG_TS140 rig_TS140; // 72
extern RIG_TS450S rig_TS450S; // 73
extern RIG_TS480HX rig_TS480HX; // 74
extern RIG_TS480SAT rig_TS480SAT; // 75
extern RIG_TS570 rig_TS570; // 76
extern RIG_TS590S rig_TS590S; // 77
extern RIG_TS590SG rig_TS590SG; // 78
extern RIG_TS790 rig_TS790; // 79
extern RIG_TS850 rig_TS850; // 80
extern RIG_TS870S rig_TS870S; // 81
extern RIG_TS890S rig_TS890S; // 82
extern RIG_TS940S rig_TS940S; // 83
extern RIG_TS950 rig_TS950; // 84
extern RIG_TS990 rig_TS990; // 85
extern RIG_TS2000 rig_TS2000; // 86
extern RIG_TT516 rig_TT516; // 87
extern RIG_TT535 rig_TT535; // 88
extern RIG_TT538 rig_TT538; // 89
extern RIG_TT550 rig_TT550; // 90
extern RIG_TT563 rig_TT563; // 91
extern RIG_TT566 rig_TT566; // 92
extern RIG_TT588 rig_TT588; // 93
extern RIG_TT599 rig_TT599; // 84
extern RIG_AOR5K rig_AOR5K; // 95
extern RIG_XI5105 rig_XI5105; // 96
extern RIG_Xiegu_G90 rig_XIG90; // 97
extern RIG_X6100 rig_X6100; // 98
extern RIG_PowerSDR rig_PowerSDR; // 99
extern RIG_FLEX1500 rig_FLEX1500; // 100
extern RIG_TX500 rig_TX500; // 101
extern RIG_QCXP rig_QCXP; // 102
extern RIG_QDX rig_qdx; // 103
extern RIG_QMX rig_qmx; // 104
extern RIG_SDR2_PRO rig_sdr2; // 105
extern RIG_TCI_SUNDX rig_tci_sundx; // 106
extern RIG_TCI_SUNPRO rig_tci_sunpro; // 107
extern RIG_TRUSDX rig_trusdx; // 108
extern RIG_KX2 rig_KX2; // 67
extern RIG_K4 rig_K4; // 68
extern RIG_PCR1000 rig_PCR1000; // 69
extern RIG_RAY152 rig_RAY152; // 70
extern RIG_TMD710 rig_TMD710; // 71
extern RIG_TS440 rig_TS440; // 72
extern RIG_TS140 rig_TS140; // 73
extern RIG_TS450S rig_TS450S; // 74
extern RIG_TS480HX rig_TS480HX; // 75
extern RIG_TS480SAT rig_TS480SAT; // 76
extern RIG_TS570 rig_TS570; // 77
extern RIG_TS590S rig_TS590S; // 78
extern RIG_TS590SG rig_TS590SG; // 79
extern RIG_TS790 rig_TS790; // 80
extern RIG_TS850 rig_TS850; // 81
extern RIG_TS870S rig_TS870S; // 82
extern RIG_TS890S rig_TS890S; // 83
extern RIG_TS940S rig_TS940S; // 84
extern RIG_TS950 rig_TS950; // 85
extern RIG_TS990 rig_TS990; // 86
extern RIG_TS2000 rig_TS2000; // 87
extern RIG_TT516 rig_TT516; // 88
extern RIG_TT535 rig_TT535; // 89
extern RIG_TT538 rig_TT538; // 90
extern RIG_TT550 rig_TT550; // 91
extern RIG_TT563 rig_TT563; // 92
extern RIG_TT566 rig_TT566; // 93
extern RIG_TT588 rig_TT588; // 94
extern RIG_TT599 rig_TT599; // 85
extern RIG_AOR5K rig_AOR5K; // 96
extern RIG_XI5105 rig_XI5105; // 97
extern RIG_Xiegu_G90 rig_XIG90; // 98
extern RIG_X6100 rig_X6100; // 99
extern RIG_PowerSDR rig_PowerSDR; // 100
extern RIG_FLEX1500 rig_FLEX1500; // 101
extern RIG_TX500 rig_TX500; // 102
extern RIG_QCXP rig_QCXP; // 103
extern RIG_QDX rig_qdx; // 104
extern RIG_QMX rig_qmx; // 105
extern RIG_SDR2_PRO rig_sdr2; // 106
extern RIG_TCI_SUNDX rig_tci_sundx; // 107
extern RIG_TCI_SUNPRO rig_tci_sunpro; // 108
extern RIG_TRUSDX rig_trusdx; // 109
#endif

26
src/rigs/elecraft/KX3.cxx
View file

@ -43,13 +43,13 @@ static const char *vKX3_widths[] = {
"50", "60", "70", "80", "90",
"100", "110", "120", "130", "140", "150", "160", "170", "180", "190",
"200", "210", "220", "230", "240", "250", "260", "270", "280", "290",
"300", "310", "220", "330", "340", "350", "360", "370", "380", "390",
"400", "410", "220", "430", "440", "450", "460", "470", "480", "490",
"500", "510", "220", "530", "540", "550", "560", "570", "580", "590",
"600", "610", "220", "630", "640", "650", "660", "670", "680", "690",
"700", "710", "220", "730", "740", "750", "760", "770", "780", "790",
"800", "810", "220", "830", "840", "850", "860", "870", "880", "890",
"900", "910", "220", "930", "940", "950", "960", "970", "980", "990",
"300", "310", "320", "330", "340", "350", "360", "370", "380", "390",
"400", "410", "420", "430", "440", "450", "460", "470", "480", "490",
"500", "510", "520", "530", "540", "550", "560", "570", "580", "590",
"600", "610", "620", "630", "640", "650", "660", "670", "680", "690",
"700", "710", "720", "730", "740", "750", "760", "770", "780", "790",
"800", "810", "820", "830", "840", "850", "860", "870", "880", "890",
"900", "910", "920", "930", "940", "950", "960", "970", "980", "990",
"1000", "1100", "1200", "1300", "1400", "1500", "1600", "1700", "1800", "1900",
"2000", "2100", "2200", "2300", "2400", "2500", "2600", "2700", "2800", "2900",
"3000", "3100", "3200", "3300", "3400", "3500", "3600", "3700", "3800", "3900",
@ -1202,3 +1202,15 @@ int RIG_KX3::get_swr()
return mtr;
}
//======================================================================
//
// KX2 is identical to KX3
//
//======================================================================
RIG_KX2::RIG_KX2 () {
name_ = "KX2";
};

86
src/rigs/rigs.cxx
View file

@ -96,6 +96,7 @@ RIG_ICR71 rig_ICR71;
RIG_K2 rig_K2;
RIG_K3 rig_K3;
RIG_KX3 rig_KX3;
RIG_KX2 rig_KX2;
RIG_K4 rig_K4;
RIG_PCR1000 rig_PCR1000;
RIG_RAY152 rig_RAY152;
@ -206,48 +207,49 @@ rigbase *rigs[] = {
&rig_K2, // 64
&rig_K3, // 65
&rig_KX3, // 66
&rig_K4, // 67
&rig_PCR1000, // 68
&rig_RAY152, // 69
&rig_TMD710, // 70
&rig_TS140, // 71
&rig_TS440, // 72
&rig_TS450S, // 73
&rig_TS480HX, // 74
&rig_TS480SAT, // 75
&rig_TS570, // 76
&rig_TS590S, // 77
&rig_TS590SG, // 78
&rig_TS790, // 79
&rig_TS850, // 80
&rig_TS870S, // 81
&rig_TS890S, // 82
&rig_TS940S, // 83
&rig_TS950, // 84
&rig_TS990, // 85
&rig_TS2000, // 86
&rig_TT516, // 87
&rig_TT535, // 88
&rig_TT538, // 89
&rig_TT550, // 90
&rig_TT563, // 91
&rig_TT566, // 92
&rig_TT588, // 93
&rig_TT599, // 94
&rig_AOR5K, // 95
&rig_XI5105, // 96
&rig_XIG90, // 97
&rig_X6100, // 98
&rig_PowerSDR, // 99
&rig_FLEX1500, // 100
&rig_TX500, // 101
&rig_QCXP, // 102
&rig_qdx, // 103
&rig_qmx, // 104
&rig_sdr2, // 105
&rig_tci_sundx, // 106
&rig_tci_sunpro,// 107
&rig_trusdx, // 108
&rig_KX2, // 67
&rig_K4, // 68
&rig_PCR1000, // 69
&rig_RAY152, // 70
&rig_TMD710, // 71
&rig_TS140, // 72
&rig_TS440, // 73
&rig_TS450S, // 74
&rig_TS480HX, // 75
&rig_TS480SAT, // 76
&rig_TS570, // 77
&rig_TS590S, // 78
&rig_TS590SG, // 79
&rig_TS790, // 80
&rig_TS850, // 81
&rig_TS870S, // 82
&rig_TS890S, // 83
&rig_TS940S, // 84
&rig_TS950, // 85
&rig_TS990, // 86
&rig_TS2000, // 87
&rig_TT516, // 88
&rig_TT535, // 89
&rig_TT538, // 90
&rig_TT550, // 91
&rig_TT563, // 92
&rig_TT566, // 93
&rig_TT588, // 94
&rig_TT599, // 95
&rig_AOR5K, // 96
&rig_XI5105, // 97
&rig_XIG90, // 98
&rig_X6100, // 99
&rig_PowerSDR, // 100
&rig_FLEX1500, // 101
&rig_TX500, // 102
&rig_QCXP, // 103
&rig_qdx, // 104
&rig_qmx, // 105
&rig_sdr2, // 106
&rig_tci_sundx, // 107
&rig_tci_sunpro,// 108
&rig_trusdx, // 109
NULL
};