Add C4FM mode for Yaesu FT-991

include/hamlib/rig.h

@@ -966,8 +966,8 @@ typedef uint64_t rmode_t;
 #define    RIG_MODE_PSKR      CONSTANT_64BIT_FLAG (31)  /*!< \c PSKR - Kenwood PSKR and others */
 #ifndef SWIGLUA
 /* hide the top 32 bits from the Lua binding as they will not work */
-#define    RIG_MODE_DD     CONSTANT_64BIT_FLAG (32)  /* DD Mode IC-9700 */
+#define    RIG_MODE_DD        CONSTANT_64BIT_FLAG (32)  /*!< \c DD Mode IC-9700 */
-#define    RIG_MODE_BIT33     CONSTANT_64BIT_FLAG (33)  /* reserved for future expansion */
+#define    RIG_MODE_C4FM      CONSTANT_64BIT_FLAG (33)  /*!< \c Yaesu C4FM mode */
 #define    RIG_MODE_BIT34     CONSTANT_64BIT_FLAG (34)  /* reserved for future expansion */
 #define    RIG_MODE_BIT35     CONSTANT_64BIT_FLAG (35)  /* reserved for future expansion */
 #define    RIG_MODE_BIT36     CONSTANT_64BIT_FLAG (36)  /* reserved for future expansion */

src/misc.c

@@ -343,6 +343,7 @@ static struct
     { RIG_MODE_AMN, "AMN"},
     { RIG_MODE_PSK, "PSK"},
     { RIG_MODE_PSKR, "PSKR"},
+    { RIG_MODE_C4FM, "C4FM"},
     { RIG_MODE_NONE, "" },
 };
 

yaesu/ft991.h

@@ -38,11 +38,12 @@
 /* Receiver caps */
 
 #define FT991_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
-		RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM)
+		RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|\
+    RIG_MODE_C4FM)
 #define FT991_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
 		RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
 #define FT991_AM_RX_MODES (RIG_MODE_AM)
-#define FT991_FM_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM)
+#define FT991_FM_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_C4FM)
 #define FT991_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR)
 #define FT991_CW_RTTY_PKT_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|\
         RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|RIG_MODE_CW|RIG_MODE_CWR)

yaesu/newcat.c

@@ -769,6 +769,10 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         priv->cmd_str[3] = '3';
         break;
 
+    case RIG_MODE_FM:
+        priv->cmd_str[3] = '4';
+        break;
+
     case RIG_MODE_AM:
         priv->cmd_str[3] = '5';
         break;
@@ -793,8 +797,8 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         priv->cmd_str[3] = 'A';
         break;
 
-    case RIG_MODE_FM:
+    case RIG_MODE_FMN:
-        priv->cmd_str[3] = '4';
+        priv->cmd_str[3] = 'B';
         break;
 
     case RIG_MODE_PKTUSB:   /* FT450 USER-U */
@@ -952,7 +956,7 @@ int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         return err;
 
     case 'B':
-        *mode = RIG_MODE_FM;       /* narrow */
+        *mode = RIG_MODE_FMN;       /* narrow */
         *width = rig_passband_narrow(rig, *mode);
         return RIG_OK;
 
@@ -965,6 +969,11 @@ int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         *width = rig_passband_narrow(rig, *mode);
         return RIG_OK;
 
+    case 'E':
+        *mode = RIG_MODE_C4FM;     /* narrow, FT950 */
+        *width = rig_passband_narrow(rig, *mode);
+        return RIG_OK;
+
     default:
         return -RIG_EPROTO;
     }
@@ -4342,8 +4351,14 @@ int newcat_set_channel(RIG *rig, const channel_t *chan)
 
     case RIG_MODE_PKTFM:  c_mode = 'A'; break;
 
+    case RIG_MODE_FMN:    c_mode = 'B'; break;
+
     case RIG_MODE_PKTUSB: c_mode = 'C'; break;
 
+    case RIG_MODE_AMN:    c_mode = 'D'; break;
+
+    case RIG_MODE_C4FM:   c_mode = 'E'; break;
+
     default: c_mode = '1'; break;
     }
 
@@ -4558,7 +4573,11 @@ int newcat_get_channel(RIG *rig, channel_t *chan)
 
     case 'D': chan->mode = RIG_MODE_AM;     break;
 
-    default:  chan->mode = RIG_MODE_LSB;
+    case 'E': chan->mode = RIG_MODE_C4FM;     break;
+
+    default:  
+        rig_debug(RIG_DEBUG_ERR,"%s: unknown mode=%c\n", __func__, *retval);
+        chan->mode = RIG_MODE_LSB;
     }
 
     /* Clarifier TX P5 *********************** */

yaesu/newcat.h

@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "0.27"
+#define NEWCAT_VER "0.28"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129