kopia lustrzana https://github.com/Hamlib/Hamlib
update
Malcolm Herring
rodzic
8decf6fd89
commit
c82896fe80
14
icom/frame.c
14
icom/frame.c
|
|
@ -326,7 +326,7 @@ int rig2icom_mode(RIG *rig, rmode_t mode, pbwidth_t width,
|
|||
|
||||
switch (mode) {
|
||||
case RIG_MODE_AM: icmode = S_AM; break;
|
||||
case RIG_MODE_AM_N: icmode = S_AM_N; break;
|
||||
case RIG_MODE_AMN: icmode = S_AMN; break;
|
||||
case RIG_MODE_AMS: icmode = S_AMS; break;
|
||||
case RIG_MODE_CW: icmode = S_CW; break;
|
||||
case RIG_MODE_CWR: icmode = S_CWR; break;
|
||||
|
|
@ -335,7 +335,7 @@ int rig2icom_mode(RIG *rig, rmode_t mode, pbwidth_t width,
|
|||
case RIG_MODE_RTTY: icmode = S_RTTY; break;
|
||||
case RIG_MODE_RTTYR: icmode = S_RTTYR; break;
|
||||
case RIG_MODE_FM: icmode = S_FM; break;
|
||||
case RIG_MODE_FM_N: icmode = S_FM_N; break;
|
||||
case RIG_MODE_FMN: icmode = S_FMN; break;
|
||||
case RIG_MODE_WFM: icmode = S_WFM; break;
|
||||
case RIG_MODE_P25: icmode = S_P25; break;
|
||||
case RIG_MODE_DSTAR: icmode = S_DSTAR; break;
|
||||
|
|
@ -381,7 +381,7 @@ void icom2rig_mode(RIG *rig, unsigned char md, int pd, rmode_t *mode, pbwidth_t
|
|||
|
||||
switch (md) {
|
||||
case S_AM: if (rig->caps->rig_model == RIG_MODEL_ICR30 && pd == 0x02) {
|
||||
*mode = RIG_MODE_AM_N;
|
||||
*mode = RIG_MODE_AMN;
|
||||
} else {
|
||||
*mode = RIG_MODE_AM;
|
||||
} break;
|
||||
|
|
@ -394,7 +394,7 @@ void icom2rig_mode(RIG *rig, unsigned char md, int pd, rmode_t *mode, pbwidth_t
|
|||
*width = rig_passband_normal(rig, RIG_MODE_USB);
|
||||
return;
|
||||
} else if (rig->caps->rig_model == RIG_MODEL_ICR30 && pd == 0x02) {
|
||||
*mode = RIG_MODE_FM_N;
|
||||
*mode = RIG_MODE_FMN;
|
||||
} else {
|
||||
*mode = RIG_MODE_FM;
|
||||
} break;
|
||||
|
|
@ -405,6 +405,12 @@ void icom2rig_mode(RIG *rig, unsigned char md, int pd, rmode_t *mode, pbwidth_t
|
|||
case S_RTTYR: *mode = RIG_MODE_RTTYR; break;
|
||||
case S_PSK: *mode = RIG_MODE_PKTUSB; break; /* IC-7800 */
|
||||
case S_PSKR: *mode = RIG_MODE_PKTLSB; break;
|
||||
case S_DSTAR: *mode = RIG_MODE_DSTAR; break;
|
||||
case S_P25: *mode = RIG_MODE_P25; break;
|
||||
case S_DPMR: *mode = RIG_MODE_DPMR; break;
|
||||
case S_NXDNVN: *mode = RIG_MODE_NXDNVN; break;
|
||||
case S_NXDN_N: *mode = RIG_MODE_NXDN_N; break;
|
||||
case S_DCR: *mode = RIG_MODE_DCR; break;
|
||||
case 0xff: *mode = RIG_MODE_NONE; break; /* blank mem channel */
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@
|
|||
#define S_LSB 0x00 /* Set to LSB */
|
||||
#define S_USB 0x01 /* Set to USB */
|
||||
#define S_AM 0x02 /* Set to AM */
|
||||
#define S_AM_N 0x02 /* Set to AM-N */
|
||||
#define S_AMN 0x02 /* Set to AM-N */
|
||||
#define S_CW 0x03 /* Set to CW */
|
||||
#define S_RTTY 0x04 /* Set to RTTY */
|
||||
#define S_FM 0x05 /* Set to FM */
|
||||
#define S_FM_N 0x05 /* Set to FM-N */
|
||||
#define S_FMN 0x05 /* Set to FM-N */
|
||||
#define S_WFM 0x06 /* Set to Wide FM */
|
||||
#define S_CWR 0x07 /* Set to CW Reverse */
|
||||
#define S_RTTYR 0x08 /* Set to RTTY Reverse */
|
||||
|
|
|
|||
16
icom/icr30.c
16
icom/icr30.c
|
|
@ -31,7 +31,7 @@
|
|||
#include "icom_defs.h"
|
||||
#include "frame.h"
|
||||
|
||||
#define ICR30_MODES (RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_AM|RIG_MODE_AM_N|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_RTTY|RIG_MODE_FM|RIG_MODE_FM_N|RIG_MODE_WFM|\
|
||||
#define ICR30_MODES (RIG_MODE_LSB|RIG_MODE_USB|RIG_MODE_AM|RIG_MODE_AMN|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_RTTY|RIG_MODE_FM|RIG_MODE_FMN|RIG_MODE_WFM|\
|
||||
RIG_MODE_RTTYR|RIG_MODE_SAM|RIG_MODE_SAL|RIG_MODE_SAH|RIG_MODE_P25|RIG_MODE_DSTAR|RIG_MODE_DPMR|RIG_MODE_NXDNVN|RIG_MODE_NXDN_N|RIG_MODE_DCR)
|
||||
|
||||
#define ICR30_FUNC_ALL (RIG_FUNC_TSQL|RIG_FUNC_VSC)
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#define ICR30_VFO_ALL (RIG_VFO_A)
|
||||
|
||||
#define ICR30_VFO_OPS (RIG_OP_NONE)
|
||||
#define ICR30_VFO_OPS (RIG_VFO_MAIN|RIG_VFO_SUB)
|
||||
#define ICR30_SCAN_OPS (RIG_SCAN_NONE)
|
||||
|
||||
#define ICR30_STR_CAL { 2, \
|
||||
|
|
@ -72,7 +72,7 @@ static int icr30_r2i_mode(RIG *rig, rmode_t mode, pbwidth_t width,
|
|||
*/
|
||||
|
||||
int icr30_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) {
|
||||
if (mode & (RIG_MODE_AM_N | RIG_MODE_FM_N)) {
|
||||
if (mode & (RIG_MODE_AMN | RIG_MODE_FMN)) {
|
||||
return icom_set_mode(rig, vfo, mode, (pbwidth_t)1);
|
||||
} else {
|
||||
return icom_set_mode(rig, vfo, mode, width);
|
||||
|
|
@ -118,8 +118,8 @@ const struct rig_caps icr30_caps = {
|
|||
[LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
|
||||
},
|
||||
.parm_gran = {},
|
||||
.ctcss_list = NULL,
|
||||
.dcs_list = NULL,
|
||||
.ctcss_list = common_ctcss_list,
|
||||
.dcs_list = common_dcs_list,
|
||||
.preamp = { RIG_DBLST_END, },
|
||||
.attenuator = { RIG_DBLST_END, },
|
||||
.max_rit = Hz(0),
|
||||
|
|
@ -171,8 +171,8 @@ const struct rig_caps icr30_caps = {
|
|||
/* mode/filter list, remember: order matters! */
|
||||
.filters = {
|
||||
{RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_USB|RIG_MODE_LSB, kHz(1.8)},
|
||||
{RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_AM_N|RIG_MODE_FM_N, kHz(12)},
|
||||
{RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_AM_N|RIG_MODE_FM_N, kHz(6)},
|
||||
{RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_AMN|RIG_MODE_FMN, kHz(12)},
|
||||
{RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_AMN|RIG_MODE_FMN, kHz(6)},
|
||||
{RIG_MODE_WFM, kHz(150)},
|
||||
RIG_FLT_END,
|
||||
},
|
||||
|
|
@ -192,6 +192,8 @@ const struct rig_caps icr30_caps = {
|
|||
.get_freq = icom_get_freq,
|
||||
.set_mode = icr30_set_mode,
|
||||
.get_mode = icom_get_mode,
|
||||
.vfo_op = icom_vfo_op,
|
||||
.set_vfo = icom_set_vfo,
|
||||
.set_ant = icom_set_ant,
|
||||
.get_ant = icom_get_ant,
|
||||
.set_bank = icom_set_bank,
|
||||
|
|
|
|||
|
|
@ -878,43 +878,6 @@ typedef uint64_t setting_t;
|
|||
* \sa rig_parse_mode(), rig_strrmode()
|
||||
* TODO: Add new 8600 modes to rig2icom_mode() and icom2rig_mode() in frame.c
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
typedef enum {
|
||||
RIG_MODE_NONE = 0, /*!< '' -- None */
|
||||
RIG_MODE_AM = (1 << 0), /*!< \c AM -- Amplitude Modulation */
|
||||
RIG_MODE_CW = (1 << 1), /*!< \c CW -- CW "normal" sideband */
|
||||
RIG_MODE_USB = (1 << 2), /*!< \c USB -- Upper Side Band */
|
||||
RIG_MODE_LSB = (1 << 3), /*!< \c LSB -- Lower Side Band */
|
||||
RIG_MODE_RTTY = (1 << 4), /*!< \c RTTY -- Radio Teletype */
|
||||
RIG_MODE_FM = (1 << 5), /*!< \c FM -- "narrow" band FM */
|
||||
RIG_MODE_WFM = (1 << 6), /*!< \c WFM -- broadcast wide FM */
|
||||
RIG_MODE_CWR = (1 << 7), /*!< \c CWR -- CW "reverse" sideband */
|
||||
RIG_MODE_RTTYR = (1 << 8), /*!< \c RTTYR -- RTTY "reverse" sideband */
|
||||
RIG_MODE_AMS = (1 << 9), /*!< \c AMS -- Amplitude Modulation Synchronous */
|
||||
RIG_MODE_PKTLSB = (1 << 10), /*!< \c PKTLSB -- Packet/Digital LSB mode (dedicated port) */
|
||||
RIG_MODE_PKTUSB = (1 << 11), /*!< \c PKTUSB -- Packet/Digital USB mode (dedicated port) */
|
||||
RIG_MODE_PKTFM = (1 << 12), /*!< \c PKTFM -- Packet/Digital FM mode (dedicated port) */
|
||||
RIG_MODE_ECSSUSB = (1 << 13), /*!< \c ECSSUSB -- Exalted Carrier Single Sideband USB */
|
||||
RIG_MODE_ECSSLSB = (1 << 14), /*!< \c ECSSLSB -- Exalted Carrier Single Sideband LSB */
|
||||
RIG_MODE_FAX = (1 << 15), /*!< \c FAX -- Facsimile Mode */
|
||||
RIG_MODE_SAM = (1 << 16), /*!< \c SAM -- Synchronous AM double sideband */
|
||||
RIG_MODE_SAL = (1 << 17), /*!< \c SAL -- Synchronous AM lower sideband */
|
||||
RIG_MODE_SAH = (1 << 18), /*!< \c SAH -- Synchronous AM upper (higher) sideband */
|
||||
RIG_MODE_DSB = (1 << 19), /*!< \c DSB -- Double sideband suppressed carrier */
|
||||
RIG_MODE_FMN = (1 << 21), /*!< \c FMN -- FM Narrow Kenwood ts990s */
|
||||
RIG_MODE_PKTAM = (1 << 22), /*!< \c PKTAM -- Packet/Digital AM mode e.g. IC7300 */
|
||||
RIG_MODE_P25 = (1 << 23), /*!< \c P25 -- APCO/P25 VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_DSTAR = (1 << 24), /*!< \c D-Star -- VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_DPMR = (1 << 25), /*!< \c dPMR -- digital PMR, VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_NXDNVN = (1 << 26), /*!< \c NXDN-VN -- VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_NXDN_N = (1 << 27), /*!< \c NXDN-N -- VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_DCR = (1 << 28), /*!< \c DCR -- VHF,UHF digital mode IC-R8600 */
|
||||
RIG_MODE_AM_N = (1 << 29), /*!< \c AM-N -- Narrow band AM mode IC-R30 */
|
||||
RIG_MODE_FM_N = (1 << 30), /*!< \c FM-N -- Narrow band FM mode IC-R30 */
|
||||
RIG_MODE_TESTS_MAX /*!< \c MUST ALWAYS BE LAST, Max Count for dumpcaps.c */
|
||||
} rmode_t;
|
||||
|
||||
=======
|
||||
#define ULL (uint64_t)
|
||||
typedef uint64_t rmode_t;
|
||||
|
||||
|
|
@ -982,7 +945,6 @@ typedef uint64_t rmode_t;
|
|||
#define RIG_MODE_BIT61 (1ULL << 61) /* reserved for future expansion */
|
||||
#define RIG_MODE_BIT62 (1ULL << 62) /* reserved for future expansion */
|
||||
#define RIG_MODE_TESTS_MAX (1ULL << 63) /*!< \c last bit available for 64-bit enum MUST ALWAYS BE LAST, Max Count for dumpcaps.c */
|
||||
>>>>>>> master
|
||||
|
||||
/**
|
||||
* \brief macro for backends, not to be used by rig_set_mode et al.
|
||||
|
|
|
|||
|
|
@ -319,11 +319,6 @@ static struct
|
|||
{ RIG_MODE_LSB, "LSB" },
|
||||
{ RIG_MODE_RTTY, "RTTY" },
|
||||
{ RIG_MODE_FM, "FM" },
|
||||
<<<<<<< HEAD
|
||||
{ RIG_MODE_FMN, "FMN" },
|
||||
{ RIG_MODE_FM_N, "FM-N" },
|
||||
=======
|
||||
>>>>>>> master
|
||||
{ RIG_MODE_WFM, "WFM" },
|
||||
{ RIG_MODE_CWR, "CWR" },
|
||||
{ RIG_MODE_RTTYR, "RTTYR" },
|
||||
|
|
@ -338,12 +333,8 @@ static struct
|
|||
{ RIG_MODE_SAL, "SAL" },
|
||||
{ RIG_MODE_SAH, "SAH" },
|
||||
{ RIG_MODE_DSB, "DSB"},
|
||||
<<<<<<< HEAD
|
||||
{ RIG_MODE_AM_N, "AM-N"},
|
||||
=======
|
||||
{ RIG_MODE_FMN, "FMN" },
|
||||
{ RIG_MODE_PKTAM, "PKTAM"},
|
||||
>>>>>>> master
|
||||
{ RIG_MODE_P25, "P25"},
|
||||
{ RIG_MODE_DSTAR, "D-STAR"},
|
||||
{ RIG_MODE_DPMR, "DPMR"},
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue