Fix PT8000A entry

pull/224/head
Michael Black 2020-04-12 00:15:44 -05:00
commit db6171fa1b
4 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -168,7 +168,7 @@
#define RIG_MODEL_K3S RIG_MAKE_MODEL(RIG_KENWOOD, 43) #define RIG_MODEL_K3S RIG_MAKE_MODEL(RIG_KENWOOD, 43)
#define RIG_MODEL_KX2 RIG_MAKE_MODEL(RIG_KENWOOD, 44) #define RIG_MODEL_KX2 RIG_MAKE_MODEL(RIG_KENWOOD, 44)
#define RIG_MODEL_KX3 RIG_MAKE_MODEL(RIG_KENWOOD, 45) #define RIG_MODEL_KX3 RIG_MAKE_MODEL(RIG_KENWOOD, 45)
#define RIG_MODEL_HILBERLING_PT8000A RIG_MAKE_MODEL(RIG_KENWOOD, 46) #define RIG_MODEL_PT8000A RIG_MAKE_MODEL(RIG_KENWOOD, 46)
/* /*

Wyświetl plik

@ -114,6 +114,7 @@ static const struct kenwood_id_string kenwood_id_string_list[] =
{ RIG_MODEL_TS570S, "018" }, { RIG_MODEL_TS570S, "018" },
{ RIG_MODEL_TS2000, "019" }, { RIG_MODEL_TS2000, "019" },
{ RIG_MODEL_TS480, "020" }, { RIG_MODEL_TS480, "020" },
{ RIG_MODEL_PT8000A,"020" }, // TS480 ID but behaves differently
{ RIG_MODEL_TS590S, "021" }, { RIG_MODEL_TS590S, "021" },
{ RIG_MODEL_TS990S, "022" }, { RIG_MODEL_TS990S, "022" },
{ RIG_MODEL_TS590SG, "023" }, { RIG_MODEL_TS590SG, "023" },
@ -780,11 +781,11 @@ int kenwood_open(RIG *rig)
/* driver mismatch */ /* driver mismatch */
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
"%s: wrong driver selected (%u instead of %d)\n", "%s: wrong driver (%u instead of %d)\n",
__func__, rig->caps->rig_model, __func__, rig->caps->rig_model,
kenwood_id_string_list[i].model); kenwood_id_string_list[i].model);
return -RIG_EINVAL; // we continue to search for other matching IDs/models
} }
rig_debug(RIG_DEBUG_ERR, "%s: your rig (%s) is unknown\n", rig_debug(RIG_DEBUG_ERR, "%s: your rig (%s) is unknown\n",

Wyświetl plik

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include "token.h" #include "token.h"
#define BACKEND_VER "20200406" #define BACKEND_VER "20200411"
#define EOM_KEN ';' #define EOM_KEN ';'
#define EOM_TH '\r' #define EOM_TH '\r'
@ -96,6 +96,7 @@ extern const struct confparams kenwood_cfg_params[];
#define RIG_IS_TS950S (rig->caps->rig_model == RIG_MODEL_TS950S) #define RIG_IS_TS950S (rig->caps->rig_model == RIG_MODEL_TS950S)
#define RIG_IS_TS990S (rig->caps->rig_model == RIG_MODEL_TS990S) #define RIG_IS_TS990S (rig->caps->rig_model == RIG_MODEL_TS990S)
#define RIG_IS_XG3 (rig->caps->rig_model == RIG_MODEL_XG3) #define RIG_IS_XG3 (rig->caps->rig_model == RIG_MODEL_XG3)
#define RIG_IS_PT8000A (rig->caps->rig_model == RIG_MODEL_PT8000A)
struct kenwood_priv_caps struct kenwood_priv_caps
{ {

Wyświetl plik

@ -631,7 +631,11 @@ const struct rig_caps ts480_caps =
*/ */
const struct rig_caps pt8000a_caps = const struct rig_caps pt8000a_caps =
{ {
<<<<<<< HEAD
RIG_MODEL(RIG_MODEL_HILBERLING_PT8000A), RIG_MODEL(RIG_MODEL_HILBERLING_PT8000A),
=======
RIG_MODEL(RIG_MODEL_PT8000A),
>>>>>>> 66525c81f817818424e3b9a7efb2d2cc67069593
.model_name = "PT-8000A", .model_name = "PT-8000A",
.mfg_name = "Hilberling", .mfg_name = "Hilberling",
.version = BACKEND_VER ".0", .version = BACKEND_VER ".0",