mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

astyle files

pull/345/head
Michael Black W9MDB 2020-06-21 14:46:50 -05:00
rodzic 83521b2694
commit c2ee1ecb02
4 zmienionych plików z 124 dodań i 85 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

88
rigs/alinco/dx77.c
Wyświetl plik

@ -289,10 +289,10 @@ const struct rig_caps dx77_caps =
* TODO: error case handling * TODO: error case handling
*/ */
int dx77_transaction(RIG *rig, int dx77_transaction(RIG *rig,
const char *cmd, const char *cmd,
int cmd_len, int cmd_len,
char *data, char *data,
int *data_len) int *data_len)
{ {
int retval; int retval;
@ -398,10 +398,10 @@ int dx77_set_vfo(RIG *rig, vfo_t vfo)
case RIG_VFO_MEM: case RIG_VFO_MEM:
return dx77_transaction(rig, return dx77_transaction(rig,
AL CMD_MEMMD "0" EOM, AL CMD_MEMMD "0" EOM,
strlen(AL CMD_MEMMD "0" EOM), strlen(AL CMD_MEMMD "0" EOM),
NULL, NULL,
NULL); NULL);
default: default:
rig_debug(RIG_DEBUG_ERR, rig_debug(RIG_DEBUG_ERR,
@ -427,10 +427,10 @@ int dx77_get_vfo(RIG *rig, vfo_t *vfo)
int vfo_len, retval; int vfo_len, retval;
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RMV EOM, AL CMD_RMV EOM,
strlen(AL CMD_RMV EOM), strlen(AL CMD_RMV EOM),
vfobuf, vfobuf,
&vfo_len); &vfo_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -506,10 +506,10 @@ static int current_data_read(RIG *rig, char *databuf)
int data_len, retval; int data_len, retval;
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RDATA EOM, AL CMD_RDATA EOM,
strlen(AL CMD_RDATA EOM), strlen(AL CMD_RDATA EOM),
databuf, databuf,
&data_len); &data_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -702,10 +702,10 @@ int dx77_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
char spltbuf[BUFSZ]; char spltbuf[BUFSZ];
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RSPLT EOM, AL CMD_RSPLT EOM,
strlen(AL CMD_RSPLT EOM), strlen(AL CMD_RSPLT EOM),
spltbuf, spltbuf,
&splt_len); &splt_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -805,10 +805,10 @@ int dx77_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
/* read in Hertz unit */ /* read in Hertz unit */
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RIT "0" EOM, AL CMD_RIT "0" EOM,
strlen(AL CMD_RIT "0" EOM), strlen(AL CMD_RIT "0" EOM),
ritbuf, ritbuf,
&rit_len); &rit_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1113,10 +1113,10 @@ int dx77_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RAWSTR: case RIG_LEVEL_RAWSTR:
/* read A/D converted value */ /* read A/D converted value */
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_SMETER "1" EOM, AL CMD_SMETER "1" EOM,
strlen(AL CMD_SMETER "1" EOM), strlen(AL CMD_SMETER "1" EOM),
lvlbuf, lvlbuf,
&lvl_len); &lvl_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1187,10 +1187,10 @@ int dx77_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RPOWER EOM, AL CMD_RPOWER EOM,
strlen(AL CMD_RPOWER EOM), strlen(AL CMD_RPOWER EOM),
lvlbuf, lvlbuf,
&lvl_len); &lvl_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1294,10 +1294,10 @@ int dx77_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
int ptt_len, retval; int ptt_len, retval;
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_PTT EOM, AL CMD_PTT EOM,
strlen(AL CMD_PTT EOM), strlen(AL CMD_PTT EOM),
pttbuf, pttbuf,
&ptt_len); &ptt_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1347,10 +1347,10 @@ int dx77_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
int dcd_len, retval; int dcd_len, retval;
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_SQL EOM, AL CMD_SQL EOM,
strlen(AL CMD_SQL EOM), strlen(AL CMD_SQL EOM),
dcdbuf, dcdbuf,
&dcd_len); &dcd_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1421,10 +1421,10 @@ int dx77_get_mem(RIG *rig, vfo_t vfo, int *ch)
int mem_len, retval; int mem_len, retval;
retval = dx77_transaction(rig, retval = dx77_transaction(rig,
AL CMD_RMEM EOM, AL CMD_RMEM EOM,
strlen(AL CMD_RMEM EOM), strlen(AL CMD_RMEM EOM),
membuf, membuf,
&mem_len); &mem_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {

117
rigs/alinco/dxsr8.c
Wyświetl plik

@ -74,7 +74,7 @@ int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
/* /*
* DX-SR8 rig capabilities. * DX-SR8 rig capabilities.
* *
* thanks to * thanks to
* https://yo5ptd.wordpress.com/2017/02/12/alinco-dx-sr8/ * https://yo5ptd.wordpress.com/2017/02/12/alinco-dx-sr8/
* for a partially documented protocol * for a partially documented protocol
*/ */
@ -131,12 +131,12 @@ const struct rig_caps dxsr8_caps =
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = .rx_range_list1 =
{ {
{kHz(135), MHz(30), DXSR8_ALL_MODES, -1, -1, DXSR8_VFO, 0, "DX-SR8T"}, {kHz(135), MHz(30), DXSR8_ALL_MODES, -1, -1, DXSR8_VFO, 0, "DX-SR8T"},
RIG_FRNG_END, RIG_FRNG_END,
}, },
.tx_range_list1 = .tx_range_list1 =
{ {
{kHz(1800), MHz(2) - 100, DXSR8_OTHER_TX_MODES, W(10), W(100), DXSR8_VFO, 0, "DX-SR8T"}, {kHz(1800), MHz(2) - 100, DXSR8_OTHER_TX_MODES, W(10), W(100), DXSR8_VFO, 0, "DX-SR8T"},
{kHz(1800), MHz(2) - 100, DXSR8_AM_TX_MODES, W(4), W(40), DXSR8_VFO, 0, "DX-SR8T"}, {kHz(1800), MHz(2) - 100, DXSR8_AM_TX_MODES, W(4), W(40), DXSR8_VFO, 0, "DX-SR8T"},
@ -168,7 +168,7 @@ const struct rig_caps dxsr8_caps =
{kHz(135), MHz(30), DXSR8_ALL_MODES, -1, -1, DXSR8_VFO, 0, "DX-SR8E"}, {kHz(135), MHz(30), DXSR8_ALL_MODES, -1, -1, DXSR8_VFO, 0, "DX-SR8E"},
RIG_FRNG_END, RIG_FRNG_END,
}, },
.tx_range_list2 = .tx_range_list2 =
{ {
{kHz(1800), MHz(2) - 100, DXSR8_OTHER_TX_MODES, W(10), W(100), DXSR8_VFO, 0, "DX-SR8E"}, {kHz(1800), MHz(2) - 100, DXSR8_OTHER_TX_MODES, W(10), W(100), DXSR8_VFO, 0, "DX-SR8E"},
{kHz(1800), MHz(2) - 100, DXSR8_AM_TX_MODES, W(4), W(40), DXSR8_VFO, 0, "DX-SR8E"}, {kHz(1800), MHz(2) - 100, DXSR8_AM_TX_MODES, W(4), W(40), DXSR8_VFO, 0, "DX-SR8E"},
@ -231,10 +231,10 @@ const struct rig_caps dxsr8_caps =
* TODO: error case handling * TODO: error case handling
*/ */
int dxsr8_transaction(RIG *rig, int dxsr8_transaction(RIG *rig,
const char *cmd, const char *cmd,
int cmd_len, int cmd_len,
char *data, char *data,
int *data_len) int *data_len)
{ {
int retval; int retval;
@ -265,12 +265,12 @@ int dxsr8_transaction(RIG *rig,
* TODO: check whether cmd and echobuf match (optional) * TODO: check whether cmd and echobuf match (optional)
*/ */
retval = read_string(&rs->rigport, replybuf, BUFSZ, LF, strlen(LF)); retval = read_string(&rs->rigport, replybuf, BUFSZ, LF, strlen(LF));
if (retval < 0) if (retval < 0)
{ {
return retval; return retval;
} }
retval = read_string(&rs->rigport, replybuf, BUFSZ, LF, strlen(LF)); retval = read_string(&rs->rigport, replybuf, BUFSZ, LF, strlen(LF));
@ -302,7 +302,7 @@ int dxsr8_transaction(RIG *rig,
strcpy(data, replybuf); strcpy(data, replybuf);
*data_len = reply_len; *data_len = reply_len;
return RIG_OK; return RIG_OK;
} }
@ -312,8 +312,8 @@ int dxsr8_transaction(RIG *rig,
* Convenience function to read a numeric value from the radio * Convenience function to read a numeric value from the radio
*/ */
int dxsr8_read_num(RIG *rig, int dxsr8_read_num(RIG *rig,
const char *cmd, const char *cmd,
int *reply_num) int *reply_num)
{ {
int retval; int retval;
int reply_len; int reply_len;
@ -334,8 +334,9 @@ int dxsr8_read_num(RIG *rig,
* dxsr8_set_freq * dxsr8_set_freq
* Assumes rig!=NULL * Assumes rig!=NULL
*/ */
int dxsr8_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { int dxsr8_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{
char cmd[BUFSZ]; char cmd[BUFSZ];
int cmd_len; int cmd_len;
@ -353,9 +354,10 @@ int dxsr8_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
* dxsr8_get_freq * dxsr8_get_freq
* Assumes rig!=NULL, freq!=NULL * Assumes rig!=NULL, freq!=NULL
*/ */
int dxsr8_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { int dxsr8_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
int retval, data_len; int retval, data_len;
char cmd[] = AL "~RR_RXF" EOM; char cmd[] = AL "~RR_RXF" EOM;
char freqbuf[BUFSZ]; char freqbuf[BUFSZ];
@ -376,18 +378,24 @@ int dxsr8_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) {
* dxsr8_set_mode * dxsr8_set_mode
* Assumes rig!=NULL * Assumes rig!=NULL
*/ */
int dxsr8_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { int dxsr8_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
char mdbuf[BUFSZ]; {
char mdbuf[BUFSZ];
int mdbuf_len, wide_filter, retval; int mdbuf_len, wide_filter, retval;
int amode; int amode;
switch (mode) switch (mode)
{ {
case RIG_MODE_CW: amode = MD_CWU; break; case RIG_MODE_CW: amode = MD_CWU; break;
case RIG_MODE_CWR: amode = MD_CWL; break; case RIG_MODE_CWR: amode = MD_CWL; break;
case RIG_MODE_USB: amode = MD_USB; break; case RIG_MODE_USB: amode = MD_USB; break;
case RIG_MODE_LSB: amode = MD_LSB; break; case RIG_MODE_LSB: amode = MD_LSB; break;
case RIG_MODE_FM: amode = MD_FM; break; case RIG_MODE_FM: amode = MD_FM; break;
case RIG_MODE_AM: amode = MD_AM; break; case RIG_MODE_AM: amode = MD_AM; break;
default: default:
@ -427,14 +435,16 @@ int dxsr8_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) {
* dxsr8_get_mode * dxsr8_get_mode
* Assumes rig!=NULL, mode!=NULL * Assumes rig!=NULL, mode!=NULL
*/ */
int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
int retval; int retval;
int amode; int amode;
int filter; int filter;
retval = dxsr8_read_num(rig, AL "~RR_RFM" EOM, &amode); retval = dxsr8_read_num(rig, AL "~RR_RFM" EOM, &amode);
if (retval != RIG_OK)
if (retval != RIG_OK)
{ {
return retval; return retval;
} }
@ -443,9 +453,13 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
{ {
case MD_CWL: case MD_CWL:
case MD_CWU: *mode = RIG_MODE_CW; break; case MD_CWU: *mode = RIG_MODE_CW; break;
case MD_USB: *mode = RIG_MODE_USB; break; case MD_USB: *mode = RIG_MODE_USB; break;
case MD_LSB: *mode = RIG_MODE_LSB; break; case MD_LSB: *mode = RIG_MODE_LSB; break;
case MD_AM: *mode = RIG_MODE_AM; break; case MD_AM: *mode = RIG_MODE_AM; break;
case MD_FM: *mode = RIG_MODE_FM; break; case MD_FM: *mode = RIG_MODE_FM; break;
default: default:
@ -458,10 +472,12 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
retval = dxsr8_read_num(rig, AL "~RR_NAR" EOM, &filter); retval = dxsr8_read_num(rig, AL "~RR_NAR" EOM, &filter);
if (filter == 0) if (filter == 0)
{ {
*width = rig_passband_wide(rig, *mode); *width = rig_passband_wide(rig, *mode);
} else { }
else
{
*width = rig_passband_normal(rig, *mode); *width = rig_passband_normal(rig, *mode);
} }
@ -472,7 +488,8 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
* dxsr8_set_func * dxsr8_set_func
* Assumes rig!=NULL * Assumes rig!=NULL
*/ */
int dxsr8_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) { int dxsr8_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
int cmd_len; int cmd_len;
char cmd[BUFSZ]; char cmd[BUFSZ];
@ -489,7 +506,7 @@ int dxsr8_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) {
return dxsr8_transaction(rig, cmd, cmd_len, NULL, NULL); return dxsr8_transaction(rig, cmd, cmd_len, NULL, NULL);
default: default:
rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %d\n", (int)func); rig_debug(RIG_DEBUG_ERR, "Unsupported set_func %d\n", (int)func);
return -RIG_EINVAL; return -RIG_EINVAL;
@ -502,7 +519,8 @@ int dxsr8_set_func(RIG *rig, vfo_t vfo, setting_t func, int status) {
* dxsr8_get_func * dxsr8_get_func
* Assumes rig!=NULL, status!=NULL * Assumes rig!=NULL, status!=NULL
*/ */
int dxsr8_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) { int dxsr8_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
{
int retval; int retval;
int setting; int setting;
@ -535,7 +553,7 @@ int dxsr8_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) {
*status = setting ? 1 : 0; *status = setting ? 1 : 0;
break; break;
default: default:
rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %d\n", (int)func); rig_debug(RIG_DEBUG_ERR, "Unsupported get_func %d\n", (int)func);
return -RIG_EINVAL; return -RIG_EINVAL;
@ -549,7 +567,8 @@ int dxsr8_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) {
* Assumes rig!=NULL * Assumes rig!=NULL
* FIXME: cannot support PREAMP and ATT both at same time (make sense though) * FIXME: cannot support PREAMP and ATT both at same time (make sense though)
*/ */
int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
int cmd_len, lvl; int cmd_len, lvl;
char cmd[BUFSZ]; char cmd[BUFSZ];
@ -559,6 +578,7 @@ int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) {
switch (val.i) switch (val.i)
{ {
case 0: lvl = 0; break; // AL~RW_RFG00 - RF gain 0dB case 0: lvl = 0; break; // AL~RW_RFG00 - RF gain 0dB
case 10: lvl = 3; break; // AL~RW_RFG03 - RF gain +10dB case 10: lvl = 3; break; // AL~RW_RFG03 - RF gain +10dB
default: rig_debug(RIG_DEBUG_ERR, default: rig_debug(RIG_DEBUG_ERR,
@ -575,7 +595,9 @@ int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) {
switch (val.i) switch (val.i)
{ {
case 0: lvl = 0; break; // AL~RW_RFG00 - RF gain 0dB case 0: lvl = 0; break; // AL~RW_RFG00 - RF gain 0dB
case 10: lvl = 1; break; // AL~RW_RFG01 - RF gain -10dB case 10: lvl = 1; break; // AL~RW_RFG01 - RF gain -10dB
case 20: lvl = 2; break; // AL~RW_RFG02 - RF gain -20dB case 20: lvl = 2; break; // AL~RW_RFG02 - RF gain -20dB
default: rig_debug(RIG_DEBUG_ERR, default: rig_debug(RIG_DEBUG_ERR,
@ -590,11 +612,16 @@ int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) {
case RIG_LEVEL_RFPOWER: case RIG_LEVEL_RFPOWER:
if (val.f <= 0.01) { if (val.f <= 0.01)
{
lvl = 2; // AL~RW_PWR02 - Sub low power (QRP mode) lvl = 2; // AL~RW_PWR02 - Sub low power (QRP mode)
} else if (val.f <= 0.1) { }
else if (val.f <= 0.1)
{
lvl = 1; // AL~RW_PWR01 - Low power lvl = 1; // AL~RW_PWR01 - Low power
} else { }
else
{
lvl = 0; // AL~RW_PWR00 - High power lvl = 0; // AL~RW_PWR00 - High power
} }
@ -614,7 +641,8 @@ int dxsr8_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) {
* dxsr8_get_level * dxsr8_get_level
* Assumes rig!=NULL, val!=NULL * Assumes rig!=NULL, val!=NULL
*/ */
int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) { int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
int retval; int retval;
int lvl; int lvl;
@ -630,12 +658,15 @@ int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) {
return retval; return retval;
} }
switch (lvl) { switch (lvl)
{
case 0: case 0:
val->i = 0; break; // RF gain 0dB val->i = 0; break; // RF gain 0dB
case 3: case 3:
val->i = 10; break; // RF gain +10dB val->i = 10; break; // RF gain +10dB
default:
default:
rig_debug(RIG_DEBUG_ERR, "Unknown RF Gain %02d\n", lvl); rig_debug(RIG_DEBUG_ERR, "Unknown RF Gain %02d\n", lvl);
} }
@ -649,14 +680,18 @@ int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) {
return retval; return retval;
} }
switch (lvl) { switch (lvl)
{
case 0: case 0:
val->i = 0; break; // RF gain 0dB val->i = 0; break; // RF gain 0dB
case 1: case 1:
val->i = 10; break; // RF gain -10dB val->i = 10; break; // RF gain -10dB
case 2: case 2:
val->i = 10; break; // RF gain -20dB val->i = 10; break; // RF gain -20dB
default:
default:
rig_debug(RIG_DEBUG_ERR, "Unknown RF Gain %02d\n", lvl); rig_debug(RIG_DEBUG_ERR, "Unknown RF Gain %02d\n", lvl);
} }
@ -684,7 +719,7 @@ int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) {
case 3: // 02 - Sub low power (QRP mode) case 3: // 02 - Sub low power (QRP mode)
val->f = 0.01; // 1 W val->f = 0.01; // 1 W
break; break;
default: default:
rig_debug(RIG_DEBUG_ERR, "Unknown RF Power %02d\n", lvl); rig_debug(RIG_DEBUG_ERR, "Unknown RF Power %02d\n", lvl);
break; break;
@ -705,7 +740,8 @@ int dxsr8_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) {
* dxsr8_get_ptt * dxsr8_get_ptt
* Assumes rig!=NULL, ptt!=NULL * Assumes rig!=NULL, ptt!=NULL
*/ */
int dxsr8_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) { int dxsr8_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
{
int retval; int retval;
int pttval; int pttval;
@ -725,7 +761,8 @@ int dxsr8_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) {
* dxsr8_set_ptt * dxsr8_set_ptt
* Assumes rig!=NULL * Assumes rig!=NULL
*/ */
int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{
char cmd[BUFSZ]; char cmd[BUFSZ];
int cmd_len; int cmd_len;

1
rigs/yaesu/ft991.c
Wyświetl plik

@ -736,6 +736,7 @@ static int ft991_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
{ {
int i; int i;
ncboolean tone_match; ncboolean tone_match;
for (i = 0, tone_match = FALSE; rig->caps->ctcss_list[i] != 0; i++) for (i = 0, tone_match = FALSE; rig->caps->ctcss_list[i] != 0; i++)
{ {
if (tone == rig->caps->ctcss_list[i]) if (tone == rig->caps->ctcss_list[i])

3
rigs/yaesu/newcat.c
Wyświetl plik

@ -366,7 +366,8 @@ int newcat_open(RIG *rig)
__func__, rig_s->rigport.post_write_delay); __func__, rig_s->rigport.post_write_delay);
/* Ensure rig is powered on */ /* Ensure rig is powered on */
if (priv->poweron == 0) { if (priv->poweron == 0)
{
priv->poweron = 1; priv->poweron = 1;
rig_set_powerstat(rig, 1); rig_set_powerstat(rig, 1);
} }