From dc77f72bcbe67a37bc22d9805d9851945c97905a Mon Sep 17 00:00:00 2001 From: Michael Black Date: Mon, 23 Mar 2020 16:41:23 -0500 Subject: [PATCH] Add range_list to thg71.c --- cppcheck.sh | 2 +- rigs/kenwood/th.h | 2 +- rigs/kenwood/thg71.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cppcheck.sh b/cppcheck.sh index 4141c7c59..2bb9e3719 100755 --- a/cppcheck.sh +++ b/cppcheck.sh @@ -9,4 +9,4 @@ echo "This takes several hours to run" SUPPRESS="-i c++/rigclass.cc -i c++/rotclass.cc -i c++/ampclass.cc -i bindings -i lib/getopt.c -i lib/getopt_long.c --suppress=*:extra/gnuradio/demod.h --suppress=*:extra/gnuradio/HrAGC.h --suppress=*:extra/gnuradio/nfm.h --suppress=*:extra/gnuradio/am.h --suppress=*:extra/gnuradio/ssb.h --suppress=*:extra/gnuradio/wfm.h --suppress=*:extra/gnuradio/wfm.h --suppress=*:extra/gnuradio/HrAGC.h --suppress=knownConditionTrueFalse:tests/rotctl.c --suppress=knownConditionTrueFalse:tests/rigctl.c --suppress=knownConditionTrueFalse:tests/ampctl.c --suppress=knownConditionTrueFalse:tests/rotctl_parse.c --suppress=knownConditionTrueFalse:tests/rigctl_parse.c --suppress=knownConditionTrueFalse:tests/ampctl_parse.c" #CHECK="-D RIG_LEVEL_LINEOUT=1 -D SIGPIPE -D SIGINT -D IPV6_V6ONLY -D RIG_MODE_WFM -D ABI_VERSION=4 -D F_SETSIG=1 -U O_ASYNC -U SA_SIGINFO -U HASH_BLOOM -U HASH_EMIT_KEYS -U HASH_FUNCTION -U __USEP5P6__" CHECK="-Duint64_t -D HAVE_CONFIG_H -D HAMLIB_EXPORT -D HAMLIB_EXPORT_VAR -D __WORDSIZE -D BACKEND_EXPORT -D PRId64 -D DECLARE_INITRIG_BACKEND -D DECLARE_INITRROT_BACKEND -D DECLARE_INITAMP_BACKEND -U RIG_LEVEL_LINEOUT -U O_ASYNC -U F_SETSIG -U SA_SIGINFO -U SIGPIPE -U gai_strerror -U CMSPAR -U TIOCCBRK -U TIOCSBRK -U TIOCMBIC -U TIOCMBIS -U HASH_BLOOM -U HASH_EMIT_KEYS -U HASH_FUNCTION -U IPV6_V6ONLY -D SIGINT -D WIN32 -D HAVE_SIGNAL" -cppcheck --check-config --inline-suppr -I src -I include --include=include/config.h --include=include/hamlib/rig.h -q --force --enable=all --std=c99 $SUPPRESS $CHECK . &>cppcheck.log +cppcheck --inline-suppr -I src -I include --include=include/config.h --include=include/hamlib/rig.h -q --force --enable=all --std=c99 $SUPPRESS $CHECK . &>cppcheck.log diff --git a/rigs/kenwood/th.h b/rigs/kenwood/th.h index abeba044d..594b31221 100644 --- a/rigs/kenwood/th.h +++ b/rigs/kenwood/th.h @@ -23,7 +23,7 @@ #include "idx_builtin.h" -#define TH_VER "0.6" +#define TH_VER "0.7" extern int th_transaction (RIG *rig, const char *cmdstr, char *data, size_t datasize); extern int th_get_vfo_char(RIG *rig, vfo_t *vfo, char *vfoch); diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c index df15e84c0..ae8a88a45 100644 --- a/rigs/kenwood/thg71.c +++ b/rigs/kenwood/thg71.c @@ -38,6 +38,9 @@ #define RIG_ASSERT(x) #endif +#define THG71_VFO (RIG_VFO_A) +#define THG71_MODES (RIG_MODE_FM) + #define THG71_FUNC_ALL (\ RIG_FUNC_TBURST \ ) @@ -139,6 +142,19 @@ const struct rig_caps thg71_caps = }, /* no rx/tx_range_list */ + .rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ + .tx_range_list1 = { RIG_FRNG_END, }, + .rx_range_list2 = { + {MHz(118), MHz(174), THG71_MODES, -1, -1, THG71_VFO}, + {MHz(400), MHz(470), THG71_MODES, -1, -1, THG71_VFO}, + RIG_FRNG_END, + }, + .tx_range_list2 = { + {MHz(144), MHz(148), THG71_MODES, W(0.05), W(5), THG71_VFO}, + {MHz(430), MHz(450), THG71_MODES, W(0.05), W(5), THG71_VFO}, + RIG_FRNG_END, + }, + /* computed in thg71_open */ .tuning_steps = {