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

Add RIG_FUNC_SEND_VOICE_MEM with FT991 as the 1st implementation 

https://github.com/Hamlib/Hamlib/issues/830
pull/846/head
Mike Black W9MDB 2021-10-21 17:36:54 -05:00
rodzic efe54c80c5
commit c9d7a924c7
4 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1123,7 +1123,7 @@ typedef uint64_t setting_t;
#define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42) /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */ #define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42) /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */
#define RIG_FUNC_SPECTRUM CONSTANT_64BIT_FLAG (43) /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */ #define RIG_FUNC_SPECTRUM CONSTANT_64BIT_FLAG (43) /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */
#define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44) /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */ #define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44) /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */
#define RIG_FUNC_BIT45 CONSTANT_64BIT_FLAG (45) /*!< \c available for future RIG_FUNC items */ #define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (45) /*!< \c For sending voice memory */
#define RIG_FUNC_BIT46 CONSTANT_64BIT_FLAG (46) /*!< \c available for future RIG_FUNC items */ #define RIG_FUNC_BIT46 CONSTANT_64BIT_FLAG (46) /*!< \c available for future RIG_FUNC items */
#define RIG_FUNC_BIT47 CONSTANT_64BIT_FLAG (47) /*!< \c available for future RIG_FUNC items */ #define RIG_FUNC_BIT47 CONSTANT_64BIT_FLAG (47) /*!< \c available for future RIG_FUNC items */
#define RIG_FUNC_BIT48 CONSTANT_64BIT_FLAG (48) /*!< \c available for future RIG_FUNC items */ #define RIG_FUNC_BIT48 CONSTANT_64BIT_FLAG (48) /*!< \c available for future RIG_FUNC items */
@ -2060,7 +2060,6 @@ enum rig_function_e {
RIG_FUNCTION_SEND_MORSE, RIG_FUNCTION_SEND_MORSE,
RIG_FUNCTION_STOP_MORSE, RIG_FUNCTION_STOP_MORSE,
RIG_FUNCTION_WAIT_MORSE, RIG_FUNCTION_WAIT_MORSE,
RIG_FUNCTION_SEND_VOICE_MEM,
RIG_FUNCTION_SET_BANK, RIG_FUNCTION_SET_BANK,
RIG_FUNCTION_SET_MEM, RIG_FUNCTION_SET_MEM,
RIG_FUNCTION_GET_MEM, RIG_FUNCTION_GET_MEM,
@ -2076,7 +2075,7 @@ enum rig_function_e {
RIG_FUNCTION_GET_CHAN_ALL_CB, RIG_FUNCTION_GET_CHAN_ALL_CB,
RIG_FUNCTION_SET_MEM_ALL_CB, RIG_FUNCTION_SET_MEM_ALL_CB,
RIG_FUNCTION_GET_MEM_ALL_CB, RIG_FUNCTION_GET_MEM_ALL_CB,
RIG_FUNCTION_SET_VFO_OPT RIG_FUNCTION_SET_VFO_OPT,
}; };
/** /**

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

@ -65,7 +65,7 @@
RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\
RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN|\ RIG_FUNC_FBKIN|RIG_FUNC_COMP|RIG_FUNC_ANF|RIG_FUNC_MN|\
RIG_FUNC_RIT|RIG_FUNC_XIT|\ RIG_FUNC_RIT|RIG_FUNC_XIT|\
RIG_FUNC_TUNER|RIG_FUNCTION_SEND_VOICE_MEM) RIG_FUNC_TUNER|RIG_FUNC_SEND_VOICE_MEM)
#define FT991_VFO_OPS (RIG_OP_TUNE|RIG_OP_CPY|RIG_OP_XCHG|\ #define FT991_VFO_OPS (RIG_OP_TUNE|RIG_OP_CPY|RIG_OP_XCHG|\
RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\ RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\

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

@ -5552,7 +5552,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
cat_term); cat_term);
break; break;
case RIG_FUNCTION_SEND_VOICE_MEM: case RIG_FUNC_SEND_VOICE_MEM:
if (!newcat_valid_command(rig, "PB")) if (!newcat_valid_command(rig, "PB"))
{ {
RETURNFUNC(-RIG_ENAVAIL); RETURNFUNC(-RIG_ENAVAIL);

4
src/misc.c
Wyświetl plik

@ -692,6 +692,7 @@ static const struct
{ RIG_FUNC_TRANSCEIVE, "TRANSCEIVE" }, { RIG_FUNC_TRANSCEIVE, "TRANSCEIVE" },
{ RIG_FUNC_SPECTRUM, "SPECTRUM" }, { RIG_FUNC_SPECTRUM, "SPECTRUM" },
{ RIG_FUNC_SPECTRUM_HOLD, "SPECTRUM_HOLD" }, { RIG_FUNC_SPECTRUM_HOLD, "SPECTRUM_HOLD" },
{ RIG_FUNC_SEND_VOICE_MEM , "VOICE_MEM" },
{ RIG_FUNC_NONE, "" }, { RIG_FUNC_NONE, "" },
}; };
@ -2207,9 +2208,6 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_model,
case RIG_FUNCTION_WAIT_MORSE: case RIG_FUNCTION_WAIT_MORSE:
return caps->wait_morse; return caps->wait_morse;
case RIG_FUNCTION_SEND_VOICE_MEM:
return caps->send_voice_mem;
case RIG_FUNCTION_SET_BANK: case RIG_FUNCTION_SET_BANK:
return caps->set_bank; return caps->set_bank;