diff --git a/src/microham.c b/src/microham.c index 631104fd4..8e0c0e2da 100644 --- a/src/microham.c +++ b/src/microham.c @@ -248,7 +248,7 @@ static void close_microham() * of candidates. */ -#define NUMUHTYPES 8 +#define NUMUHTYPES 9 static struct uhtypes { const char *name; @@ -259,6 +259,7 @@ static struct uhtypes #ifdef __APPLE__ { "microKeyer", "/dev/tty.usbserial-MK*"}, { "microKeyer-II", "/dev/tty.usbserial-M2*"}, + { "microKeyer-III", "/dev/tty.usbserial-M3*"}, { "CW Keyer", "/dev/tty.usbserial-CK*"}, { "digiKeyer", "/dev/tty.usbserial-DK*"}, { "digiKeyer-II", "/dev/tty.usbserial-D2*"}, @@ -268,6 +269,7 @@ static struct uhtypes #else { "microKeyer", "/dev/serial/by-id/*microHAM*_MK*"}, { "microKeyer-II", "/dev/serial/by-id/*microHAM*_M2*"}, + { "microKeyer-III", "/dev/serial/by-id/*microHAM*_M3*"}, { "CW Keyer", "/dev/serial/by-id/*microHAM*_CK*"}, { "digiKeyer", "/dev/serial/by-id/*microHAM*_DK*"}, { "digiKeyer-II", "/dev/serial/by-id/*microHAM*_D2*"}, diff --git a/yaesu/ft747.c b/yaesu/ft747.c index 81dd0c00b..e4bd74fea 100644 --- a/yaesu/ft747.c +++ b/yaesu/ft747.c @@ -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); - /* store bcd format in p_cmd (LSB), round to nearest 25th Hz */ - to_bcd(p->p_cmd, (freq+12)/10, 8); + /* store bcd format in p_cmd (LSB), round to nearest 10 Hz even + 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 );