serial_rate_max and other misc fixes

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2419 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.8
Stéphane Fillod, F8CFE 2008-10-25 14:00:52 +00:00
rodzic cdab2cce53
commit d84fe82d47
5 zmienionych plików z 45 dodań i 34 usunięć

Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-725 and variations * Hamlib CI-V backend - description of IC-725 and variations
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ic725.c,v 1.6 2005-04-03 19:53:51 fillods Exp $ * $Id: ic725.c,v 1.7 2008-10-25 14:00:52 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -59,15 +59,15 @@ const struct rig_caps ic725_caps = {
.rig_model = RIG_MODEL_IC725, .rig_model = RIG_MODEL_IC725,
.model_name = "IC-725", .model_name = "IC-725",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 1200, .serial_rate_min = 1200,
.serial_rate_max = 1200, .serial_rate_max = 9600,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,

Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-735 and variations * Hamlib CI-V backend - description of IC-735 and variations
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ic735.c,v 1.7 2005-04-03 19:53:51 fillods Exp $ * $Id: ic735.c,v 1.8 2008-10-25 14:00:52 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -28,6 +28,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "icom.h" #include "icom.h"
#include "bandplan.h"
#define IC735_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM) #define IC735_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM)
@ -42,7 +43,8 @@
#define IC735_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) #define IC735_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO)
#define IC735_STR_CAL { 0, { } } #define IC735_ANTS RIG_ANT_1
/* /*
*/ */
@ -56,15 +58,15 @@ const struct rig_caps ic735_caps = {
.rig_model = RIG_MODEL_IC735, .rig_model = RIG_MODEL_IC735,
.model_name = "IC-735", .model_name = "IC-735",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 1200, .serial_rate_min = 1200,
.serial_rate_max = 1200, .serial_rate_max = 9600,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
@ -96,13 +98,17 @@ const struct rig_caps ic735_caps = {
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { .chan_list = {
{ 1, 10, RIG_MTYPE_MEM }, { 1, 10, RIG_MTYPE_MEM, IC_MIN_MEM_CAP },
{ 11, 12, RIG_MTYPE_EDGE }, { 11, 12, RIG_MTYPE_EDGE, IC_MIN_MEM_CAP },
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = { {kHz(30),MHz(30),IC735_ALL_RX_MODES,-1,-1,IC735_VFO_ALL},
.tx_range_list1 = { RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC735_OTHER_TX_MODES, W(10),W(100),IC735_VFO_ALL,IC735_ANTS),
FRQ_RNG_HF(1,IC735_AM_TX_MODES, W(10),W(40),IC735_VFO_ALL,IC735_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(30),IC735_ALL_RX_MODES,-1,-1,IC735_VFO_ALL}, .rx_range_list2 = { {kHz(30),MHz(30),IC735_ALL_RX_MODES,-1,-1,IC735_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },
@ -134,6 +140,7 @@ const struct rig_caps ic735_caps = {
.filters = { .filters = {
{RIG_MODE_SSB|RIG_MODE_CW, kHz(2.4)}, {RIG_MODE_SSB|RIG_MODE_CW, kHz(2.4)},
{RIG_MODE_AM, kHz(8)}, {RIG_MODE_AM, kHz(8)},
{RIG_MODE_FM, kHz(15)},
RIG_FLT_END, RIG_FLT_END,
}, },

Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-761 and variations * Hamlib CI-V backend - description of IC-761 and variations
* Copyright (c) 2000-2006 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ic761.c,v 1.3 2006-02-26 19:22:31 fillods Exp $ * $Id: ic761.c,v 1.4 2008-10-25 14:00:52 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -59,7 +59,7 @@ const struct rig_caps ic761_caps = {
.rig_model = RIG_MODEL_IC761, .rig_model = RIG_MODEL_IC761,
.model_name = "IC-761", .model_name = "IC-761",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -67,7 +67,7 @@ const struct rig_caps ic761_caps = {
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 1200, .serial_rate_min = 1200,
.serial_rate_max = 1200, .serial_rate_max = 9600,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,

Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-775 and variations * Hamlib CI-V backend - description of IC-775 and variations
* Copyright (c) 2000-2002 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ic775.c,v 1.6 2005-04-03 19:53:51 fillods Exp $ * $Id: ic775.c,v 1.7 2008-10-25 14:00:52 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -28,7 +28,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#include "icom.h" #include "icom.h"
#include "bandplan.h"
#define IC775_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM) #define IC775_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_FM)
#define IC775_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM) #define IC775_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM)
@ -44,7 +44,7 @@
#define IC775_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO) #define IC775_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO)
#define IC775_STR_CAL { 0, { } } #define IC775_ANTS RIG_ANT_1
/* /*
*/ */
@ -58,7 +58,7 @@ const struct rig_caps ic775_caps = {
.rig_model = RIG_MODEL_IC775, .rig_model = RIG_MODEL_IC775,
.model_name = "IC-775", .model_name = "IC-775",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_UNTESTED, .status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -66,7 +66,7 @@ const struct rig_caps ic775_caps = {
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 1200, .serial_rate_min = 1200,
.serial_rate_max = 1200, .serial_rate_max = 19200,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,
@ -98,13 +98,17 @@ const struct rig_caps ic775_caps = {
.chan_desc_sz = 0, .chan_desc_sz = 0,
.chan_list = { .chan_list = {
{ 1, 10, RIG_MTYPE_MEM }, { 1, 10, RIG_MTYPE_MEM, IC_MIN_MEM_CAP },
{ 11, 12, RIG_MTYPE_EDGE }, { 11, 12, RIG_MTYPE_EDGE, IC_MIN_MEM_CAP },
RIG_CHAN_END, RIG_CHAN_END,
}, },
.rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .rx_range_list1 = { {kHz(30),MHz(30),IC775_ALL_RX_MODES,-1,-1,IC775_VFO_ALL},
.tx_range_list1 = { RIG_FRNG_END, }, RIG_FRNG_END, },
.tx_range_list1 = {
FRQ_RNG_HF(1,IC775_OTHER_TX_MODES, W(10),W(100),IC775_VFO_ALL,IC775_ANTS),
FRQ_RNG_HF(1,IC775_AM_TX_MODES, W(10),W(40),IC775_VFO_ALL,IC775_ANTS), /* AM class */
RIG_FRNG_END, },
.rx_range_list2 = { {kHz(30),MHz(30),IC775_ALL_RX_MODES,-1,-1,IC775_VFO_ALL}, .rx_range_list2 = { {kHz(30),MHz(30),IC775_ALL_RX_MODES,-1,-1,IC775_VFO_ALL},
RIG_FRNG_END, }, RIG_FRNG_END, },

Wyświetl plik

@ -1,8 +1,8 @@
/* /*
* Hamlib CI-V backend - description of IC-781 and variations * Hamlib CI-V backend - description of IC-781 and variations
* Copyright (c) 2000-2003 by Stephane Fillod * Copyright (c) 2000-2008 by Stephane Fillod
* *
* $Id: ic781.c,v 1.3 2005-04-03 19:53:51 fillods Exp $ * $Id: ic781.c,v 1.4 2008-10-25 14:00:52 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -62,15 +62,15 @@ const struct rig_caps ic781_caps = {
.rig_model = RIG_MODEL_IC781, .rig_model = RIG_MODEL_IC781,
.model_name = "IC-781", .model_name = "IC-781",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER, .version = BACKEND_VER ".1",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_NEW, .status = RIG_STATUS_UNTESTED,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_NONE, .ptt_type = RIG_PTT_NONE,
.dcd_type = RIG_DCD_NONE, .dcd_type = RIG_DCD_NONE,
.port_type = RIG_PORT_SERIAL, .port_type = RIG_PORT_SERIAL,
.serial_rate_min = 1200, .serial_rate_min = 1200,
.serial_rate_max = 1200, .serial_rate_max = 9600,
.serial_data_bits = 8, .serial_data_bits = 8,
.serial_stop_bits = 1, .serial_stop_bits = 1,
.serial_parity = RIG_PARITY_NONE, .serial_parity = RIG_PARITY_NONE,