Change a few Yaesu rigs to use slider-compatible width settings

https://github.com/Hamlib/Hamlib/issues/391

rigs/yaesu/ft100.c

@@ -175,7 +175,7 @@ const struct rig_caps ft100_caps =
     RIG_MODEL(RIG_MODEL_FT100),
     .model_name =     "FT-100",
     .mfg_name =       "Yaesu",
-    .version =        "20200323.0",
+    .version =        "20201009.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -595,27 +595,10 @@ int ft100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
             width = rig_passband_normal(rig, mode);
         }
 
-        switch (width)
+        if (width <= 300) { p_cmd[3] = 0x03; }
-        {
+        else if (width <= 500) { p_cmd[3] = 0x02; }
-        case 2400:
+        else if (width <= 2400) { p_cmd[3] = 0x00; }
-            p_cmd[3] = 0x00;
+        else { p_cmd[3] = 0x01; }
-            break;
-
-        case 6000:
-            p_cmd[3] = 0x01;
-            break;
-
-        case 500:
-            p_cmd[3] = 0x02;
-            break;
-
-        case 300:
-            p_cmd[3] = 0x03;
-            break;
-
-        default:
-            return -RIG_EINVAL;
-        };
 
         ret = write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 

rigs/yaesu/ft1000d.c

@@ -158,7 +158,7 @@ const struct rig_caps ft1000d_caps =
     RIG_MODEL(RIG_MODEL_FT1000D),
     .model_name =         "FT-1000D",
     .mfg_name =           "Yaesu",
-    .version =            "20200323.0",
+    .version =            "20201009.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_STABLE,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -1930,27 +1930,10 @@ int ft1000d_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         return RIG_OK;
     }
 
-    switch (width)
+    if (width <= 250) { bw = FT1000D_BW_F250; }
-    {
+    else if (width <= 500) { bw = FT1000D_BW_F500; }
-    case 250:
+    else if (width <= 2000) { bw = FT1000D_BW_F2000; }
-        bw = FT1000D_BW_F250;
+    else { bw = FT1000D_BW_F2400; }
-        break;
-
-    case 500:
-        bw = FT1000D_BW_F500;
-        break;
-
-    case 2000:
-        bw = FT1000D_BW_F2000;
-        break;
-
-    case 2400:
-        bw = FT1000D_BW_F2400;
-        break;
-
-    default:
-        return -RIG_EINVAL;
-    }
 
     rig_debug(RIG_DEBUG_TRACE, "%s: set bw = 0x%02x\n", __func__, bw);
 
@@ -3786,27 +3769,10 @@ int ft1000d_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode,
         return RIG_OK;
     }
 
-    switch (tx_width)
+    if (tx_width <= 250) { bw = FT1000D_BW_F250; }
-    {
+    else if (tx_width <= 500) { bw = FT1000D_BW_F500; }
-    case 250:
+    else if (tx_width <= 2000) { bw = FT1000D_BW_F2000; }
-        bw = FT1000D_SUB_VFOB_BW_F250;
+    else { bw = FT1000D_BW_F2400; }
-        break;
-
-    case 500:
-        bw = FT1000D_SUB_VFOB_BW_F500;
-        break;
-
-    case 2000:
-        bw = FT1000D_SUB_VFOB_BW_F2000;
-        break;
-
-    case 2400:
-        bw = FT1000D_SUB_VFOB_BW_F2400;
-        break;
-
-    default:
-        return -RIG_EINVAL;
-    }
 
     rig_debug(RIG_DEBUG_TRACE, "%s: set bw = 0x%02x\n", __func__, bw);
 

rigs/yaesu/ft600.c

@@ -136,7 +136,7 @@ const struct rig_caps ft600_caps =
     RIG_MODEL(RIG_MODEL_FT600),
     .model_name =     "FT-600",
     .mfg_name =       "Yaesu",
-    .version =        "20200113.0",
+    .version =        "20201009.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_BETA,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -560,27 +560,10 @@ int ft600_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         p_cmd[3] = 0x00; /* to be filled in */
         p_cmd[4] = 0x8C; /* Op: filter selection */
 
-        switch (width)
+        if (width <= 300) { p_cmd[3] = 0x03; }
-        {
+        else if (width <= 500) { p_cmd[3] = 0x02; }
-        case 2400:
+        else if (width <= 2400) { p_cmd[3] = 0x00; }
-            p_cmd[3] = 0x00;
+        else { p_cmd[3] = 0x01; }
-            break;
-
-        case 6000:
-            p_cmd[3] = 0x01;
-            break;
-
-        case 500:
-            p_cmd[3] = 0x02;
-            break;
-
-        case 300:
-            p_cmd[3] = 0x03;
-            break;
-
-        default:
-            return -RIG_EINVAL;
-        };
 
         ret = write_block(&rig->state.rigport, (char *) p_cmd, YAESU_CMD_LENGTH);
 

rigs/yaesu/ft990.c

@@ -147,7 +147,7 @@ const struct rig_caps ft990_caps =
     RIG_MODEL(RIG_MODEL_FT990),
     .model_name =         "FT-990",
     .mfg_name =           "Yaesu",
-    .version =            "20200323.0",
+    .version =            "20201009.0",
     .copyright =          "LGPL",
     .status =             RIG_STATUS_ALPHA,
     .rig_type =           RIG_TYPE_TRANSCEIVER,
@@ -1893,27 +1893,10 @@ int ft990_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         return RIG_OK;
     }
 
-    switch (width)
+    if (width <= 250) { bw = FT990_BW_F250; }
-    {
+    else if (width <= 500) { bw = FT990_BW_F500; }
-    case 250:
+    else if (width <= 2000) { bw = FT990_BW_F2000; }
-        bw = FT990_BW_F250;
+    else { bw = FT990_BW_F2400; }
-        break;
-
-    case 500:
-        bw = FT990_BW_F500;
-        break;
-
-    case 2000:
-        bw = FT990_BW_F2000;
-        break;
-
-    case 2400:
-        bw = FT990_BW_F2400;
-        break;
-
-    default:
-        return -RIG_EINVAL;
-    }
 
     rig_debug(RIG_DEBUG_TRACE, "%s: set bw = 0x%02x\n", __func__, bw);