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

Fix Kenwood PB command to stop last requested voice channel started 

https://github.com/Hamlib/Hamlib/issues/1385
pull/1389/head
Mike Black W9MDB 2023-09-16 09:36:00 -05:00
rodzic 0bee582095
commit 5115fa8959
2 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5344,6 +5344,7 @@ int kenwood_stop_morse(RIG *rig, vfo_t vfo)
int kenwood_send_voice_mem(RIG *rig, vfo_t vfo, int bank) int kenwood_send_voice_mem(RIG *rig, vfo_t vfo, int bank)
{ {
char cmd[16]; char cmd[16];
struct kenwood_priv_data *priv = rig->state.priv;
ENTERFUNC; ENTERFUNC;
#if 0 // don't really need to turn on the list #if 0 // don't really need to turn on the list
@ -5351,14 +5352,16 @@ int kenwood_send_voice_mem(RIG *rig, vfo_t vfo, int bank)
kenwood_transaction(rig, cmd, NULL, 0); kenwood_transaction(rig, cmd, NULL, 0);
#endif #endif
SNPRINTF(cmd, sizeof(cmd), "PB1%d1", bank); SNPRINTF(cmd, sizeof(cmd), "PB1%d1", bank);
priv->voice_bank = bank;
RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0)); RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0));
} }
int kenwood_stop_voice_mem(RIG *rig, vfo_t vfo) int kenwood_stop_voice_mem(RIG *rig, vfo_t vfo)
{ {
char cmd[16]; char cmd[16];
struct kenwood_priv_data *priv = rig->state.priv;
ENTERFUNC; ENTERFUNC;
SNPRINTF(cmd, sizeof(cmd), "PB0"); SNPRINTF(cmd, sizeof(cmd), "PB1%d0", priv->voice_bank);
RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0)); RETURNFUNC(kenwood_transaction(rig, cmd, NULL, 0));
} }

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

@ -28,7 +28,7 @@
#include "token.h" #include "token.h"
#include "idx_builtin.h" #include "idx_builtin.h"
#define BACKEND_VER "20230914" #define BACKEND_VER "20230916"
#define EOM_KEN ';' #define EOM_KEN ';'
#define EOM_TH '\r' #define EOM_TH '\r'
@ -178,6 +178,7 @@ struct kenwood_priv_data
int question_mark_response_means_rejected; /* the question mark response has multiple meanings */ int question_mark_response_means_rejected; /* the question mark response has multiple meanings */
int save_k2_ext_lvl; // so we can restore to original int save_k2_ext_lvl; // so we can restore to original
int save_k3_ext_lvl; // so we can restore to original -- for future use if needed int save_k3_ext_lvl; // so we can restore to original -- for future use if needed
int voice_bank; /* last voice bank send for use by stop_voice_mem */
}; };