hamlib-cvs-digest Mailing List for Ham Radio Control Libraries (Page 220)
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
hamlib-cvs-digest — hamlib commit digest
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(57) |
Nov
(27) |
Dec
(25) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(41) |
Feb
(101) |
Mar
(60) |
Apr
(32) |
May
(32) |
Jun
(198) |
Jul
(95) |
Aug
(60) |
Sep
(48) |
Oct
(96) |
Nov
(27) |
Dec
(222) |
| 2002 |
Jan
(180) |
Feb
(46) |
Mar
(68) |
Apr
(11) |
May
(36) |
Jun
(34) |
Jul
(113) |
Aug
(42) |
Sep
(71) |
Oct
(65) |
Nov
(116) |
Dec
(40) |
| 2003 |
Jan
(32) |
Feb
(92) |
Mar
(29) |
Apr
(102) |
May
(21) |
Jun
(34) |
Jul
(3) |
Aug
(60) |
Sep
(30) |
Oct
(62) |
Nov
(57) |
Dec
(33) |
| 2004 |
Jan
(28) |
Feb
(46) |
Mar
(16) |
Apr
(14) |
May
(31) |
Jun
(21) |
Jul
(10) |
Aug
(80) |
Sep
(42) |
Oct
(11) |
Nov
(28) |
Dec
(13) |
| 2005 |
Jan
(35) |
Feb
(26) |
Mar
(20) |
Apr
(118) |
May
(2) |
Jun
(5) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(13) |
Dec
(1) |
| 2006 |
Jan
(9) |
Feb
(25) |
Mar
(22) |
Apr
(6) |
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
(3) |
Oct
(46) |
Nov
(13) |
Dec
(7) |
| 2007 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
|
May
(6) |
Jun
(1) |
Jul
|
Aug
(11) |
Sep
(7) |
Oct
(8) |
Nov
(41) |
Dec
(3) |
| 2008 |
Jan
(27) |
Feb
(16) |
Mar
(13) |
Apr
(23) |
May
(39) |
Jun
(4) |
Jul
(7) |
Aug
(1) |
Sep
(13) |
Oct
(52) |
Nov
(44) |
Dec
(55) |
| 2009 |
Jan
(72) |
Feb
(69) |
Mar
|
Apr
|
May
|
Jun
(13) |
Jul
(1) |
Aug
(6) |
Sep
(15) |
Oct
(11) |
Nov
(31) |
Dec
(20) |
| 2010 |
Jan
(24) |
Feb
(21) |
Mar
(22) |
Apr
(40) |
May
(38) |
Jun
(4) |
Jul
(2) |
Aug
(22) |
Sep
(19) |
Oct
(14) |
Nov
(5) |
Dec
(8) |
| 2011 |
Jan
(14) |
Feb
(36) |
Mar
(6) |
Apr
|
May
|
Jun
(23) |
Jul
(13) |
Aug
(8) |
Sep
(7) |
Oct
|
Nov
(3) |
Dec
(9) |
| 2012 |
Jan
(17) |
Feb
(13) |
Mar
(10) |
Apr
|
May
(1) |
Jun
(14) |
Jul
(4) |
Aug
(12) |
Sep
(2) |
Oct
(24) |
Nov
(14) |
Dec
(2) |
| 2013 |
Jan
(4) |
Feb
(3) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(4) |
Jul
(7) |
Aug
|
Sep
(15) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
| 2014 |
Jan
|
Feb
(8) |
Mar
(1) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(7) |
Nov
(6) |
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(5) |
Mar
(8) |
Apr
(8) |
May
(2) |
Jun
|
Jul
(4) |
Aug
(7) |
Sep
(8) |
Oct
|
Nov
(6) |
Dec
(4) |
| 2016 |
Jan
(6) |
Feb
(26) |
Mar
(3) |
Apr
(10) |
May
(6) |
Jun
(5) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(4) |
Nov
(3) |
Dec
(10) |
| 2017 |
Jan
(11) |
Feb
(11) |
Mar
(2) |
Apr
(1) |
May
(7) |
Jun
(2) |
Jul
(11) |
Aug
(9) |
Sep
(5) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
(5) |
Feb
(2) |
Mar
(19) |
Apr
(7) |
May
(11) |
Jun
(3) |
Jul
(4) |
Aug
(10) |
Sep
(2) |
Oct
(8) |
Nov
(6) |
Dec
(9) |
| 2019 |
Jan
(9) |
Feb
(6) |
Mar
(2) |
Apr
(4) |
May
(6) |
Jun
(9) |
Jul
(6) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(9) |
| 2020 |
Jan
(15) |
Feb
(1) |
Mar
(18) |
Apr
(33) |
May
(43) |
Jun
(87) |
Jul
(45) |
Aug
(8) |
Sep
(43) |
Oct
(3) |
Nov
(5) |
Dec
(42) |
| 2021 |
Jan
(116) |
Feb
(40) |
Mar
(58) |
Apr
(48) |
May
(29) |
Jun
(2) |
Jul
|
Aug
(22) |
Sep
(18) |
Oct
(1) |
Nov
|
Dec
(3) |
| 2022 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(2) |
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
(6) |
Nov
(2) |
Dec
(9) |
| 2023 |
Jan
(10) |
Feb
|
Mar
|
Apr
(10) |
May
(3) |
Jun
(1) |
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
|
Nov
(2) |
Dec
(3) |
| 2024 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(5) |
Jun
(3) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(9) |
| 2025 |
Jan
(5) |
Feb
(5) |
Mar
|
Apr
(10) |
May
(20) |
Jun
(43) |
Jul
(24) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Stephane F. <f4...@us...> - 2001-01-28 22:06:20
|
Update of /cvsroot/hamlib/hamlib/icom
In directory usw-pr-cvs1:/tmp/cvs-serv821
Modified Files:
ic706.c icom.h
Log Message:
* added S-Meter calibration data
* added set_func capability
Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** ic706.c 2001/01/05 18:18:50 1.9
--- ic706.c 2001/01/28 22:06:11 1.10
***************
*** 62,66 ****
*/
const struct rig_caps ic706_caps = {
! RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_ALPHA,
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
--- 62,66 ----
*/
const struct rig_caps ic706_caps = {
! RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_UNTESTED,
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
***************
*** 109,113 ****
const struct rig_caps ic706mkii_caps = {
! RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_ALPHA,
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
--- 109,113 ----
const struct rig_caps ic706mkii_caps = {
! RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_UNTESTED,
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
***************
*** 218,221 ****
--- 218,222 ----
set_level: icom_set_level,
get_level: icom_get_level,
+ set_func: icom_set_func,
set_channel: icom_set_channel,
get_channel: icom_get_channel,
***************
*** 241,243 ****
--- 242,269 ----
*/
+ static const int mkiig_raw[STR_CAL_LENGTH] = {
+ 100, 104, 108, 111, 114, 118, 121, 125, 129, 133, 137, 142, 146, 151, 156, 161
+ };
+ static const int mkiig_db[STR_CAL_LENGTH] = {
+ -18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12
+ };
+
+ /*
+ * called by icom_init
+ * assume rig!=NULL, rig->state.priv!=NULL
+ */
+ int ic706mkiig_str_cal_init(RIG *rig)
+ {
+ int i;
+ struct icom_priv_data *p = (struct icom_priv_data *)rig->state.priv;
+
+ /*
+ * initialize the S Meter calibration table
+ */
+ for (i=0; i<STR_CAL_LENGTH; i++) {
+ p->str_cal_raw[i] = mkiig_raw[i];
+ p->str_cal_db[i] = mkiig_db[i];
+ }
+ return RIG_OK;
+ }
Index: icom.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** icom.h 2000/12/05 22:01:02 1.10
--- icom.h 2001/01/28 22:06:11 1.11
***************
*** 31,35 ****
--- 31,43 ----
#include <hamlib/rig.h>
+ /*
+ * defines used by comp_cal_str in rig.c
+ * STR_CAL_LENGTH is the lenght of the S Meter calibration table
+ * STR_CAL_S0 is the value in dB of the lowest value (not even in table)
+ */
+ #define STR_CAL_LENGTH 16
+ #define STR_CAL_S0 -54
+
struct ts_sc_list {
shortfreq_t ts; /* tuning step */
***************
*** 41,44 ****
--- 49,54 ----
int civ_731_mode; /* Off: freqs on 10 digits, On: freqs on 8 digits */
const struct ts_sc_list *ts_sc_list;
+ int str_cal_raw[STR_CAL_LENGTH];
+ int str_cal_db[STR_CAL_LENGTH];
};
***************
*** 67,70 ****
--- 77,81 ----
int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
+ int icom_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
int icom_set_channel(RIG *rig, const channel_t *chan);
int icom_get_channel(RIG *rig, channel_t *chan);
***************
*** 76,79 ****
--- 87,91 ----
extern const struct rig_caps ic706mkii_caps;
extern const struct rig_caps ic706mkiig_caps;
+ extern const struct rig_caps icr8500_caps;
extern int init_icom(void *be_handle);
|
|
From: Stephane F. <f4...@us...> - 2001-01-28 22:04:07
|
Update of /cvsroot/hamlib/hamlib/icom In directory usw-pr-cvs1:/tmp/cvs-serv677 Modified Files: Makefile.am Added Files: icr8500.c Log Message: * added new support for ICR8500, untested though ***** Error reading new file: [Errno 2] No such file or directory: 'icr8500.c' Index: Makefile.am =================================================================== RCS file: /cvsroot/hamlib/hamlib/icom/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.am 2000/10/22 15:55:00 1.3 --- Makefile.am 2001/01/28 22:03:57 1.4 *************** *** 1,6 **** lib_LTLIBRARIES = libhamlib-icom.la ! libhamlib_icom_la_SOURCES = ic706.c icom.c frame.c libhamlib_icom_la_LDFLAGS = -avoid-version # -module lib_LIBRARIES = libhamlib-icom.a ! libhamlib_icom_a_SOURCES = ic706.c icom.c frame.c noinst_HEADERS = frame.h icom.h icom_defs.h --- 1,6 ---- lib_LTLIBRARIES = libhamlib-icom.la ! libhamlib_icom_la_SOURCES = ic706.c icr8500.c icom.c frame.c libhamlib_icom_la_LDFLAGS = -avoid-version # -module lib_LIBRARIES = libhamlib-icom.a ! libhamlib_icom_a_SOURCES = ic706.c icr8500.c icom.c frame.c noinst_HEADERS = frame.h icom.h icom_defs.h |
|
From: Stephane F. <f4...@us...> - 2001-01-28 22:01:20
|
Update of /cvsroot/hamlib/hamlib
In directory usw-pr-cvs1:/tmp/cvs-serv482
Modified Files:
README
Log Message:
fixing typo
Index: README
===================================================================
RCS file: /cvsroot/hamlib/hamlib/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** README 2000/10/07 20:52:22 1.4
--- README 2001/01/28 22:01:10 1.5
***************
*** 35,39 ****
---------------------
! 1.libhamlib-ft747.so will provide connectivity to Yeasu
FT 747GX Transceiver via a standard API.
--- 35,39 ----
---------------------
! 1.libhamlib-ft747.so will provide connectivity to Yaesu
FT 747GX Transceiver via a standard API.
|
|
From: Frank S. <vk...@ix...> - 2001-01-24 00:00:24
|
> > There is already a hamlib/yaesu (correctly spelled). > > > > One too many cvs add perhaps ?? > > > > yep, a mistake of mine :( sorry about that. > BTW, is there a way to _remove_ this empty dir from the repository? > I wish there was a simple way. I have seen people grumble and use "prune" options. But what if we renamed the directory to begin with a dot "." and see if cvsweb can ignore it ? -- Cheers / Frank 73's de vk3fcs & km5ws |
|
From: Stephane F. <f4...@fr...> - 2001-01-23 18:35:12
|
> > > > 1. CVS: hamlib/yeasu - New directory (Stephane Fillod) > > > > There is already a hamlib/yaesu (correctly spelled). > > One too many cvs add perhaps ?? > yep, a mistake of mine :( sorry about that. BTW, is there a way to _remove_ this empty dir from the repository? > -- > Cheers / Frank -- Stephane |
|
From: Frank S. <vk...@ix...> - 2001-01-21 23:13:53
|
ham...@li... wrote: > > Send Hamlib-cvs-digest mailing list submissions to > ham...@li... > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.sourceforge.net/lists/listinfo/hamlib-cvs-digest > or, via email, send a message with subject or body 'help' to > ham...@li... > > You can reach the person managing the list at > ham...@li... > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Hamlib-cvs-digest digest..." > > Today's Topics: > > 1. CVS: hamlib/yeasu - New directory (Stephane Fillod) > Hi, I am not sure I understand the new hamlib/yeasu directory. There is already a hamlib/yaesu (correctly spelled). One too many cvs add perhaps ?? -- Cheers / Frank 73's de vk3fcs & km5ws |
|
From: Stephane F. <f4...@us...> - 2001-01-21 19:16:22
|
Update of /cvsroot/hamlib/hamlib/yeasu In directory usw-pr-cvs1:/tmp/cvs-serv17550/yeasu Log Message: Directory /cvsroot/hamlib/hamlib/yeasu added to the repository |
|
From: Frank S. <jav...@us...> - 2001-01-14 04:08:46
|
Update of /cvsroot/hamlib/hamlib In directory usw-pr-cvs1:/tmp/cvs-serv28586 Modified Files: ChangeLog Log Message: ChangeLog history started Index: ChangeLog =================================================================== RCS file: /cvsroot/hamlib/hamlib/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ChangeLog 2001/01/08 19:37:36 1.1 --- ChangeLog 2001/01/14 01:10:14 1.2 *************** *** 0 **** --- 1,1496 ---- + 2001-01-08 13:37 f4cfe + + * ChangeLog, LICENSE: Initial release + + 2001-01-07 17:02 javabear + + * yaesu/: ft847.c, ft847.h: minor cleanup + + 2001-01-06 00:49 javabear [...1467 lines suppressed...] + + 2000-07-18 16:19 frank + + * README.developer: [no log message] + + 2000-07-18 16:16 frank + + * README.developer: [no log message] + + 2000-07-18 16:09 frank + + * README.developer: Initial revision + + 2000-07-18 15:53 frank + + * README, TODO.skeleton, ft747/Makefile, ft747/README.ft747, + ft747/TODO.ft747, ft747/ft747.c, ft747/ft747.h, + ft747/test/Makefile, ft747/test/testlibft747.c, + ft747/test/testlibft747.h: Initial revision + |
|
From: Stephane F. <f4...@us...> - 2001-01-08 19:37:23
|
Update of /cvsroot/hamlib/hamlib In directory usw-pr-cvs1:/tmp/cvs-serv19527 Added Files: ChangeLog LICENSE Log Message: Initial release --- NEW FILE --- --- NEW FILE --- Hamlib - Ham Radio Control Libraries Copyright (C) 2000 Frank Singleton Copyright (C) 2000 Stephane Fillod This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA The included file 'COPYING' is a copy of the GNU General Public License. |
|
From: Frank S. <jav...@us...> - 2001-01-07 23:01:58
|
Update of /cvsroot/hamlib/hamlib/yaesu
In directory usw-pr-cvs1:/tmp/cvs-serv29777
Modified Files:
ft847.c ft847.h
Log Message:
minor cleanup
Index: ft847.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ft847.c 2001/01/06 06:49:40 1.3
--- ft847.c 2001/01/07 23:02:09 1.4
***************
*** 29,34 ****
/*
! * TODO - Remove static stuff, see ft747 for new style.
! * - create yaesu.h for common command structure etc..
* - add mode set before freq set to avoid prior mode offset (eg: CW)
*
--- 29,34 ----
/*
! * TODO - Remove static stuff, see ft747 for new style [started]
! * - create yaesu.h for common command structure etc..[started]
* - add mode set before freq set to avoid prior mode offset (eg: CW)
*
***************
*** 433,437 ****
}
! memcpy(&p->p_cmd,&ncmd[cmd_index].nseq,YAESU_CMD_LENGTH);
to_bcd_be(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
--- 433,437 ----
}
! memcpy(p->p_cmd,&ncmd[cmd_index].nseq,YAESU_CMD_LENGTH);
to_bcd_be(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
Index: ft847.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ft847.h 2001/01/04 07:03:58 1.2
--- ft847.h 2001/01/07 23:02:09 1.3
***************
*** 189,330 ****
- #if 0
-
- /*
- * Allow TX commands to be disabled
- *
- */
-
- #undef TX_ENABLED
-
- /*
- * RX Status Flags
- */
-
- const unsigned char RXSF_DISC_CENTER = (1<<5);
- const unsigned char RXSF_CTCSS_DCS_CODE = (1<<6);
- const unsigned char RXSF_SQUELCH_STATUS = (1<<7);
- const unsigned char RXSF_SMETER_MASK = 0x1f; /* bottom 5 bits */
-
- /*
- * TX Status Flags
- */
-
- const unsigned char TXSF_PTT_STATUS = (1<<7);
- const unsigned char TXSF_POALC_METER_MASK = 0x1f; /* bottom 5 bits */
-
-
-
- /*
- * MODES for READING and SETTING
- */
-
- #define MODE_LSB 0x00
- #define MODE_USB 0x01
- #define MODE_CW 0x02
- #define MODE_CWR 0x03
- #define MODE_AM 0x04
- #define MODE_FM 0x08
- #define MODE_CWN 0x82
- #define MODE_CWNR 0x83
- #define MODE_AMN 0x84
- #define MODE_FMN 0x88
-
- /*
- * Modes for setting CTCSS/DCS Mode
- *
- */
-
- const unsigned char DCS_ON = 0x0a;
- const unsigned char CTCSS_ENC_DEC_ON = 0x2a;
- const unsigned char CTCSS_ENC_ON = 0x4a;
- const unsigned char CTCSS_ENC_DEC_OFF = 0x2a;
-
-
-
-
- /*
- * Raw CAT command set
- *
- */
-
-
-
- void cmd_set_cat_on(int fd);
- void cmd_set_cat_off(int fd);
-
- void cmd_set_ptt_on(int fd);
- void cmd_set_ptt_off(int fd);
-
- void cmd_set_sat_on(int fd);
- void cmd_set_sat_off(int fd);
-
- void cmd_set_freq_main_vfo(int fd, unsigned char d1, unsigned char d2,
- unsigned char d3, unsigned char d4);
-
- void cmd_set_freq_sat_rx_vfo(int fd, unsigned char d1, unsigned char d2,
- unsigned char d3, unsigned char d4);
-
- void cmd_set_freq_sat_tx_vfo(int fd, unsigned char d1, unsigned char d2,
- unsigned char d3, unsigned char d4);
-
- void cmd_set_opmode_main_vfo(int fd, unsigned char d1);
- void cmd_set_opmode_sat_rx_vfo(int fd, unsigned char d1);
- void cmd_set_opmode_sat_tx_vfo(int fd, unsigned char d1);
-
- void cmd_set_ctcss_dcs_main_vfo(int fd, unsigned char d1);
- void cmd_set_ctcss_dcs_sat_rx_vfo(int fd, unsigned char d1);
- void cmd_set_ctcss_dcs_sat_tx_vfo(int fd, unsigned char d1);
-
- void cmd_set_ctcss_freq_main_vfo(int fd, unsigned char d1);
- void cmd_set_ctcss_freq_sat_rx_vfo(int fd, unsigned char d1);
- void cmd_set_ctcss_freq_sat_tx_vfo(int fd, unsigned char d1);
-
- void cmd_set_dcs_code_main_vfo(int fd, unsigned char d1, unsigned char d2);
- void cmd_set_dcs_code_sat_rx_vfo(int fd, unsigned char d1, unsigned char d2);
- void cmd_set_dcs_code_sat_tx_vfo(int fd, unsigned char d1, unsigned char d2);
-
- void cmd_set_repeater_shift_minus(int fd);
- void cmd_set_repeater_shift_plus(int fd);
- void cmd_set_repeater_shift_simplex(int fd);
-
- void cmd_set_repeater_offset(int fd, unsigned char d1, unsigned char d2,
- unsigned char d3, unsigned char d4);
-
- unsigned char cmd_get_rx_status(int fd);
- unsigned char cmd_get_tx_status(int fd);
-
- /*
- * Get frequency and mode info
- *
- */
-
-
- long int cmd_get_freq_mode_status_main_vfo(int fd, unsigned char *mode);
- long int cmd_get_freq_mode_status_sat_rx_vfo(int fd, unsigned char *mode);
- long int cmd_get_freq_mode_status_sat_tx_vfo(int fd, unsigned char *mode);
-
-
- /*
- * Set frequency in Hz and mode
- *
- */
-
- void cmd_set_freq_main_vfo_hz(int fd,long int freq, unsigned char mode);
- void cmd_set_freq_sat_rx_vfo_hz(int fd,long int freq, unsigned char mode);
- void cmd_set_freq_sat_tx_vfo_hz(int fd,long int freq, unsigned char mode);
-
-
- /*
- * Set Repeater offset in Hz.
- *
- */
-
- void cmd_set_repeater_offset_hz(int fd,long int freq);
-
- #endif /* 0 */
-
-
-
#endif /* _FT847_H */
--- 189,192 ----
|
|
From: Frank S. <jav...@us...> - 2001-01-06 06:49:35
|
Update of /cvsroot/hamlib/hamlib/yaesu
In directory usw-pr-cvs1:/tmp/cvs-serv4387
Modified Files:
ft747.c ft847.c
Log Message:
added targetable_vfo value to caps
Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft747.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ft747.c 2001/01/05 02:03:33 1.3
--- ft747.c 2001/01/06 06:49:40 1.4
***************
*** 129,133 ****
RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", RIG_STATUS_ALPHA,
RIG_TYPE_MOBILE, RIG_PTT_RIG, 4800, 4800, 8, 2, RIG_PARITY_NONE,
! RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0,FT747_FUNC_ALL,0,0,20,RIG_TRN_OFF,
{ {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
--- 129,133 ----
RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", RIG_STATUS_ALPHA,
RIG_TYPE_MOBILE, RIG_PTT_RIG, 4800, 4800, 8, 2, RIG_PARITY_NONE,
! RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0,FT747_FUNC_ALL,0,0,0,20,RIG_TRN_OFF,
{ {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
***************
*** 306,311 ****
rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq = %Li Hz \n", freq);
! ft747_set_vfo(rig, vfo); /* select VFO first , new API */
/*
--- 306,314 ----
rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq = %Li Hz \n", freq);
! /* frontend sets VFO now , if targetable_vfo = 0 */
+ #if 0
+ ft747_set_vfo(rig, vfo); /* select VFO first , new API */
+ #endif
/*
***************
*** 377,382 ****
return -RIG_EINVAL;
! ft747_set_vfo(rig, vfo); /* select VFO first , new API */
!
/*
* translate mode from generic to ft747 specific
--- 380,389 ----
return -RIG_EINVAL;
! /* frontend sets VFO now , if targetable_vfo = 0 */
!
! #if 0
! ft747_set_vfo(rig, vfo); /* select VFO first , new API */
! #endif
!
/*
* translate mode from generic to ft747 specific
***************
*** 597,600 ****
--- 604,608 ----
}
+
int ft747_set_ptt(RIG *rig,vfo_t vfo, ptt_t ptt) {
unsigned char cmd_index; /* index of sequence to send */
***************
*** 602,607 ****
--- 610,619 ----
if (!rig)
return -RIG_EINVAL;
+
+ /* frontend sets VFO now , if targetable_vfo = 0 */
+ #if 0
ft747_set_vfo(rig,vfo); /* select VFO first */
+ #endif
switch(ptt) {
Index: ft847.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ft847.c 2001/01/04 07:03:58 1.2
--- ft847.c 2001/01/06 06:49:40 1.3
***************
*** 186,190 ****
RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", RIG_STATUS_ALPHA,
RIG_TYPE_TRANSCEIVER,RIG_PTT_RIG, 4800, 57600, 8, 2, RIG_PARITY_NONE,
! RIG_HANDSHAKE_NONE,FT847_WRITE_DELAY ,FT847_POST_WRITE_DELAY, 100, 0, FT847_FUNC_ALL, 0, 0, 78, RIG_TRN_OFF,
{ {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */
{108000000,174000000,FT847_ALL_RX_MODES,-1,-1},
--- 186,190 ----
RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", RIG_STATUS_ALPHA,
RIG_TYPE_TRANSCEIVER,RIG_PTT_RIG, 4800, 57600, 8, 2, RIG_PARITY_NONE,
! RIG_HANDSHAKE_NONE,FT847_WRITE_DELAY ,FT847_POST_WRITE_DELAY, 100, 0, FT847_FUNC_ALL, 0, 0, 1, 78, RIG_TRN_OFF,
{ {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */
{108000000,174000000,FT847_ALL_RX_MODES,-1,-1},
***************
*** 453,456 ****
--- 453,461 ----
+
+ /*
+ * TODO -- add other VFO's
+ *
+ */
int ft847_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) {
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:24:16
|
Update of /cvsroot/hamlib/hamlib/src In directory usw-pr-cvs1:/tmp/cvs-serv1985 Modified Files: rig.c Log Message: * added targetable_vfo support in wrappers for rigs that cannot address directly VFOs Index: rig.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** rig.c 2000/12/22 00:56:00 1.12 --- rig.c 2001/01/05 18:24:20 1.13 *************** *** 64,69 **** --- 64,71 ---- "Command performed, but arg truncated, result not guaranteed", "Feature not available", + "Target VFO unaccessible", NULL, }; + #define ERROR_TBL_SZ (sizeof(rigerror_table)/sizeof(char *)) /** *************** [...1519 lines suppressed...] return -RIG_ENAVAIL; ! ! return rig->caps->get_trn(rig, vfo, trn); } *************** *** 1777,1782 **** if (rig->caps->get_info == NULL) return NULL; ! else ! return rig->caps->get_info(rig); } --- 2342,2347 ---- if (rig->caps->get_info == NULL) return NULL; ! ! return rig->caps->get_info(rig); } |
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:22:36
|
Update of /cvsroot/hamlib/hamlib/tests
In directory usw-pr-cvs1:/tmp/cvs-serv1854
Modified Files:
dumpcaps.c rigmatrix.c
Log Message:
* added targetable_vfo support
Index: dumpcaps.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/dumpcaps.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** dumpcaps.c 2000/11/28 22:34:37 1.7
--- dumpcaps.c 2001/01/05 18:22:40 1.8
***************
*** 141,148 ****
printf("Write delay %dms, timeout %dms, %d retry\n",
caps->write_delay,caps->timeout,caps->retry);
! printf("Post Write delay %dms \n",
caps->post_write_delay);
printf("Functions: ");
if (caps->has_func!=0) {
--- 141,151 ----
printf("Write delay %dms, timeout %dms, %d retry\n",
caps->write_delay,caps->timeout,caps->retry);
! printf("Post Write delay %dms\n",
caps->post_write_delay);
+ printf("Has targetable VFO: %s\n",
+ caps->targetable_vfo?"yes":"no");
+
printf("Functions: ");
if (caps->has_func!=0) {
***************
*** 171,175 ****
printf("Tuning steps:\n");
for (i=0; i<TSLSTSIZ && caps->tuning_steps[i].ts; i++) {
! printf("\t%liHz:\t%s\n",caps->tuning_steps[i].ts,
decode_modes(caps->tuning_steps[i].modes));
}
--- 174,178 ----
printf("Tuning steps:\n");
for (i=0; i<TSLSTSIZ && caps->tuning_steps[i].ts; i++) {
! printf("\t%8liHz:\t%s\n",caps->tuning_steps[i].ts,
decode_modes(caps->tuning_steps[i].modes));
}
Index: rigmatrix.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/rigmatrix.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** rigmatrix.c 2000/11/01 23:25:54 1.1
--- rigmatrix.c 2001/01/05 18:22:40 1.2
***************
*** 147,150 ****
--- 147,153 ----
#define print_yn(fn) printf("<TD>%c</TD>", (fn) ? 'Y':'N')
+ /* targetable_vfo is not a function, but a boolean */
+ print_yn(caps->targetable_vfo);
+
print_yn(caps->set_freq);
print_yn(caps->get_freq);
***************
*** 388,392 ****
printf("<TABLE BORDER=1>\n");
! printf("<TR><TD>Model</TD><TD>Set freq</TD><TD>Get freq</TD>"
"<TD>Set mode</TD><TD>Get mode</TD>"
"<TD>Set VFO</TD><TD>Get VFO</TD>"
--- 391,396 ----
printf("<TABLE BORDER=1>\n");
! printf("<TR><TD>Model</TD><TD>Target VFO</TD>"
! "<TD>Set freq</TD><TD>Get freq</TD>"
"<TD>Set mode</TD><TD>Get mode</TD>"
"<TD>Set VFO</TD><TD>Get VFO</TD>"
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:21:34
|
Update of /cvsroot/hamlib/hamlib/include/hamlib
In directory usw-pr-cvs1:/tmp/cvs-serv1764
Modified Files:
rig.h
Log Message:
* added targetable_vfo field in caps
Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** rig.h 2000/12/05 22:01:03 1.11
--- rig.h 2001/01/05 18:21:39 1.12
***************
*** 47,50 ****
--- 47,51 ----
#define RIG_ETRUNC 10 /* Command performed, but arg truncated */
#define RIG_ENAVAIL 11 /* function not available */
+ #define RIG_ENTARGET 12 /* VFO not targetable */
***************
*** 395,398 ****
--- 396,400 ----
setting_t has_level; /* bitwise OR'ed RIG_LEVEL_* */
setting_t has_set_level; /* bitwise OR'ed RIG_LEVEL_* */
+ int targetable_vfo;
int chan_qty; /* number of channels */
#if 0
***************
*** 531,534 ****
--- 533,537 ----
int transceive; /* wether the transceive mode is on */
int hold_decode;/* set to 1 to hold the event decoder (async) otherwise 0 */
+ int current_vfo;
/*
* Pointer to private data
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:20:45
|
Update of /cvsroot/hamlib/hamlib/kenwood
In directory usw-pr-cvs1:/tmp/cvs-serv1697
Modified Files:
ts870s.c
Log Message:
* added targetable_vfo field in caps
Index: ts870s.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/kenwood/ts870s.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ts870s.c 2000/12/23 08:40:14 1.1
--- ts870s.c 2001/01/05 18:20:50 1.2
***************
*** 57,66 ****
RIG_TYPE_TRANSCEIVER, RIG_PTT_RIG, 1200, 57600, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, TS870S_FUNC_ALL, TS870S_LEVEL_ALL,
! TS870S_LEVEL_ALL, 1000, RIG_TRN_ON,
{
{KHz(100),MHz(2040),TS870S_ALL_MODES,-1,-1},
{0,0,0,0,0},
}, /* rx range */
! { {0,0,0,0,0} }, /* no tx range, this is a scanner! */
{
{TS870S_ALL_MODES,50},
--- 57,66 ----
RIG_TYPE_TRANSCEIVER, RIG_PTT_RIG, 1200, 57600, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, TS870S_FUNC_ALL, TS870S_LEVEL_ALL,
! TS870S_LEVEL_ALL, 0, 1000, RIG_TRN_ON,
{
{KHz(100),MHz(2040),TS870S_ALL_MODES,-1,-1},
{0,0,0,0,0},
}, /* rx range */
! { {0,0,0,0,0} }, /* FIXME: no tx range yet! */
{
{TS870S_ALL_MODES,50},
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:20:23
|
Update of /cvsroot/hamlib/hamlib/icom
In directory usw-pr-cvs1:/tmp/cvs-serv1645
Modified Files:
icom.c frame.c
Log Message:
* icom_set_mode fixup (passband not done right)
Index: icom.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** icom.c 2000/12/05 22:01:02 1.11
--- icom.c 2001/01/05 18:20:27 1.12
***************
*** 359,363 ****
struct icom_priv_data *priv;
struct rig_state *rig_s;
! unsigned char ackbuf[16];
int ack_len,icmode;
--- 359,363 ----
struct icom_priv_data *priv;
struct rig_state *rig_s;
! unsigned char ackbuf[16],icmode_ext[1];
int ack_len,icmode;
***************
*** 367,371 ****
icmode = hamlib2icom_mode(mode,width);
! icom_transaction (rig, C_SET_MODE, icmode, NULL, 0, ackbuf, &ack_len);
if (ack_len != 1 || ackbuf[0] != ACK) {
--- 367,373 ----
icmode = hamlib2icom_mode(mode,width);
! icmode_ext[0] = (icmode>>8) & 0xff;
! icom_transaction (rig, C_SET_MODE, icmode & 0xff, icmode_ext,
! icmode_ext[0]?1:0, ackbuf, &ack_len);
if (ack_len != 1 || ackbuf[0] != ACK) {
Index: frame.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** frame.c 2000/12/04 23:39:17 1.6
--- frame.c 2001/01/05 18:20:27 1.7
***************
*** 212,216 ****
case RIG_MODE_FM:
icmode = width==RIG_PASSBAND_WIDE?S_WFM:S_FM;
! icmode_ext = width==RIG_PASSBAND_NARROW?0x01:0x00;
break;
default:
--- 212,216 ----
case RIG_MODE_FM:
icmode = width==RIG_PASSBAND_WIDE?S_WFM:S_FM;
! icmode_ext = width==RIG_PASSBAND_NARROW?0x02:0x00;
break;
default:
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:18:46
|
Update of /cvsroot/hamlib/hamlib/icom
In directory usw-pr-cvs1:/tmp/cvs-serv1378
Modified Files:
ic706.c
Log Message:
* added targetable_vfo field in caps
Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ic706.c 2000/11/28 22:26:20 1.8
--- ic706.c 2001/01/05 18:18:50 1.9
***************
*** 65,69 ****
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
! IC706_LEVEL_ALL, 101, RIG_TRN_ON,
{ {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
{ {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */
--- 65,69 ----
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
! IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON,
{ {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
{ {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */
***************
*** 112,116 ****
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
! IC706_LEVEL_ALL, 101, RIG_TRN_ON,
{ {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
{ {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */
--- 112,116 ----
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
! IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON,
{ {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
{ {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */
***************
*** 164,168 ****
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF,
! IC706_LEVEL_ALL, IC706_LEVEL_ALL, 101, RIG_TRN_ON,
{ {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, /* this trx also has UHF */
{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
--- 164,168 ----
RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE,
RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF,
! IC706_LEVEL_ALL, IC706_LEVEL_ALL, 0, 101, RIG_TRN_ON,
{ {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, /* this trx also has UHF */
{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
***************
*** 209,212 ****
--- 209,218 ----
icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo,
NULL,
+ /*
+ * FIXME:
+ * the use of the following GNU extension (field: value)
+ * is bad manner in portable code but admit it, quite handy
+ * when testing stuff. --SF
+ */
decode_event: icom_decode_event,
set_level: icom_set_level,
|
|
From: Stephane F. <f4...@us...> - 2001-01-05 18:18:13
|
Update of /cvsroot/hamlib/hamlib/aor
In directory usw-pr-cvs1:/tmp/cvs-serv1304
Modified Files:
ar8200.c
Log Message:
* added targetable_vfo field in caps
Index: ar8200.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/ar8200.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ar8200.c 2000/11/01 23:23:56 1.1
--- ar8200.c 2001/01/05 18:18:17 1.2
***************
*** 57,61 ****
RIG_TYPE_SCANNER, RIG_PTT_NONE, 9600, 19200, 8, 2, RIG_PARITY_NONE,
RIG_HANDSHAKE_XONXOFF, 0, 0, 2000, 3, AR8200_FUNC_ALL, AR8200_LEVEL_ALL,
! AR8200_LEVEL_ALL, 1000, RIG_TRN_ON,
{
{KHz(100),MHz(2040),AR8200_ALL_MODES,-1,-1},
--- 57,61 ----
RIG_TYPE_SCANNER, RIG_PTT_NONE, 9600, 19200, 8, 2, RIG_PARITY_NONE,
RIG_HANDSHAKE_XONXOFF, 0, 0, 2000, 3, AR8200_FUNC_ALL, AR8200_LEVEL_ALL,
! AR8200_LEVEL_ALL, 0, 1000, RIG_TRN_ON,
{
{KHz(100),MHz(2040),AR8200_ALL_MODES,-1,-1},
|
|
From: Frank S. <jav...@us...> - 2001-01-05 02:03:31
|
Update of /cvsroot/hamlib/hamlib/yaesu
In directory usw-pr-cvs1:/tmp/cvs-serv12062
Modified Files:
ft747.c
Log Message:
general cleanup, added _send_priv_cmd
Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft747.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ft747.c 2001/01/04 07:03:58 1.2
--- ft747.c 2001/01/05 02:03:33 1.3
***************
*** 31,40 ****
* TODO - FS
*
! * 1. Rentrant code, remove static stuff from all functions.
! * 2. rationalise code, more helper functions.
* 3. Allow cached reads
! * 4. Fix crappy 25Hz resolution handling
*
- *
*/
--- 31,40 ----
* TODO - FS
*
! * 1. Rentrant code, remove static stuff from all functions [started]
! * 2. rationalise code, more helper functions [started]
* 3. Allow cached reads
! * 4. Fix crappy 25Hz resolution handling of FT747 aaarrgh !
! * 5. Put variant of ftxxx_send_cmd in yaesu.c
*
*/
***************
*** 56,62 ****
! /* prototypes */
static int ft747_get_update_data(RIG *rig);
/* Native ft747 cmd set prototypes. These are READ ONLY as each */
--- 56,63 ----
! /* Private helper function prototypes */
static int ft747_get_update_data(RIG *rig);
+ static int ft747_send_priv_cmd(RIG *rig, unsigned char ci);
/* Native ft747 cmd set prototypes. These are READ ONLY as each */
***************
*** 205,212 ****
p = (struct ft747_priv_data*)malloc(sizeof(struct ft747_priv_data));
! if (!p) {
! /* whoops! memory shortage! */
return -RIG_ENOMEM;
- }
rig_debug(RIG_DEBUG_VERBOSE,"ft747:ft747_init called \n");
--- 206,211 ----
p = (struct ft747_priv_data*)malloc(sizeof(struct ft747_priv_data));
! if (!p) /* whoops! memory shortage! */
return -RIG_ENOMEM;
rig_debug(RIG_DEBUG_VERBOSE,"ft747:ft747_init called \n");
***************
*** 276,287 ****
int ft747_close(RIG *rig) {
! struct rig_state *rig_s;
!
if (!rig)
return -RIG_EINVAL;
-
- rig_s = &rig->state;
! /* TODO */
return RIG_OK;
--- 275,283 ----
int ft747_close(RIG *rig) {
!
if (!rig)
return -RIG_EINVAL;
! rig_debug(RIG_DEBUG_VERBOSE,"ft747:ft747_close called \n");
return RIG_OK;
***************
*** 339,342 ****
--- 335,340 ----
freq_t f;
+ rig_debug(RIG_DEBUG_VERBOSE,"ft747:ft747_get_freq called \n");
+
if (!rig)
return -RIG_EINVAL;
***************
*** 374,388 ****
int ft747_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width ) {
- struct rig_state *rig_s;
- struct ft747_priv_data *p;
- unsigned char *cmd; /* points to sequence to send */
unsigned char cmd_index; /* index of sequence to send */
if (!rig)
return -RIG_EINVAL;
!
! p = (struct ft747_priv_data*)rig->state.priv;
! rig_s = &rig->state;
!
ft747_set_vfo(rig, vfo); /* select VFO first , new API */
--- 372,380 ----
int ft747_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width ) {
unsigned char cmd_index; /* index of sequence to send */
if (!rig)
return -RIG_EINVAL;
!
ft747_set_vfo(rig, vfo); /* select VFO first , new API */
***************
*** 449,454 ****
*/
! cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: cmd_index = %i \n", cmd_index);
--- 441,445 ----
*/
! ft747_send_priv_cmd(rig,cmd_index);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: cmd_index = %i \n", cmd_index);
***************
*** 520,525 ****
struct rig_state *rig_s;
struct ft747_priv_data *p;
-
- unsigned char *cmd; /* points to sequence to send */
unsigned char cmd_index; /* index of sequence to send */
--- 511,514 ----
***************
*** 569,574 ****
*/
! cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
--- 558,562 ----
*/
! ft747_send_priv_cmd(rig,cmd_index);
return RIG_OK;
***************
*** 610,628 ****
int ft747_set_ptt(RIG *rig,vfo_t vfo, ptt_t ptt) {
- struct rig_state *rig_s;
- struct ft747_priv_data *p;
- unsigned char *cmd; /* points to sequence to send */
unsigned char cmd_index; /* index of sequence to send */
-
if (!rig)
return -RIG_EINVAL;
- p = (struct ft747_priv_data*)rig->state.priv;
- rig_s = &rig->state;
-
ft747_set_vfo(rig,vfo); /* select VFO first */
-
switch(ptt) {
case RIG_PTT_OFF:
--- 598,608 ----
***************
*** 640,645 ****
*/
! cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK; /* good */
--- 620,624 ----
*/
! ft747_send_priv_cmd(rig,cmd_index);
return RIG_OK; /* good */
***************
*** 679,712 ****
-
-
- #if 0
-
- /*
- * private helper function. Retrieves update data from rig.
- * Uses ft747_get_update_data() to get status flag
- */
-
- static int ft747_get_status_flags(RIG *rig, int sf_order) {
- struct rig_state *rig_s;
- struct ft747_priv_data *p;
- unsigned char status; /* ft747 status flags */
-
-
- if (!rig)
- return -RIG_EINVAL;
-
- p = (struct ft747_priv_data*)rig->state.priv;
- rig_s = &rig->state;
-
- ft747_get_update_data(rig); /* get whole shebang from rig */
-
- status = p->update_data[FT747_STATUS_UPDATE_STATUS_OFFSET];
-
- return status & SF_RXTX;
- }
-
- #endif
-
/*
* private helper function. Retrieves update data from rig.
--- 658,661 ----
***************
*** 719,726 ****
struct rig_state *rig_s;
struct ft747_priv_data *p;
! int n; /* counter */
!
! static unsigned char cmd_pace[] = { 0x00, 0x00, 0x00, 0x00, 0x0e }; /* pacing set */
! static unsigned char cmd_update[] = { 0x00, 0x00, 0x00, 0x00, 0x10 }; /* request update from rig */
if (!rig)
--- 668,673 ----
struct rig_state *rig_s;
struct ft747_priv_data *p;
! unsigned char *cmd; /* points to sequence to send */
! int n; /* for read_ */
if (!rig)
***************
*** 730,743 ****
rig_s = &rig->state;
! cmd_pace[3] = p->pacing; /* get pacing value */
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read pacing = %i \n",p->pacing);
! write_block(rig_s->fd, cmd_pace, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
! rig_debug(RIG_DEBUG_VERBOSE,"ft747: read timeout = %i \n",FT747_DEFAULT_READ_TIMEOUT);
! write_block(rig_s->fd, cmd_update, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay); /* request data */
! n = read_sleep(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT);
! /* n = read_block(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT); */
return 0;
--- 677,699 ----
rig_s = &rig->state;
! /*
! * Copy native cmd PACING to private cmd storage area
! */
!
! memcpy(&p->p_cmd,&ncmd[FT_747_NATIVE_PACING].nseq,YAESU_CMD_LENGTH);
! p->p_cmd[3] = p->pacing; /* get pacing value, and store in private cmd */
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read pacing = %i \n",p->pacing);
+
+ /* send PACING cmd to rig */
! cmd = p->p_cmd;
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
!
! /* send UPDATE comand to fetch data*/
! ft747_send_priv_cmd(rig,FT_747_NATIVE_UPDATE);
! /* n = read_sleep(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT); */
! n = read_block(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT);
return 0;
***************
*** 750,753 ****
--- 706,710 ----
* init_ft747 is called by rig_backend_load
*/
+
int init_ft747(void *be_handle) {
rig_debug(RIG_DEBUG_VERBOSE, "ft747: _init called\n");
***************
*** 756,758 ****
--- 713,750 ----
}
+
+
+ /*
+ * private helper function to send a private command
+ * sequence . Must only be complete sequences.
+ * TODO: place variant of this in yaesu.c
+ */
+
+ static int ft747_send_priv_cmd(RIG *rig, unsigned char ci) {
+
+ struct rig_state *rig_s;
+ struct ft747_priv_data *p;
+ unsigned char *cmd; /* points to sequence to send */
+ unsigned char cmd_index; /* index of sequence to send */
+
+ if (!rig)
+ return -RIG_EINVAL;
+
+
+ p = (struct ft747_priv_data*)rig->state.priv;
+ rig_s = &rig->state;
+
+ cmd_index = ci; /* get command */
+
+ if (! p->pcs[cmd_index].ncomp) {
+ rig_debug(RIG_DEBUG_VERBOSE,"ft747: Attempt to send incomplete sequence \n");
+ return -RIG_EINVAL;
+ }
+
+ cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
+ write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
+
+ return RIG_OK;
+
+ }
|
|
From: Frank S. <vk...@ix...> - 2001-01-04 07:07:21
|
Hi, I have moved the ft747 and ft847 code into the yaesu directory so I can start some code consolidation. Please use yaesu/ for further reference. I will remove the ft747 and ft847 directories soon. -- Cheers / Frank 73's de vk3fcs & km5ws |
|
From: Frank S. <jav...@us...> - 2001-01-04 07:03:58
|
Update of /cvsroot/hamlib/hamlib/yaesu
In directory usw-pr-cvs1:/tmp/cvs-serv12556
Modified Files:
ft747.c ft747.h ft847.c ft847.h
Log Message:
Begin to use common yaesu code
Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft747.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ft747.c 2001/01/04 05:39:03 1.1
--- ft747.c 2001/01/04 07:03:58 1.2
***************
*** 51,56 ****
#include <hamlib/riglist.h>
#include "serial.h"
- #include "ft747.h"
#include "misc.h"
--- 51,57 ----
#include <hamlib/riglist.h>
#include "serial.h"
#include "misc.h"
+ #include "yaesu.h"
+ #include "ft747.h"
***************
*** 65,69 ****
/* eg: mem number, or freq etc.. */
! static const ft747_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x01 } }, /* split = off */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x01 } }, /* split = on */
--- 66,70 ----
/* eg: mem number, or freq etc.. */
! static const yaesu_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x01 } }, /* split = off */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x01 } }, /* split = on */
***************
*** 191,204 ****
- /*
- * Function definitions below
- */
-
/*
! * setup *priv
! * serial port is already open (rig->state->fd)
*
- *
- *
*/
--- 192,198 ----
/*
! * _init
*
*/
***************
*** 239,242 ****
--- 233,237 ----
* the serial port is closed by the frontend
*/
+
int ft747_cleanup(RIG *rig) {
if (!rig)
***************
*** 322,326 ****
*/
! memcpy(&p->p_cmd,&ncmd[FT_747_NATIVE_FREQ_SET].nseq,FT747_CMD_LENGTH);
to_bcd(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
--- 317,321 ----
*/
! memcpy(&p->p_cmd,&ncmd[FT_747_NATIVE_FREQ_SET].nseq,YAESU_CMD_LENGTH);
to_bcd(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
***************
*** 330,334 ****
cmd = p->p_cmd; /* get native sequence */
! write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
--- 325,329 ----
cmd = p->p_cmd; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
***************
*** 455,459 ****
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: cmd_index = %i \n", cmd_index);
--- 450,454 ----
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: cmd_index = %i \n", cmd_index);
***************
*** 575,579 ****
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
--- 570,574 ----
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
***************
*** 646,650 ****
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK; /* good */
--- 641,645 ----
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK; /* good */
***************
*** 738,746 ****
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read pacing = %i \n",p->pacing);
! write_block(rig_s->fd, cmd_pace, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read timeout = %i \n",FT747_DEFAULT_READ_TIMEOUT);
! write_block(rig_s->fd, cmd_update, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay); /* request data */
n = read_sleep(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT);
/* n = read_block(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT); */
--- 733,741 ----
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read pacing = %i \n",p->pacing);
! write_block(rig_s->fd, cmd_pace, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
rig_debug(RIG_DEBUG_VERBOSE,"ft747: read timeout = %i \n",FT747_DEFAULT_READ_TIMEOUT);
! write_block(rig_s->fd, cmd_update, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay); /* request data */
n = read_sleep(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT);
/* n = read_block(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT); */
***************
*** 749,905 ****
}
-
- /*
- * TODO: Implement these old OPCODES -- FS
- */
-
-
- #if 0
-
- void ft747_cmd_set_split_yes(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x01 }; /* split = on */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_split_no(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x01 }; /* split = off */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_recall_memory(int fd, int mem) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x02 }; /* recall memory*/
-
- data[3] = mem;
- write_block(fd,data);
- }
-
- void ft747_cmd_set_vfo_to_memory(int fd, int mem) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x03 }; /* vfo to memory*/
-
- data[3] = mem;
- write_block(fd,data);
- }
-
- void ft747_cmd_set_dlock_off(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x04 }; /* dial lock = off */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_dlock_on(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x04 }; /* dial lock = on */
- write_block(fd,data);
-
- }
-
-
- void ft747_cmd_set_select_vfo_a(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x05 }; /* select vfo A */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_select_vfo_b(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x05 }; /* select vfo B */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_memory_to_vfo(int fd, int mem) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x06 }; /* memory to vfo*/
-
- data[3] = mem;
- write_block(fd,data);
- }
-
- void ft747_cmd_set_up500k(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x07 }; /* up 500 khz */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_down500k(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x08 }; /* down 500 khz */
- write_block(fd,data);
- }
-
- void ft747_cmd_set_clarify_off(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x09 }; /* clarify off */
- write_block(fd,data);
- printf("ft747_cmd_clarify_off complete \n");
- }
-
- void ft747_cmd_set_clarify_on(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x09 }; /* clarify on */
- write_block(fd,data);
- }
-
-
- void ft747_cmd_set_freq(int fd, unsigned int freq) {
- printf("ft747_cmd_freq_set not implemented yet \n");
- }
-
-
- void ft747_cmd_set_mode(int fd, int mode) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x0c }; /* mode set */
-
- data[3] = mode;
- write_block(fd,data);
-
- }
-
- void ft747_cmd_set_pacing(int fd, int delay) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x0e }; /* pacing set */
-
- data[3] = delay;
- write_block(fd,data);
-
- }
-
- void ft747_cmd_set_ptt_off(int fd) {
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x0f }; /* ptt off */
- write_block(fd,data);
-
- }
-
- void ft747_cmd_set_ptt_on(int fd) {
-
- #ifdef TX_ENABLED
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x0f }; /* ptt on */
- write_block(fd,data);
- printf("ft747_cmd_ptt_on complete \n");
- #elsif
- printf("ft747_cmd_ptt_on disabled \n");
- #endif
-
- }
-
- /*
- * Read data from rig and store in buffer provided
- * by the user.
- */
-
- void ft747_cmd_get_update_store(int fd, unsigned char *buffer) {
- int n; /* counter */
-
- static unsigned char data[] = { 0x00, 0x00, 0x00, 0x00, 0x10 }; /* request update from rig */
-
- write_block(fd,data);
- n = read_sleep(fd,buffer,FT747_STATUS_UPDATE_SIZE); /* wait and read for bytes to be read */
-
- return;
- }
-
-
-
- /*
- * Private helper cmd to copy a native cmd sequence to priv
- */
-
- static void build_cmd(unsigned char *dst, int command){
- int i;
- for(i=0; i<FT747_CMD_LENGTH; i++) {
- dst[i] = ncmd[command].nseq[i]; /* lookup native cmd and build sequence */
- }
- return;
- }
- #endif
-
--- 744,747 ----
Index: ft747.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft747.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ft747.h 2001/01/04 05:39:03 1.1
--- ft747.h 2001/01/04 07:03:58 1.2
***************
*** 31,35 ****
#define _FT747_H 1
- #define FT747_CMD_LENGTH 5
#define FT747_STATUS_UPDATE_DATA_LENGTH 345
--- 31,34 ----
***************
*** 107,122 ****
- /*
- * Basic Data structure for FT747 native cmd set
- */
-
- struct ft747_cmd_set {
- unsigned char ncomp; /* 1 = complete, 0 = incomplete, needs extra info */
- unsigned char nseq[5]; /* native cmd sequence */
- };
-
- typedef struct ft747_cmd_set ft747_cmd_set_t;
-
-
/* Internal MODES - when setting modes via cmd_mode_set() */
--- 106,109 ----
***************
*** 198,203 ****
unsigned int read_update_delay; /* depends on pacing value */
unsigned char current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A or RIG_VFO_B only */
! unsigned char p_cmd[FT747_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
! ft747_cmd_set_t pcs[FT_747_NATIVE_SIZE]; /* private cmd set */
unsigned char update_data[FT747_STATUS_UPDATE_DATA_LENGTH]; /* returned data */
};
--- 185,190 ----
unsigned int read_update_delay; /* depends on pacing value */
unsigned char current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A or RIG_VFO_B only */
! unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
! yaesu_cmd_set_t pcs[FT_747_NATIVE_SIZE]; /* private cmd set */
unsigned char update_data[FT747_STATUS_UPDATE_DATA_LENGTH]; /* returned data */
};
***************
*** 264,308 ****
const float band_data[11] = { 0.0, 0.1, 2.5, 4.0, 7.5, 10.5, 14.5, 18.5, 21.5, 25.0, 30.0 };
-
- /*
- * Visible functions in shared lib.
- *
- */
-
- /*
- * set commands
- */
-
-
-
-
- void cmd_set_split_yes(int fd);
- void cmd_set_split_no(int fd);
- void cmd_set_recall_memory(int fd, int mem);
- void cmd_set_vfo_to_memory(int fd, int mem);
- void cmd_set_dlock_off(int fd);
- void cmd_set_dlock_on(int fd);
- void cmd_set_select_vfo_a(int fd);
- void cmd_set_select_vfo_b(int fd);
- void cmd_set_memory_to_vfo(int fd, int mem);
- void cmd_set_up500k(int fd);
- void cmd_set_down500k(int fd);
- void cmd_set_clarify_off(int fd);
- void cmd_set_clarify_on(int fd);
-
- /*
- *void cmd_set_freq(int fd, unsigned int freq);
- */
-
- void cmd_set_mode(int fd, int mode);
- void cmd_set_pacing(int fd, int delay);
- void cmd_set_ptt_off(int fd);
- void cmd_set_ptt_on(int fd); /* careful.. */
-
- /*
- * get commands
- */
-
- void cmd_get_update_store(int fd, unsigned char *buffer); /* data external */
#endif
--- 251,254 ----
Index: ft847.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ft847.c 2001/01/04 05:39:03 1.1
--- ft847.c 2001/01/04 07:03:58 1.2
***************
*** 58,61 ****
--- 58,62 ----
#include <hamlib/riglist.h>
#include "serial.h"
+ #include "yaesu.h"
#include "ft847.h"
#include "misc.h"
***************
*** 72,76 ****
/* eg: mem number, or freq etc.. */
! static const ft847_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* CAT = On */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x80 } }, /* CAT = Off */
--- 73,77 ----
/* eg: mem number, or freq etc.. */
! static const yaesu_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* CAT = On */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x80 } }, /* CAT = Off */
***************
*** 375,379 ****
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, FT847_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
--- 376,380 ----
cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
***************
*** 432,436 ****
}
! memcpy(&p->p_cmd,&ncmd[cmd_index].nseq,FT847_CMD_LENGTH);
to_bcd_be(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
--- 433,437 ----
}
! memcpy(&p->p_cmd,&ncmd[cmd_index].nseq,YAESU_CMD_LENGTH);
to_bcd_be(p->p_cmd,freq/10,8); /* store bcd format in in p_cmd */
***************
*** 440,444 ****
cmd = p->p_cmd; /* get native sequence */
! write_block(rig_s->fd, cmd, FT847_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
--- 441,445 ----
cmd = p->p_cmd; /* get native sequence */
! write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
Index: ft847.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/yaesu/ft847.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ft847.h 2001/01/04 05:39:03 1.1
--- ft847.h 2001/01/04 07:03:58 1.2
***************
*** 30,34 ****
- #define FT847_CMD_LENGTH 5
#define FT847_WRITE_DELAY 50
--- 30,33 ----
***************
*** 145,167 ****
- /*
- * TODO -- Move this to common yaesu.h file -- FS
- *
- */
-
- /*
- * Basic Data structure for FT847 native cmd set
- */
-
-
-
- struct ft847_cmd_set {
- unsigned char ncomp; /* 1 = complete, 0 = incomplete, needs extra info */
- unsigned char nseq[5]; /* native cmd sequence */
- };
-
- typedef struct ft847_cmd_set ft847_cmd_set_t;
-
-
/*
--- 144,147 ----
***************
*** 172,177 ****
struct ft847_priv_data {
unsigned char current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */
! unsigned char p_cmd[FT847_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
! ft847_cmd_set_t pcs[FT_847_NATIVE_SIZE]; /* private cmd set */
unsigned char rx_status; /* tx returned data */
unsigned char tx_status; /* rx returned data */
--- 152,157 ----
struct ft847_priv_data {
unsigned char current_vfo; /* active VFO from last cmd , can be either RIG_VFO_A, SAT_RX, SAT_TX */
! unsigned char p_cmd[YAESU_CMD_LENGTH]; /* private copy of 1 constructed CAT cmd */
! yaesu_cmd_set_t pcs[FT_847_NATIVE_SIZE]; /* private cmd set */
unsigned char rx_status; /* tx returned data */
unsigned char tx_status; /* rx returned data */
|
|
From: Frank S. <jav...@us...> - 2001-01-04 05:47:31
|
Update of /cvsroot/hamlib/hamlib/tests In directory usw-pr-cvs1:/tmp/cvs-serv6410 Modified Files: Makefile.am Log Message: common yaesu dir Index: Makefile.am =================================================================== RCS file: /cvsroot/hamlib/hamlib/tests/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.am 2000/11/28 22:35:28 1.7 --- Makefile.am 2001/01/04 05:47:31 1.8 *************** *** 6,24 **** ## Linker options ! listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ! dumpcaps_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ! testrig_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la ! testtrn_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la ! rigctl_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la # rigmatrix needs also libgd ! rigmatrix_LDADD = -lgd ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ## Dependencies ! dumpcaps_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ! testrig_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! testtrn_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ! rigctl_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! rigmatrix_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ## Source list --- 6,31 ---- ## Linker options ! listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ! dumpcaps_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ! testrig_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la ! testtrn_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la ! rigctl_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la # rigmatrix needs also libgd ! rigmatrix_LDADD = -lgd ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../yaesu/libhamlib-ft747.la "-dlopen" ../yaesu/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la ## Dependencies ! #dumpcaps_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ! #testrig_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! #testtrn_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! #listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ! #rigctl_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ! #rigmatrix_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la ! ! dumpcaps_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ../aor/libhamlib-aor.la ! testrig_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ! testtrn_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ! listrigs_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ../aor/libhamlib-aor.la ! rigctl_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ! rigmatrix_DEPENDENCIES = ../icom/libhamlib-icom.la ../yaesu/libhamlib-ft747.la ../yaesu/libhamlib-ft847.la ../aor/libhamlib-aor.la ## Source list |
|
From: Frank S. <jav...@us...> - 2001-01-04 05:41:12
|
Update of /cvsroot/hamlib/hamlib In directory usw-pr-cvs1:/tmp/cvs-serv5906 Modified Files: Makefile.am configure.in Log Message: common yaesu handling Index: Makefile.am =================================================================== RCS file: /cvsroot/hamlib/hamlib/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.am 2001/01/03 23:10:15 1.5 --- Makefile.am 2001/01/04 05:41:12 1.6 *************** *** 1,4 **** EXTRA_DIST = PLAN TODO ! SUBDIRS = include src icom ft747 ft847 kenwood aor tests doc hamlibdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE --- 1,4 ---- EXTRA_DIST = PLAN TODO ! SUBDIRS = include src icom kenwood aor yaesu tests doc hamlibdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE Index: configure.in =================================================================== RCS file: /cvsroot/hamlib/hamlib/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** configure.in 2001/01/03 23:14:24 1.7 --- configure.in 2001/01/04 05:41:12 1.8 *************** *** 107,111 **** AC_SUBST(DLL_PRELOAD) ! AC_OUTPUT( ft747/Makefile ft847/Makefile icom/Makefile aor/Makefile \ kenwood/Makefile \ Makefile include/Makefile include/hamlib/Makefile src/Makefile \ --- 107,111 ---- AC_SUBST(DLL_PRELOAD) ! AC_OUTPUT( yaesu/Makefile icom/Makefile aor/Makefile \ kenwood/Makefile \ Makefile include/Makefile include/hamlib/Makefile src/Makefile \ |
|
From: Frank S. <jav...@us...> - 2001-01-04 05:39:03
|
Update of /cvsroot/hamlib/hamlib/yaesu In directory usw-pr-cvs1:/tmp/cvs-serv5746 Added Files: ft747.c ft747.h ft847.c ft847.h Log Message: Moved from ft747 and ft847 dirs ***** Error reading new file: [Errno 2] No such file or directory: 'ft747.c' ***** Error reading new file: [Errno 2] No such file or directory: 'ft747.h' ***** Error reading new file: [Errno 2] No such file or directory: 'ft847.c' ***** Error reading new file: [Errno 2] No such file or directory: 'ft847.h' |
|
From: Frank S. <jav...@us...> - 2001-01-04 04:42:13
|
Update of /cvsroot/hamlib/hamlib/yaesu In directory usw-pr-cvs1:/tmp/cvs-serv2181 Added Files: Makefile.am Log Message: Initial yaesu Makefile --- NEW FILE --- lib_LTLIBRARIES = libhamlib-ft747.la libhamlib-ft847.la libhamlib_ft747_la_SOURCES = ft747.c libhamlib_ft847_la_SOURCES = ft847.c libhamlib_ft747_la_LDFLAGS = -avoid-version # -module libhamlib_ft847_la_LDFLAGS = -avoid-version # -module lib_LIBRARIES = libhamlib-ft747.a libhamlib-ft847.a libhamlib_ft747_a_SOURCES = ft747.c libhamlib_ft847_a_SOURCES = ft847.c noinst_HEADERS = ft747.h ft847.h yaesu.h |
4 messages has been excluded from this view by a project administrator.
