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

Corrected modes for FT-736R. The FT-736 supports SSB, CW, FM, FM-N (narrowband FM,) CW-N (narrowband CW.) Now, the FM-N and CW-N modes can be set from rigctl. Passbands have also been corrected to the values in the manual.

pull/776/head
kacomet 2021-08-27 19:41:38 -05:00
rodzic 7bddd99cd8
commit 574f22b096
3 zmienionych plików z 17 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
include/hamlib/rig.h
Wyświetl plik

@ -1224,7 +1224,7 @@ typedef uint64_t rmode_t;
#define RIG_MODE_C4FM CONSTANT_64BIT_FLAG (33) /*!< \c Yaesu C4FM mode */
#define RIG_MODE_PKTFMN CONSTANT_64BIT_FLAG (34) /*!< \c Yaesu DATA-FM-N */
#define RIG_MODE_SPEC CONSTANT_64BIT_FLAG (35) /*!< \c Unfiltered as in PowerSDR */
#define RIG_MODE_BIT36 CONSTANT_64BIT_FLAG (36) /*!< \c reserved for future expansion */
#define RIG_MODE_CWN CONSTANT_64BIT_FLAG (36) /*!< \c CWN -- Narrow band CW (FT-736R) */
#define RIG_MODE_BIT37 CONSTANT_64BIT_FLAG (37) /*!< \c reserved for future expansion */
#define RIG_MODE_BIT38 CONSTANT_64BIT_FLAG (38) /*!< \c reserved for future expansion */
#define RIG_MODE_BIT39 CONSTANT_64BIT_FLAG (39) /*!< \c reserved for future expansion */

30
rigs/yaesu/ft736.c
Wyświetl plik

@ -38,7 +38,7 @@
#define FT736_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_FM)
#define FT736_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_FMN|RIG_MODE_CWN)
#define FT736_VFOS (RIG_VFO_A)
@ -181,10 +181,10 @@ const struct rig_caps ft736_caps =
/* mode/filter list, remember: order matters! */
.filters = {
{RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_CWR, kHz(2.2)},
{RIG_MODE_CW | RIG_MODE_CWR, Hz(600)},
{RIG_MODE_FM, kHz(12)},
{RIG_MODE_FM, kHz(8)},
{RIG_MODE_CW | RIG_MODE_SSB, kHz(2.2)},
{RIG_MODE_FM, kHz(12)},
{RIG_MODE_FMN, kHz(8)},
{RIG_MODE_CWN, Hz(600)},
RIG_FLT_END,
},
@ -291,9 +291,9 @@ int ft736_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
#define MD_LSB 0x00
#define MD_USB 0x01
#define MD_CW 0x02
#define MD_CWR 0x03
#define MD_AM 0x04
#define MD_CWN 0x82
#define MD_FM 0x08
#define MD_FMN 0x88
int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{
@ -311,17 +311,17 @@ int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/
switch (mode)
{
case RIG_MODE_CW: md = MD_CW; break;
case RIG_MODE_CW: md = MD_CW; break;
case RIG_MODE_CWR: md = MD_CWR; break;
case RIG_MODE_CWN: md = MD_CWN; break;
case RIG_MODE_USB: md = MD_USB; break;
case RIG_MODE_LSB: md = MD_LSB; break;
case RIG_MODE_FM: md = MD_FM; break;
case RIG_MODE_FM: md = MD_FM; break;
case RIG_MODE_AM: md = MD_AM; break;
case RIG_MODE_FMN: md = MD_FMN; break;
default:
return -RIG_EINVAL; /* sorry, wrong MODE */
@ -397,17 +397,17 @@ int ft736_set_split_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
*/
switch (mode)
{
case RIG_MODE_CW: md = MD_CW; break;
case RIG_MODE_CW: md = MD_CW; break;
case RIG_MODE_CWR: md = MD_CWR; break;
case RIG_MODE_CWN: md = MD_CWN; break;
case RIG_MODE_USB: md = MD_USB; break;
case RIG_MODE_LSB: md = MD_LSB; break;
case RIG_MODE_FM: md = MD_FM; break;
case RIG_MODE_FM: md = MD_FM; break;
case RIG_MODE_AM: md = MD_AM; break;
case RIG_MODE_FMN: md = MD_FMN; break;
default:
return -RIG_EINVAL; /* sorry, wrong MODE */

1
src/misc.c
Wyświetl plik

@ -453,6 +453,7 @@ static const struct
{ RIG_MODE_PSKR, "PSKR"},
{ RIG_MODE_C4FM, "C4FM"},
{ RIG_MODE_SPEC, "SPEC"},
{ RIG_MODE_CWN, "CWN"},
{ RIG_MODE_NONE, "" },
};