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

Remove RIG_PASSBAND_ROOF as it was not necessary to use it

pull/437/head
Mikael Nousiainen 2020-11-10 22:17:15 +02:00
rodzic ff01223443
commit 81d02e22f1
2 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -495,16 +495,13 @@ typedef unsigned int vfo_t;
* \brief Macro for bandpass to be set to normal
* \def RIG_PASSBAND_NORMAL
*/
#define RIG_PASSBAND_NORMAL s_Hz(0) // was 0 but collided with Yaesu SH00; capability
#define RIG_PASSBAND_NORMAL s_Hz(0)
/**
* \brief Macro for bandpass to be left alone
*/
#define RIG_PASSBAND_NOCHANGE s_Hz(-1)
/**
* \brief Macro for selecting roofing filter on set_mode/width -- FTDX101D
*/
#define RIG_PASSBAND_ROOF s_Hz(-3)
/**
*
* \sa rig_passband_normal(), rig_passband_narrow(), rig_passband_wide()

6
rigs/yaesu/newcat.c
Wyświetl plik

@ -6503,6 +6503,8 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
main_sub_vfo = (RIG_VFO_SUB == vfo) ? '1' : '0';
}
// NOTE: RIG_PASSBAND_NORMAL (0) should select the default filter width (SH00)
if (is_ft950)
{
switch (mode)
@ -7045,7 +7047,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_RTTYR:
case RIG_MODE_CW:
case RIG_MODE_CWR:
if (width == RIG_PASSBAND_ROOF) { w = 0; }
if (width == RIG_PASSBAND_NORMAL) { w = 0; }
else if (width <= 50) { w = 1; }
else if (width <= 100) { w = 2; }
else if (width <= 150) { w = 3; }
@ -7068,7 +7070,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_LSB:
case RIG_MODE_USB:
if (width == RIG_PASSBAND_ROOF) { w = 0; }
if (width == RIG_PASSBAND_NORMAL) { w = 0; }
else if (width <= 300) { w = 1; }
else if (width <= 400) { w = 2; }
else if (width <= 600) { w = 3; }