diff --git a/AUTHORS b/AUTHORS index e73e2129c..7f48f4783 100644 --- a/AUTHORS +++ b/AUTHORS @@ -361,4 +361,4 @@ Terry Dawson, VK2KTJ, Alexander Sack Nirgal Vourgère Andrew Errington -Kārlis Millers YL3CAAK +Kārlis Millers YL3ALK diff --git a/yaesu/ft600.c b/yaesu/ft600.c index 7078326a5..7c35a0381 100644 --- a/yaesu/ft600.c +++ b/yaesu/ft600.c @@ -2,7 +2,8 @@ * hamlib - (C) Frank Singleton 2000-2003 * (C) Stephane Fillod 2000-2010 * - * ft600.c - (C) Kārlis Millers YL3CAAK 2019 + * ft600.c -(C) Kārlis Millers YL3ALK 2019 + * * This shared library provides an API for communicating * via serial interface to an FT-600 using the "CAT" interface. * The starting point for this code was Chris Karpinsky's ft100 implementation. @@ -133,9 +134,9 @@ const struct rig_caps ft600_caps = { .rig_model = RIG_MODEL_FT600, .model_name = "FT-600", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", - .status = RIG_STATUS_ALPHA, + .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_TRANSCEIVER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_NONE, @@ -383,10 +384,7 @@ int ft600_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { struct ft600_priv_data *priv = (struct ft600_priv_data*)rig->state.priv; freq_t f; - char *ptr; - char freq_str[10]; int ret; - rig_debug(RIG_DEBUG_VERBOSE,"ft600: get_freq \n"); if( !freq ) return -RIG_EINVAL; @@ -396,13 +394,11 @@ int ft600_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { return ret; } - sprintf(freq_str, "%hhx%hhx%hhx", - priv->status.freq[1], - priv->status.freq[2], - priv->status.freq[3]); + f = ((((priv->status.freq[1] <<8) + priv->status.freq[2])<<8) + priv->status.freq[3]) * 10; - f=strtol(freq_str,&ptr,16); - *freq = f * 10; + rig_debug(RIG_DEBUG_TRACE, "%s: freq = %"PRIfreq" Hz\n", __func__, f); + + *freq = f; return RIG_OK; } diff --git a/yaesu/ft600.h b/yaesu/ft600.h index 9b0fad901..22963d472 100644 --- a/yaesu/ft600.h +++ b/yaesu/ft600.h @@ -2,9 +2,10 @@ * hamlib - (C) Frank Singleton 2000-2003 (vk3fcs@ix.netcom.com) * (C) Stephane Fillod 2000-2009 * - * ft600.h - (C) Kārlis Millers YL3CAAK 2019 + * ft600.h -(C) Kārlis Millers YL3ALK 2019 + * * This shared library provides an API for communicating - * via serial interface to an FT-100 using the "CAT" interface. + * via serial interface to an FT-600 using the "CAT" interface. * The starting point for this code was Chris Karpinsky's ft100 implementation. * * This library is free software; you can redistribute it and/or @@ -12,7 +13,7 @@ * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * This l ibrary is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details.