Merge branch 'master' of https://github.com/denzs/Hamlib into denzs-master

include/hamlib/riglist.h

@@ -154,6 +154,7 @@
 #define RIG_MODEL_TS990S RIG_MAKE_MODEL(RIG_KENWOOD, 39)
 #define RIG_MODEL_HPSDR RIG_MAKE_MODEL(RIG_KENWOOD, 40) /* OpenHPSDR, PiHPSDR */
 #define RIG_MODEL_TS890S RIG_MAKE_MODEL(RIG_KENWOOD, 41)
+#define RIG_MODEL_THD74 RIG_MAKE_MODEL(RIG_KENWOOD, 42)
 
 
 /*

kenwood/Makefile.am

@@ -6,7 +6,7 @@ TSSRC = ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 
 IC10SRC = ts440.c ts940.c ts711.c ts811.c r5000.c
 
-THSRC = thd7.c thf7.c thg71.c tmd700.c tmv7.c thf6a.c thd72.c tmd710.c
+THSRC = thd7.c thf7.c thg71.c tmd700.c tmv7.c thf6a.c thd72.c tmd710.c thd74.c
 
 KENWOODSRC = kenwood.c kenwood.h th.c th.h ic10.c ic10.h elecraft.c elecraft.h \
 	transfox.c flex.c flex.h

kenwood/kenwood.c

@@ -115,6 +115,7 @@ static const struct kenwood_id_string kenwood_id_string_list[] = {
   { RIG_MODEL_TMD700, "TM-D700" },
   { RIG_MODEL_TMD710, "TM-D710" },
   { RIG_MODEL_THD72A, "TH-D72" },
+  { RIG_MODEL_THD74, "TH-D74" },
   { RIG_MODEL_TMV7, "TM-V7" },
   { RIG_MODEL_TMV71,  "TM-V71" },
   { RIG_MODEL_THF6A,  "TH-F6" },
@@ -2733,14 +2734,17 @@ int kenwood_set_trn(RIG *rig, int trn)
   if (!rig)
     return -RIG_EINVAL;
 
-  if (RIG_MODEL_TS990S == rig->caps->rig_model)
-    {
-      return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI2" : "AI0", NULL, 0);
-    }
-  else
-    {
-      return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI1" : "AI0", NULL, 0);
-    }
+  switch (rig->caps->rig_model) {
+  	case RIG_MODEL_TS990S:
+      		return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI2" : "AI0", NULL, 0);
+		break;
+	case RIG_MODEL_THD74:
+		  return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", NULL, 4);
+		  break;
+	default:
+		  return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI1" : "AI0", NULL, 0);
+		  break;
+	  }
 }
 
 /*
@@ -2765,11 +2769,17 @@ int kenwood_get_trn(RIG *rig, int *trn)
   char trnbuf[6];
   int retval;
 
-  retval = kenwood_safe_transaction(rig, "AI", trnbuf, 6, 3);
+  if (rig->caps->rig_model == RIG_MODEL_THD74)
+  	retval = kenwood_safe_transaction(rig, "AI", trnbuf, 6, 4);
+  else
+	retval = kenwood_safe_transaction(rig, "AI", trnbuf, 6, 3);
   if (retval != RIG_OK)
     return retval;
 
-  *trn = trnbuf[2] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
+  if (rig->caps->rig_model == RIG_MODEL_THD74)
+    *trn = trnbuf[3] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
+  else
+    *trn = trnbuf[2] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF;
 
   return RIG_OK;
 }
@@ -3487,6 +3497,7 @@ DECLARE_INITRIG_BACKEND(kenwood)
   rig_register(&tmd700_caps);
   rig_register(&thd7a_caps);
   rig_register(&thd72a_caps);
+  rig_register(&thd74_caps);
   rig_register(&thf7e_caps);
   rig_register(&thg71_caps);
   rig_register(&tmv7_caps);

kenwood/kenwood.h

@@ -181,6 +181,7 @@ extern const struct rig_caps trc80_caps;
 
 extern const struct rig_caps thd7a_caps;
 extern const struct rig_caps thd72a_caps;
+extern const struct rig_caps thd74_caps;
 extern const struct rig_caps tmd700_caps;
 extern const struct rig_caps thf7a_caps;
 extern const struct rig_caps thf7e_caps;

kenwood/th.c

@@ -374,8 +374,8 @@ th_set_vfo(RIG *rig, vfo_t vfo)
 				return retval;
 	}
 
-	/* No "VMC" cmd on THD72A */
-	if (rig->caps->rig_model == RIG_MODEL_THD72A)
+	/* No "VMC" cmd on THD72A/THD74 */
+	if (rig->caps->rig_model == RIG_MODEL_THD72A || rig->caps->rig_model == RIG_MODEL_THD74)
         	return RIG_OK;
 
 	/* set vfo */
@@ -449,8 +449,8 @@ th_get_vfo_char(RIG *rig, vfo_t *vfo, char *vfoch)
 
 	}
 
-    /* No "VMC" on THD72A */
-    if (rig->caps->rig_model == RIG_MODEL_THD72A) {
+    /* No "VMC" on THD72A/THD74 */
+    if (rig->caps->rig_model == RIG_MODEL_THD72A || rig->caps->rig_model == RIG_MODEL_THD74) {
         *vfoch = '0'; /* FIXME: fake */
 
         return RIG_OK;