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

Future proof newcat.c LEVEL_SWR due to 6-byte FTDX101D response

pull/412/head
Michael Black W9MDB 2020-10-05 10:11:32 -05:00
rodzic 0e44e2f317
commit 8492bbccd1
2 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -3420,13 +3420,9 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break; break;
case RIG_LEVEL_SWR: case RIG_LEVEL_SWR:
if (is_ft101) // some rigs like ft101dx have 6 byte return so we just truncate
{ retlvl[3] = 0;
retlvl[3]=0; if (rig->caps->swr_cal.size == 0)
rig_debug(RIG_DEBUG_TRACE, "%s: retlvl=%s\n", __func__, retlvl);
val->f = rig_raw2val_float(atoi(retlvl), &yaesu_ftdx101d_swr_cal);
}
else if (rig->caps->swr_cal.size == 0)
{ {
val->f = rig_raw2val_float(atoi(retlvl), &yaesu_default_swr_cal); val->f = rig_raw2val_float(atoi(retlvl), &yaesu_default_swr_cal);
} }
@ -5321,6 +5317,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_RTTYR: case RIG_MODE_RTTYR:
case RIG_MODE_CW: case RIG_MODE_CW:
case RIG_MODE_CWR: case RIG_MODE_CWR:
if (width <= 500)
switch (width) switch (width)
{ {
case 1700: snprintf(width_str, sizeof(width_str), "11"); narrow = '0'; case 1700: snprintf(width_str, sizeof(width_str), "11"); narrow = '0';

2
rigs/yaesu/newcat.h
Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "20201004" #define NEWCAT_VER "20201005"
/* Hopefully large enough for future use, 128 chars plus '\0' */ /* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129 #define NEWCAT_DATA_LEN 129