Begin to use common yaesu code

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@313 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.1
Frank Singleton, VK3FCS 2001-01-04 07:03:58 +00:00
rodzic ae9337e5a4
commit ec385ea53f
4 zmienionych plików z 25 dodań i 256 usunięć

Wyświetl plik

@ -7,7 +7,7 @@
* box (FIF-232C) or similar
*
*
* $Id: ft747.c,v 1.1 2001-01-04 05:39:03 javabear Exp $
* $Id: ft747.c,v 1.2 2001-01-04 07:03:58 javabear Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -50,8 +50,9 @@
#include <hamlib/rig.h>
#include <hamlib/riglist.h>
#include "serial.h"
#include "ft747.h"
#include "misc.h"
#include "yaesu.h"
#include "ft747.h"
/* prototypes */
@ -64,7 +65,7 @@ static int ft747_get_update_data(RIG *rig);
/* Incomplete sequences (0) must be completed with extra parameters */
/* eg: mem number, or freq etc.. */
static const ft747_cmd_set_t ncmd[] = {
static const yaesu_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x01 } }, /* split = off */
{ 1, { 0x00, 0x00, 0x00, 0x01, 0x01 } }, /* split = on */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0x02 } }, /* recall memory*/
@ -191,14 +192,7 @@ const struct rig_caps ft747_caps = {
/*
* Function definitions below
*/
/*
* setup *priv
* serial port is already open (rig->state->fd)
*
*
* _init
*
*/
@ -238,6 +232,7 @@ int ft747_init(RIG *rig) {
* ft747_cleanup routine
* the serial port is closed by the frontend
*/
int ft747_cleanup(RIG *rig) {
if (!rig)
return -RIG_EINVAL;
@ -321,7 +316,7 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
* Copy native cmd freq_set to private cmd storage area
*/
memcpy(&p->p_cmd,&ncmd[FT_747_NATIVE_FREQ_SET].nseq,FT747_CMD_LENGTH);
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 */
/* TODO -- fix 10Hz resolution -- FS */
@ -329,7 +324,7 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq after conversion = %Li Hz \n", from_bcd(p->p_cmd,8)* 10 );
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);
write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
}
@ -454,7 +449,7 @@ int ft747_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width ) {
*/
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);
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);
@ -574,7 +569,7 @@ int ft747_set_vfo(RIG *rig, vfo_t vfo) {
*/
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);
write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
@ -645,7 +640,7 @@ int ft747_set_ptt(RIG *rig,vfo_t vfo, ptt_t ptt) {
*/
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);
write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK; /* good */
}
@ -737,11 +732,11 @@ static int ft747_get_update_data(RIG *rig) {
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, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
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, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay); /* request data */
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,159 +744,6 @@ static int ft747_get_update_data(RIG *rig) {
}
/*
* 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
/*

Wyświetl plik

@ -7,7 +7,7 @@
* box (FIF-232C) or similar (max232 + some capacitors :-)
*
*
* $Id: ft747.h,v 1.1 2001-01-04 05:39:03 javabear Exp $
* $Id: ft747.h,v 1.2 2001-01-04 07:03:58 javabear Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -30,7 +30,6 @@
#ifndef _FT747_H
#define _FT747_H 1
#define FT747_CMD_LENGTH 5
#define FT747_STATUS_UPDATE_DATA_LENGTH 345
#define FT747_PACING_INTERVAL 5
@ -106,18 +105,6 @@ enum ft747_native_cmd_e {
typedef enum ft747_native_cmd_e ft747_native_cmd_t;
/*
* 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() */
@ -197,8 +184,8 @@ struct ft747_priv_data {
unsigned char pacing; /* pacing value */
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 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,47 +251,6 @@ int ft747_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
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

Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an FT-847 using the "CAT" interface.
*
*
* $Id: ft847.c,v 1.1 2001-01-04 05:39:03 javabear Exp $
* $Id: ft847.c,v 1.2 2001-01-04 07:03:58 javabear Exp $
*
*
*
@ -57,6 +57,7 @@
#include <hamlib/rig.h>
#include <hamlib/riglist.h>
#include "serial.h"
#include "yaesu.h"
#include "ft847.h"
#include "misc.h"
@ -71,7 +72,7 @@ static int ft847_send_priv_cmd(RIG *rig, unsigned char ci);
/* Incomplete sequences (0) must be completed with extra parameters */
/* eg: mem number, or freq etc.. */
static const ft847_cmd_set_t ncmd[] = {
static const yaesu_cmd_set_t ncmd[] = {
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x00 } }, /* CAT = On */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x80 } }, /* CAT = Off */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x08 } }, /* ptt on */
@ -374,7 +375,7 @@ static int ft847_send_priv_cmd(RIG *rig, unsigned char ci) {
}
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);
write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
@ -431,7 +432,7 @@ int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
return -RIG_EINVAL; /* sorry, wrong VFO */
}
memcpy(&p->p_cmd,&ncmd[cmd_index].nseq,FT847_CMD_LENGTH);
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 */
/* TODO -- fix 10Hz resolution -- FS */
@ -439,7 +440,7 @@ int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq) {
rig_debug(RIG_DEBUG_VERBOSE,"ft847: requested freq after conversion = %Li Hz \n", from_bcd_be(p->p_cmd,8)* 10 );
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);
write_block(rig_s->fd, cmd, YAESU_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
return RIG_OK;
}

Wyświetl plik

@ -6,7 +6,7 @@
* via serial interface to an FT-847 using the "CAT" interface.
*
*
* $Id: ft847.h,v 1.1 2001-01-04 05:39:03 javabear Exp $
* $Id: ft847.h,v 1.2 2001-01-04 07:03:58 javabear Exp $
*
*
* This program is free software; you can redistribute it and/or
@ -29,7 +29,6 @@
#define _FT847_H 1
#define FT847_CMD_LENGTH 5
#define FT847_WRITE_DELAY 50
/* Sequential fast writes may confuse FT847 without this delay */
@ -144,25 +143,6 @@ enum ft847_native_cmd_e {
typedef enum ft847_native_cmd_e ft847_native_cmd_t;
/*
* 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;
/*
* ft847 instance - private data
@ -171,8 +151,8 @@ typedef struct ft847_cmd_set ft847_cmd_set_t;
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 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 */
unsigned char fm_status_main; /* freq and mode ,returned data */