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

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

@ -334,7 +334,8 @@ 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,7 +354,8 @@ 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;
@ -376,7 +378,8 @@ 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;
@ -384,10 +387,15 @@ int dxsr8_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) {
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,13 +435,15 @@ 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:
@ -461,7 +475,9 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) {
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];
@ -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;
@ -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,11 +658,14 @@ 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,13 +680,17 @@ 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);
} }
@ -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);
} }