mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1161 from mdblack98/master 

FT736 patch
pull/1164/head
Michael Black 2022-11-27 22:31:31 -06:00 zatwierdzone przez GitHub
rodzic 09e73b2ec9 427ca8d90f
commit 340045384d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 12 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
configure.ac
Wyświetl plik

@ -48,7 +48,7 @@ dnl Beware of duplication should a backend directory include both rig and
dnl rotor definitions, e.g. "dummy". Optional backends will not be listed dnl rotor definitions, e.g. "dummy". Optional backends will not be listed
dnl here but will be added later, e.g. "winradio". dnl here but will be added later, e.g. "winradio".
RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds" RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds"
ROT_BACKEND_LIST="rotators/amsat rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/radant" ROT_BACKEND_LIST="rotators/amsat rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/radant rotators/arraysolutions"
# Amplifiers are all in the amplifiers directory # Amplifiers are all in the amplifiers directory
AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini" AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini"
@ -828,6 +828,7 @@ bindings/Makefile
doc/Makefile doc/Makefile
doc/hamlib.cfg doc/hamlib.cfg
rotators/amsat/Makefile rotators/amsat/Makefile
rotators/arraysolutions/Makefile
rotators/ars/Makefile rotators/ars/Makefile
rotators/celestron/Makefile rotators/celestron/Makefile
rotators/cnctrk/Makefile rotators/cnctrk/Makefile

4
include/hamlib/rotlist.h
Wyświetl plik

@ -325,7 +325,9 @@
#define ROT_MODEL_GS232B_EL ROT_MAKE_MODEL(ROT_GS232A, 12) #define ROT_MODEL_GS232B_EL ROT_MAKE_MODEL(ROT_GS232A, 12)
#define ROT_MODEL_GS23_AZ ROT_MAKE_MODEL(ROT_GS232A, 13) #define ROT_MODEL_GS23_AZ ROT_MAKE_MODEL(ROT_GS232A, 13)
#define ROT_ARRAYSOLUTIONS 7
#define ROT_BACKEND ARRAYSOLUTIONS "arraysolutions"
#define ROT_MODEL_ARRAYSOLUTIONS_SAL_12_20_30 ROT_MAKE_MODEL(ROT_ARRAYSOLUTIONS, 1)
/** /**
* \brief A macro that returns the model number of the PCROTOR backend. * \brief A macro that returns the model number of the PCROTOR backend.
* *

9
rigs/yaesu/ft736.c
Wyświetl plik

@ -98,7 +98,7 @@ const struct rig_caps ft736_caps =
RIG_MODEL(RIG_MODEL_FT736R), RIG_MODEL(RIG_MODEL_FT736R),
.model_name = "FT-736R", .model_name = "FT-736R",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20210221.0", .version = "20211271.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -132,7 +132,7 @@ const struct rig_caps ft736_caps =
.max_rit = Hz(0), .max_rit = Hz(0),
.max_xit = Hz(0), .max_xit = Hz(0),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ, .targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE,
.transceive = RIG_TRN_OFF, .transceive = RIG_TRN_OFF,
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
@ -269,6 +269,9 @@ int ft736_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0x01}; unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0x01};
struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv; struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv;
// we will assume requesting to set VFOB is split mode
if (vfo == RIG_VFO_B) { return rig_set_split_freq(rig, vfo, freq); }
if (priv->split == RIG_SPLIT_ON) if (priv->split == RIG_SPLIT_ON)
{ {
cmd[4] = 0x1e; cmd[4] = 0x1e;
@ -302,6 +305,8 @@ int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
unsigned char md; unsigned char md;
struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv; struct ft736_priv_data *priv = (struct ft736_priv_data *)rig->state.priv;
if (vfo == RIG_VFO_B) return ft736_set_split_mode(rig, vfo, mode, width);
if (priv->split == RIG_SPLIT_ON) if (priv->split == RIG_SPLIT_ON)
{ {
cmd[4] = 0x17; cmd[4] = 0x17;