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

Fix some cppcheck warnings 

Fix TS-480 ptt behavior
pull/224/head
Michael Black 2020-03-19 15:02:56 -05:00
rodzic 109a6f6d8e
commit 5d52ef3094
2 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
rigs/kenwood/kenwood.c
Wyświetl plik

@ -1740,7 +1740,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
int err2 = kenwood_set_vfo_main_sub(rig, curr_vfo); int err2 = kenwood_set_vfo_main_sub(rig, curr_vfo);
if (RIG_OK == err && err2 != RIG_OK) { return err2; } if (err2 != RIG_OK) { return err2; }
} }
} }
else else
@ -2067,16 +2067,18 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
else else
{ {
int foundit = 0;
for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++) for (i = 0; i < MAXDBLSTSIZ && rig->state.attenuator[i]; i++)
{ {
if (val.i == rig->state.attenuator[i]) if (val.i == rig->state.attenuator[i])
{ {
snprintf(levelbuf, sizeof(levelbuf), "RA%02d", i + 1); snprintf(levelbuf, sizeof(levelbuf), "RA%02d", i + 1);
foundit = 1;
break; break;
} }
} }
if (val.i != rig->state.attenuator[i]) if (!foundit)
{ {
return -RIG_EINVAL; return -RIG_EINVAL;
} }
@ -2093,16 +2095,18 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
else else
{ {
int foundit = 0;
for (i = 0; i < MAXDBLSTSIZ && rig->state.preamp[i]; i++) for (i = 0; i < MAXDBLSTSIZ && rig->state.preamp[i]; i++)
{ {
if (val.i == rig->state.preamp[i]) if (val.i == rig->state.preamp[i])
{ {
snprintf(levelbuf, sizeof(levelbuf), "PA%01d", i + 1); snprintf(levelbuf, sizeof(levelbuf), "PA%01d", i + 1);
foundit = 1;
break; break;
} }
} }
if (val.i != rig->state.preamp[i]) if (!foundit)
{ {
return -RIG_EINVAL; return -RIG_EINVAL;
} }
@ -3202,7 +3206,7 @@ int kenwood_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
return err; return err;
} }
if (ptt) if (ptttmp)
{ {
char ackbuf[8]; char ackbuf[8];
return kenwood_transaction(rig, ptt_cmd, ackbuf, sizeof(ackbuf)); return kenwood_transaction(rig, ptt_cmd, ackbuf, sizeof(ackbuf));

2
rigs/kenwood/kenwood.h
Wyświetl plik

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include "token.h" #include "token.h"
#define BACKEND_VER "1.7" #define BACKEND_VER "1.8"
#define EOM_KEN ';' #define EOM_KEN ';'
#define EOM_TH '\r' #define EOM_TH '\r'