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

Patch from Ken Prox, "Added new filters included in the latest Jupiter 

firmware.  Fixed array over run in function tt538_filter_number."



git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2732 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.10
Nate Bargmann, N0NB 2009-09-27 12:02:28 +00:00
rodzic c10e0df19c
commit ff37dda7b1
1 zmienionych plików z 19 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
tentec/jupiter.c
Wyświetl plik

@ -98,7 +98,7 @@ const struct rig_caps tt538_caps = {
.rig_model = RIG_MODEL_TT538,
.model_name = "TT-538 Jupiter",
.mfg_name = "Ten-Tec",
.version = "0.3",
.version = "0.4",
.copyright = "LGPL",
.status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -199,9 +199,13 @@ const struct rig_caps tt538_caps = {
static int tt538_rxFilter[] = {
8000, 6000, 5700, 5400, 5100, 4800, 4500, 4200, 3900, 3600, 3300,
3000, 2850, 2700, 2550, 2400, 2250, 2100, 1950, 1800, 1650, 1500,
1350, 1200, 1050, 900, 750, 675, 600, 525, 450, 375, 330, 300
1350, 1200, 1050, 900, 750, 675, 600, 525, 450, 375, 330,
300, 260, 225, 180, 165, 150
};
#define JUPITER_TT538_RXFILTERS ( sizeof(tt538_rxFilter) / sizeof(tt538_rxFilter[0]) )
/*
* Function definitions below
*/
@ -482,6 +486,11 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
case 31: *width = 375; break;
case 32: *width = 330; break;
case 33: *width = 300; break;
case 34: *width = 260; break;
case 35: *width = 225; break;
case 36: *width = 180; break;
case 37: *width = 165; break;
case 38: *width = 150; break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unexpected bandwidth '%c'\n",
__FUNCTION__, respbuf[1]);
@ -494,12 +503,15 @@ int tt538_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
/* Find rx filter index of bandwidth the same or larger as requested. */
static int tt538_filter_number(int width)
{
int i;
int i;
for (i = 34; i >= 0; i--)
if (width <= tt538_rxFilter[i])
return i;
return 0; /* Widest filter, 8 kHz. */
for (i = JUPITER_TT538_RXFILTERS - 1; i >= 0; i--) {
if (width <= tt538_rxFilter[i]) {
return i;
}
}
return 0; /* Widest filter, 8 kHz. */
}