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/Hamlib/Hamlib

pull/94/head
Michael Black 2019-03-01 07:34:16 -06:00
rodzic 1688d103c9 b8825f6acd
commit fc29251509
2 zmienionych plików z 6 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/microham.c
Wyświetl plik

@ -248,7 +248,7 @@ static void close_microham()
* of candidates. * of candidates.
*/ */
#define NUMUHTYPES 8 #define NUMUHTYPES 9
static struct uhtypes static struct uhtypes
{ {
const char *name; const char *name;
@ -259,6 +259,7 @@ static struct uhtypes
#ifdef __APPLE__ #ifdef __APPLE__
{ "microKeyer", "/dev/tty.usbserial-MK*"}, { "microKeyer", "/dev/tty.usbserial-MK*"},
{ "microKeyer-II", "/dev/tty.usbserial-M2*"}, { "microKeyer-II", "/dev/tty.usbserial-M2*"},
{ "microKeyer-III", "/dev/tty.usbserial-M3*"},
{ "CW Keyer", "/dev/tty.usbserial-CK*"}, { "CW Keyer", "/dev/tty.usbserial-CK*"},
{ "digiKeyer", "/dev/tty.usbserial-DK*"}, { "digiKeyer", "/dev/tty.usbserial-DK*"},
{ "digiKeyer-II", "/dev/tty.usbserial-D2*"}, { "digiKeyer-II", "/dev/tty.usbserial-D2*"},
@ -268,6 +269,7 @@ static struct uhtypes
#else #else
{ "microKeyer", "/dev/serial/by-id/*microHAM*_MK*"}, { "microKeyer", "/dev/serial/by-id/*microHAM*_MK*"},
{ "microKeyer-II", "/dev/serial/by-id/*microHAM*_M2*"}, { "microKeyer-II", "/dev/serial/by-id/*microHAM*_M2*"},
{ "microKeyer-III", "/dev/serial/by-id/*microHAM*_M3*"},
{ "CW Keyer", "/dev/serial/by-id/*microHAM*_CK*"}, { "CW Keyer", "/dev/serial/by-id/*microHAM*_CK*"},
{ "digiKeyer", "/dev/serial/by-id/*microHAM*_DK*"}, { "digiKeyer", "/dev/serial/by-id/*microHAM*_DK*"},
{ "digiKeyer-II", "/dev/serial/by-id/*microHAM*_D2*"}, { "digiKeyer-II", "/dev/serial/by-id/*microHAM*_D2*"},

5
yaesu/ft747.c
Wyświetl plik

@ -401,8 +401,9 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
memcpy(&p->p_cmd,&ft747_ncmd[FT_747_NATIVE_FREQ_SET].nseq,YAESU_CMD_LENGTH); memcpy(&p->p_cmd,&ft747_ncmd[FT_747_NATIVE_FREQ_SET].nseq,YAESU_CMD_LENGTH);
/* store bcd format in p_cmd (LSB), round to nearest 25th Hz */ /* store bcd format in p_cmd (LSB), round to nearest 10 Hz even
to_bcd(p->p_cmd, (freq+12)/10, 8); though the rig will internally then round to 25 Hz steps */
to_bcd(p->p_cmd, (freq + 5)/10, 8);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq after conversion = %"PRIll" Hz \n", from_bcd(p->p_cmd,8)* 10 ); rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq after conversion = %"PRIll" Hz \n", from_bcd(p->p_cmd,8)* 10 );