kopia lustrzana https://github.com/Hamlib/Hamlib
Fix EK89X set_freq and upgrade to BETA status
Add ISBUSB and ISBLSB modespull/1102/head
rodzic
eea51fe7c7
commit
810da5f54c
|
@ -1285,8 +1285,8 @@ typedef uint64_t rmode_t;
|
||||||
#define RIG_MODE_SPEC CONSTANT_64BIT_FLAG (35) /*!< \c Unfiltered as in PowerSDR */
|
#define RIG_MODE_SPEC CONSTANT_64BIT_FLAG (35) /*!< \c Unfiltered as in PowerSDR */
|
||||||
#define RIG_MODE_CWN CONSTANT_64BIT_FLAG (36) /*!< \c CWN -- Narrow band CW (FT-736R) */
|
#define RIG_MODE_CWN CONSTANT_64BIT_FLAG (36) /*!< \c CWN -- Narrow band CW (FT-736R) */
|
||||||
#define RIG_MODE_IQ CONSTANT_64BIT_FLAG (37) /*!< \c IQ mode for a couple of kit rigs */
|
#define RIG_MODE_IQ CONSTANT_64BIT_FLAG (37) /*!< \c IQ mode for a couple of kit rigs */
|
||||||
#define RIG_MODE_BIT38 CONSTANT_64BIT_FLAG (38) /*!< \c reserved for future expansion */
|
#define RIG_MODE_ISBUSB CONSTANT_64BIT_FLAG (38) /*!< \c ISB mode monitoring USB */
|
||||||
#define RIG_MODE_BIT39 CONSTANT_64BIT_FLAG (39) /*!< \c reserved for future expansion */
|
#define RIG_MODE_ISBLSB CONSTANT_64BIT_FLAG (39) /*!< \c ISB mode monitoring LSB */
|
||||||
#define RIG_MODE_BIT40 CONSTANT_64BIT_FLAG (40) /*!< \c reserved for future expansion */
|
#define RIG_MODE_BIT40 CONSTANT_64BIT_FLAG (40) /*!< \c reserved for future expansion */
|
||||||
#define RIG_MODE_BIT41 CONSTANT_64BIT_FLAG (41) /*!< \c reserved for future expansion */
|
#define RIG_MODE_BIT41 CONSTANT_64BIT_FLAG (41) /*!< \c reserved for future expansion */
|
||||||
#define RIG_MODE_BIT42 CONSTANT_64BIT_FLAG (42) /*!< \c reserved for future expansion */
|
#define RIG_MODE_BIT42 CONSTANT_64BIT_FLAG (42) /*!< \c reserved for future expansion */
|
||||||
|
|
|
@ -104,7 +104,7 @@ ek89x_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
|
||||||
char freqbuf[32];
|
char freqbuf[32];
|
||||||
int retval;
|
int retval;
|
||||||
// cppcheck-suppress *
|
// cppcheck-suppress *
|
||||||
char *fmt = BOM "F%" PRIll ",%" PRIll EOM;
|
char *fmt = BOM "F%" PRIll EOM;
|
||||||
|
|
||||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s,freq=%.0f\n", __func__,
|
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s,freq=%.0f\n", __func__,
|
||||||
rig_strvfo(vfo), freq);
|
rig_strvfo(vfo), freq);
|
||||||
|
@ -165,6 +165,14 @@ ek89x_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|
||||||
smode = "16";
|
smode = "16";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case RIG_MODE_ISBUSB:
|
||||||
|
smode = "17";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RIG_MODE_ISBLSB:
|
||||||
|
smode = "18";
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return -RIG_EINVAL;
|
return -RIG_EINVAL;
|
||||||
}
|
}
|
||||||
|
@ -512,9 +520,9 @@ const struct rig_caps ek89x_caps =
|
||||||
RIG_MODEL(RIG_MODEL_EK89X),
|
RIG_MODEL(RIG_MODEL_EK89X),
|
||||||
.model_name = "EK895/6",
|
.model_name = "EK895/6",
|
||||||
.mfg_name = "Rohde&Schwarz",
|
.mfg_name = "Rohde&Schwarz",
|
||||||
.version = BACKEND_VER ".1",
|
.version = "20220813.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_ALPHA,
|
.status = RIG_STATUS_BETA,
|
||||||
.rig_type = RIG_TYPE_RECEIVER,
|
.rig_type = RIG_TYPE_RECEIVER,
|
||||||
.ptt_type = RIG_PTT_NONE,
|
.ptt_type = RIG_PTT_NONE,
|
||||||
// Need to set RTS on for some reason
|
// Need to set RTS on for some reason
|
||||||
|
|
|
@ -25,9 +25,6 @@
|
||||||
#ifndef _EK89X_H
|
#ifndef _EK89X_H
|
||||||
#define _EK89X_H 1
|
#define _EK89X_H 1
|
||||||
|
|
||||||
#undef BACKEND_VER
|
|
||||||
#define BACKEND_VER "20220728"
|
|
||||||
|
|
||||||
#include <hamlib/rig.h>
|
#include <hamlib/rig.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -496,6 +496,8 @@ static const struct
|
||||||
{ RIG_MODE_SPEC, "SPEC"},
|
{ RIG_MODE_SPEC, "SPEC"},
|
||||||
{ RIG_MODE_CWN, "CWN"},
|
{ RIG_MODE_CWN, "CWN"},
|
||||||
{ RIG_MODE_IQ, "IQ"},
|
{ RIG_MODE_IQ, "IQ"},
|
||||||
|
{ RIG_MODE_ISBUSB, "ISBUSB"},
|
||||||
|
{ RIG_MODE_ISBLSB, "ISBLSB"},
|
||||||
{ RIG_MODE_NONE, "" },
|
{ RIG_MODE_NONE, "" },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue