Fix missing PKTUSB mode setting code for FT-817 & FT-897

Also made setting WFM an error on the FT-817/857/897 since they all do
it automatically and only on Band II.
libusb-1-0
Bill Somerville 2015-12-15 15:57:43 +00:00
rodzic d438b73b8e
commit ffa60fe0e3
3 zmienionych plików z 8 dodań i 14 usunięć

Wyświetl plik

@ -806,19 +806,15 @@ int ft817_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break;
case RIG_MODE_RTTY:
index = FT817_NATIVE_CAT_SET_MODE_DIG;
break;
case RIG_MODE_PKTUSB:
/* user has to have correct DIG mode setup on rig */
index = FT817_NATIVE_CAT_SET_MODE_DIG;
break;
case RIG_MODE_FM:
index = FT817_NATIVE_CAT_SET_MODE_FM;
break;
case RIG_MODE_WFM:
/* can not be set, it is implicit when changing band */
// index = FT817_NATIVE_CAT_SET_MODE_FM;
return -RIG_EINVAL;
break;
case RIG_MODE_CWR:
index = FT817_NATIVE_CAT_SET_MODE_CWR;
break;

Wyświetl plik

@ -737,9 +737,8 @@ int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
index = FT857_NATIVE_CAT_SET_MODE_LSB;
break;
case RIG_MODE_RTTY:
index = FT857_NATIVE_CAT_SET_MODE_DIG;
break;
case RIG_MODE_PKTUSB:
/* user has to have correct DIG mode setup on rig */
index = FT857_NATIVE_CAT_SET_MODE_DIG;
break;
case RIG_MODE_FM:

Wyświetl plik

@ -780,15 +780,14 @@ int ft897_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
case RIG_MODE_LSB:
index = FT897_NATIVE_CAT_SET_MODE_LSB;
break;
case RIG_MODE_RTTY:
case RIG_MODE_RTTY:
case RIG_MODE_PKTUSB:
/* user has to have correct DIG mode setup on rig */
index = FT897_NATIVE_CAT_SET_MODE_DIG;
break;
case RIG_MODE_FM:
index = FT897_NATIVE_CAT_SET_MODE_FM;
break;
case RIG_MODE_WFM:
index = FT897_NATIVE_CAT_SET_MODE_FM;
break;
case RIG_MODE_CWR:
index = FT897_NATIVE_CAT_SET_MODE_CWR;
break;