diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 03d39c8c7..505bc94f2 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -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_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_BIT38 CONSTANT_64BIT_FLAG (38) /*!< \c reserved for future expansion */ -#define RIG_MODE_BIT39 CONSTANT_64BIT_FLAG (39) /*!< \c reserved for future expansion */ +#define RIG_MODE_ISBUSB CONSTANT_64BIT_FLAG (38) /*!< \c ISB mode monitoring USB */ +#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_BIT41 CONSTANT_64BIT_FLAG (41) /*!< \c reserved for future expansion */ #define RIG_MODE_BIT42 CONSTANT_64BIT_FLAG (42) /*!< \c reserved for future expansion */ diff --git a/rigs/rs/ek89x.c b/rigs/rs/ek89x.c index 6de8d4cb7..83fdebe78 100644 --- a/rigs/rs/ek89x.c +++ b/rigs/rs/ek89x.c @@ -104,7 +104,7 @@ ek89x_set_freq(RIG *rig, vfo_t vfo, freq_t freq) char freqbuf[32]; int retval; // 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_strvfo(vfo), freq); @@ -165,6 +165,14 @@ ek89x_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) smode = "16"; break; + case RIG_MODE_ISBUSB: + smode = "17"; + break; + + case RIG_MODE_ISBLSB: + smode = "18"; + break; + default: return -RIG_EINVAL; } @@ -512,9 +520,9 @@ const struct rig_caps ek89x_caps = RIG_MODEL(RIG_MODEL_EK89X), .model_name = "EK895/6", .mfg_name = "Rohde&Schwarz", - .version = BACKEND_VER ".1", + .version = "20220813.0", .copyright = "LGPL", - .status = RIG_STATUS_ALPHA, + .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_RECEIVER, .ptt_type = RIG_PTT_NONE, // Need to set RTS on for some reason @@ -522,7 +530,7 @@ const struct rig_caps ek89x_caps = .dcd_type = RIG_DCD_NONE, .port_type = RIG_PORT_SERIAL, .serial_rate_min = 9600, - .serial_rate_max = 38400, + .serial_rate_max = 38400, .serial_data_bits = 7, .serial_stop_bits = 1, .serial_parity = RIG_PARITY_ODD, diff --git a/rigs/rs/ek89x.h b/rigs/rs/ek89x.h index a4e2ce469..58c86d3fe 100644 --- a/rigs/rs/ek89x.h +++ b/rigs/rs/ek89x.h @@ -25,9 +25,6 @@ #ifndef _EK89X_H #define _EK89X_H 1 -#undef BACKEND_VER -#define BACKEND_VER "20220728" - #include diff --git a/src/misc.c b/src/misc.c index 1bb82951d..68d43e507 100644 --- a/src/misc.c +++ b/src/misc.c @@ -496,6 +496,8 @@ static const struct { RIG_MODE_SPEC, "SPEC"}, { RIG_MODE_CWN, "CWN"}, { RIG_MODE_IQ, "IQ"}, + { RIG_MODE_ISBUSB, "ISBUSB"}, + { RIG_MODE_ISBLSB, "ISBLSB"}, { RIG_MODE_NONE, "" }, };