diff --git a/icom/ic7100.c b/icom/ic7100.c index 902407d9c..ff3c80224 100644 --- a/icom/ic7100.c +++ b/icom/ic7100.c @@ -109,7 +109,7 @@ const struct rig_caps ic7100_caps = { .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_TRANSCEIVER, -.ptt_type = RIG_PTT_SERIAL_CAT, +.ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_RIG, .port_type = RIG_PORT_SERIAL, .serial_rate_min = 300, diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index faf3fd70a..3842cb91b 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -413,13 +413,12 @@ typedef enum { */ typedef enum { RIG_PTT_NONE = 0, /*!< No PTT available */ - RIG_PTT_RIG, /*!< Legacy PTT */ + RIG_PTT_RIG, /*!< Legacy PTT (CAT PTT) */ RIG_PTT_SERIAL_DTR, /*!< PTT control through serial DTR signal */ RIG_PTT_SERIAL_RTS, /*!< PTT control through serial RTS signal */ RIG_PTT_PARALLEL, /*!< PTT control through parallel port */ - RIG_PTT_RIG_MICDATA, /*!< Legacy PTT, supports RIG_PTT_ON_MIC/RIG_PTT_ON_DATA */ - RIG_PTT_CM108, /*!< PTT control through CM108 GPIO pin */ - RIG_PTT_SERIAL_CAT /*!< PTT control through serial command sequence*/ + RIG_PTT_RIG_MICDATA, /*!< Legacy PTT (CAT PTT), supports RIG_PTT_ON_MIC/RIG_PTT_ON_DATA */ + RIG_PTT_CM108 /*!< PTT control through CM108 GPIO pin */ } ptt_type_t; /** diff --git a/src/rig.c b/src/rig.c index 02291190c..6297a8397 100644 --- a/src/rig.c +++ b/src/rig.c @@ -498,7 +498,6 @@ int HAMLIB_API rig_open(RIG *rig) case RIG_PTT_NONE: case RIG_PTT_RIG: case RIG_PTT_RIG_MICDATA: - case RIG_PTT_SERIAL_CAT: break; case RIG_PTT_SERIAL_RTS: case RIG_PTT_SERIAL_DTR: @@ -678,7 +677,6 @@ int HAMLIB_API rig_close(RIG *rig) case RIG_PTT_NONE: case RIG_PTT_RIG: case RIG_PTT_RIG_MICDATA: - case RIG_PTT_SERIAL_CAT: break; case RIG_PTT_SERIAL_RTS: ser_set_rts(&rs->pttport, RIG_PTT_OFF); @@ -1243,12 +1241,6 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) case RIG_PTT_SERIAL_RTS: return ser_set_rts(&rig->state.pttport, ptt!=RIG_PTT_OFF); - case RIG_PTT_SERIAL_CAT: - if (ptt == RIG_PTT_ON_MIC || ptt == RIG_PTT_ON_DATA) - ptt = RIG_PTT_ON; - retcode = caps->set_ptt(rig, vfo, ptt); - return retcode; - case RIG_PTT_PARALLEL: return par_ptt_set(&rig->state.pttport, ptt);