Merge cf91e96333 into dce80d264a

rigs/dummy/flrig.c

@@ -143,7 +143,7 @@ struct rig_caps flrig_caps =
     RIG_MODEL(RIG_MODEL_FLRIG),
     .model_name = "",
     .mfg_name = "FLRig",
-    .version = "20240325.0",
+    .version = "20240418.0",
     .copyright = "LGPL",
     .status = RIG_STATUS_STABLE,
     .rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1305,6 +1305,8 @@ static int flrig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     retval = flrig_transaction(rig, cmd, cmd_arg, NULL, 0);
 
+    hl_usleep(100*1000); // FLRig needs a moment to update the active VFO
+
     if (retval != RIG_OK)
     {
         RETURNFUNC2(retval);

rigs/dummy/netrigctl.c

@@ -2790,6 +2790,8 @@ int netrigctl_get_lock_mode(RIG *rig, int *lock)
     char cmdbuf[256];
     char buf[BUF_MAX];
     int ret;
+    hamlib_port_t *rp = RIGPORT(rig);
+
     SNPRINTF(cmdbuf, sizeof(cmdbuf), "\\get_lock_mode\n");
     ret = netrigctl_transaction(rig, cmdbuf, strlen(cmdbuf), buf);
 
@@ -2799,6 +2801,7 @@ int netrigctl_get_lock_mode(RIG *rig, int *lock)
     }
 
     sscanf(buf, "%d", lock);
+    ret = read_string(rp, (unsigned char *) buf, BUF_MAX, "\n", 1, 0, 1);
     return (RIG_OK);
 }
 
@@ -2819,7 +2822,7 @@ struct rig_caps netrigctl_caps =
     RIG_MODEL(RIG_MODEL_NETRIGCTL),
     .model_name =     "NET rigctl",
     .mfg_name =       "Hamlib",
-    .version =        "20240304.0",
+    .version =        "20240418.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_OTHER,

rigs/icom/icom.c

@@ -2223,6 +2223,9 @@ static int icom_set_mode_without_data(RIG *rig, vfo_t vfo, rmode_t mode,
             || RIG_IS_IC375
             || RIG_IS_IC726
             || RIG_IS_IC475
+            || RIG_IS_IC756
+            || RIG_IS_IC756PROII
+            || RIG_IS_IC756PROIII
             || RIG_IS_IC910
             || RIG_IS_IC7000)
     {
@@ -2668,6 +2671,8 @@ static int icom_get_mode_without_data(RIG *rig, vfo_t vfo, rmode_t *mode,
             (RIG_IS_IC706MKII) ||
             (RIG_IS_IC706MKIIG) ||
             (RIG_IS_IC756) ||
+            (RIG_IS_IC756PROII) ||
+            (RIG_IS_IC756PROIII) ||
             (RIG_IS_ICR30))
     {
         RETURNFUNC2(RIG_OK);

rigs/icom/icom.h

@@ -35,7 +35,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20240303"
+#define BACKEND_VER "20240415"
 
 #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31)
 #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)

tests/rigmatrix.c

@@ -37,7 +37,7 @@ static setting_t bitmap_func, bitmap_level, bitmap_parm;
 int create_png_range(const freq_range_t rx_range_list[],
                      const freq_range_t tx_range_list[], int num);
 
-int print_caps_sum(const struct rig_caps *caps, void *data)
+int print_caps_sum(struct rig_caps *caps, void *data)
 {
 
     printf("<TR><TD><A HREF=\"support/model%u.txt\">%s</A></TD><TD>%s</TD>"
@@ -111,7 +111,7 @@ int print_caps_sum(const struct rig_caps *caps, void *data)
 /*
  * IO params et al.
  */
-int print_caps_parameters(const struct rig_caps *caps, void *data)
+int print_caps_parameters(struct rig_caps *caps, void *data)
 {
     printf("<A NAME=\"parms%u\"><TR><TD>%s</TD><TD>",
            caps->rig_model,
@@ -222,7 +222,7 @@ int print_caps_parameters(const struct rig_caps *caps, void *data)
  *
  * TODO: add new API calls!
  */
-int print_caps_caps(const struct rig_caps *caps, void *data)
+int print_caps_caps(struct rig_caps *caps, void *data)
 {
     printf("<A NAME=\"caps%u\"><TR><TD>%s</TD>",
            caps->rig_model,
@@ -270,7 +270,7 @@ int print_caps_caps(const struct rig_caps *caps, void *data)
 /*
  * Get/Set parm abilities
  */
-int print_caps_parm(const struct rig_caps *caps, void *data)
+int print_caps_parm(struct rig_caps *caps, void *data)
 {
     setting_t parm;
     int i;
@@ -307,7 +307,7 @@ int print_caps_parm(const struct rig_caps *caps, void *data)
 /*
  * Get/Set level abilities
  */
-int print_caps_level(const struct rig_caps *caps, void *data)
+int print_caps_level(struct rig_caps *caps, void *data)
 {
     setting_t level;
     int i;
@@ -344,7 +344,7 @@ int print_caps_level(const struct rig_caps *caps, void *data)
 /*
  * Get/Set func abilities
  */
-int print_caps_func(const struct rig_caps *caps, void *data)
+int print_caps_func(struct rig_caps *caps, void *data)
 {
     setting_t func;
     int i;
@@ -383,7 +383,7 @@ int print_caps_func(const struct rig_caps *caps, void *data)
  *
  * FIXME: default output pics is for region2: add region 1 too!
  */
-int print_caps_range(const struct rig_caps *caps, void *data)
+int print_caps_range(struct rig_caps *caps, void *data)
 {
     create_png_range(caps->rx_range_list2, caps->tx_range_list2,
                      caps->rig_model);