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

Merge branch 'master' of https://github.com/mdblack98/Hamlib

pull/224/head
Michael Black 2020-03-08 08:42:35 -05:00
rodzic a22195fbca 82f47afed0
commit 61fa2d2535
2 zmienionych plików z 5 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
include/hamlib/rig.h
Wyświetl plik

@ -1382,8 +1382,8 @@ typedef int (* confval_cb_t)(RIG *,
* sharing the struct rig_caps of the backend, while keeping their own * sharing the struct rig_caps of the backend, while keeping their own
* customized data. * customized data.
* *
* mdblack: Don't move fields around without bumping the version numbers * mdblack: Don't move or add fields around without bumping the version numbers
* DLL or shared library replacement would break the interface * DLL or shared library replacement depends on order
*/ */
#define RIG_MODEL(arg) .rig_model=arg,.macro_name=#arg #define RIG_MODEL(arg) .rig_model=arg,.macro_name=#arg
struct rig_caps { struct rig_caps {
@ -1393,7 +1393,6 @@ struct rig_caps {
const char *version; /*!< Driver version. */ const char *version; /*!< Driver version. */
const char *copyright; /*!< Copyright info. */ const char *copyright; /*!< Copyright info. */
enum rig_status_e status; /*!< Driver status. */ enum rig_status_e status; /*!< Driver status. */
const char *macro_name; /*!< Rig model macro name */
int rig_type; /*!< Rig type. */ int rig_type; /*!< Rig type. */
ptt_type_t ptt_type; /*!< Type of the PTT port. */ ptt_type_t ptt_type; /*!< Type of the PTT port. */
@ -1645,6 +1644,7 @@ struct rig_caps {
const char *clone_combo_set; /*!< String describing key combination to enter load cloning mode */ const char *clone_combo_set; /*!< String describing key combination to enter load cloning mode */
const char *clone_combo_get; /*!< String describing key combination to enter save cloning mode */ const char *clone_combo_get; /*!< String describing key combination to enter save cloning mode */
const char *macro_name; /*!< Rig model macro name */
}; };

5
src/mem.c
Wyświetl plik

@ -363,9 +363,8 @@ static int generic_save_channel(RIG *rig, channel_t *chan)
vfo_t vfo; vfo_t vfo;
setting_t setting; setting_t setting;
const channel_cap_t *mem_cap = NULL; const channel_cap_t *mem_cap = NULL;
value_t vdummy; value_t vdummy = {0};
vdummy.i = 0;
chan_num = chan->channel_num; chan_num = chan->channel_num;
vfo = chan->vfo; vfo = chan->vfo;
memset(chan, 0, sizeof(channel_t)); memset(chan, 0, sizeof(channel_t));
@ -533,7 +532,7 @@ static int generic_restore_channel(RIG *rig, const channel_t *chan)
struct ext_list *p; struct ext_list *p;
setting_t setting; setting_t setting;
const channel_cap_t *mem_cap = NULL; const channel_cap_t *mem_cap = NULL;
value_t vdummy; value_t vdummy = {0};
if (chan->vfo == RIG_VFO_MEM) if (chan->vfo == RIG_VFO_MEM)
{ {