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

Change band_t to hamlib_band_t to avoid collision with FLDigi's band_t

pull/950/head
Mike Black W9MDB 2022-02-01 09:12:36 -06:00
rodzic 011f9789e2
commit 41eedc9479
3 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -722,7 +722,7 @@ typedef enum {
RIG_BAND_GEN = (1 << 13), /*!< \c 60M */ RIG_BAND_GEN = (1 << 13), /*!< \c 60M */
RIG_BAND_MW = (1 << 14), /*!< \c Medium Wave */ RIG_BAND_MW = (1 << 14), /*!< \c Medium Wave */
RIG_BAND_AIR = (1 << 15), /*!< \c Air band */ RIG_BAND_AIR = (1 << 15), /*!< \c Air band */
} band_t; } hamlib_band_t;
/** /**

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

@ -3521,7 +3521,7 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
RETURNFUNC(RIG_OK); RETURNFUNC(RIG_OK);
} }
static int band2rig (band_t band) static int band2rig (hamlib_band_t band)
{ {
int retval = 0; int retval = 0;
switch(band) switch(band)
@ -4377,7 +4377,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_BAND_SELECT: case RIG_LEVEL_BAND_SELECT:
if (newcat_valid_command(rig, "BS")) if (newcat_valid_command(rig, "BS"))
{ {
int band = band2rig((band_t)val.i); int band = band2rig((hamlib_band_t)val.i);
SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BS%02d%c", band, cat_term); SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BS%02d%c", band, cat_term);
} }
break; break;

2
rigs/yaesu/newcat.h
Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "20220131" #define NEWCAT_VER "20220201"
/* Hopefully large enough for future use, 128 chars plus '\0' */ /* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129 #define NEWCAT_DATA_LEN 129