[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 31b28202ee13dd2a83d9ff2597cf814982afb2d8

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  31b28202ee13dd2a83d9ff2597cf814982afb2d8 (commit)
       via  ad9d464822dbc1b7937edd56d5e15ebe2f1f4edf (commit)
       via  65a9895361109a3a2eb77d3b5b4f407a27ac755e (commit)
      from  cd77d8f22d3fbc1e9fd2170abef0c2f2a7b017ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31b28202ee13dd2a83d9ff2597cf814982afb2d8
Merge: ad9d4648 cd77d8f2
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Feb 8 12:55:24 2021 -0600

    Merge branch 'master' of https://github.com/Hamlib/Hamlib


commit ad9d464822dbc1b7937edd56d5e15ebe2f1f4edf
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Feb 8 12:54:33 2021 -0600

    Remove MainC from caching due to effect on rig_caps structure offsets
    https://github.com/Hamlib/Hamlib/issues/537

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 508fd2c3..96ded4ba 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2077,7 +2077,9 @@ struct rig_cache {
     freq_t freqCurr;  // VFO_CURR
     freq_t freqMainA; // VFO_A, VFO_MAIN, and VFO_MAINA
     freq_t freqMainB; // VFO_B, VFO_SUB, and VFO_MAINB
+#if 0
     freq_t freqMainC; // VFO_C, VFO_MAINC
+#endif
     freq_t freqSubA;  // VFO_SUBA -- only for rigs with dual Sub VFOs
     freq_t freqSubB;  // VFO_SUBB -- only for rigs with dual Sub VFOs
     freq_t freqMem;   // VFO_MEM -- last MEM channel 
@@ -2093,7 +2095,9 @@ struct rig_cache {
     struct timespec time_freqCurr;
     struct timespec time_freqMainA;
     struct timespec time_freqMainB;
+#if 0
     struct timespec time_freqMainC;
+#endif
     struct timespec time_freqSubA;
     struct timespec time_freqSubB;
     struct timespec time_freqMem;
diff --git a/src/misc.h b/src/misc.h
index 085ceb62..e561a9e1 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -144,12 +144,14 @@ void errmsg(int err, char *s, const char *func, const char *file, int line);
 #define ENTERFUNC rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s entered\n", __FILENAME__, __LINE__, __func__)
 #define RETURNFUNC(rc) {rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s return\n", __FILENAME__, __LINE__, __func__);return rc;}
 
+#if 0 // 5.0
+    elapsed_ms(&rig->state.cache.time_freqMainC, HAMLIB_ELAPSED_INVALIDATE);
+#endif
 #define CACHE_RESET {\
     elapsed_ms(&rig->state.cache.time_freq, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_freqCurr, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_freqMainA, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_freqMainB, HAMLIB_ELAPSED_INVALIDATE);\
-    elapsed_ms(&rig->state.cache.time_freqMainC, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_freqSubA, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_freqSubB, HAMLIB_ELAPSED_INVALIDATE);\
     elapsed_ms(&rig->state.cache.time_vfo, HAMLIB_ELAPSED_INVALIDATE);\
diff --git a/src/rig.c b/src/rig.c
index 4629f781..3fe55bc7 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1394,10 +1394,12 @@ static int set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
         elapsed_ms(&rig->state.cache.time_freqMainB, HAMLIB_ELAPSED_SET);
         break;
 
+#if 0 // 5.0
     case RIG_VFO_C: // is there a MainC/SubC we need to cover?
         rig->state.cache.freqMainC = freq;
         elapsed_ms(&rig->state.cache.time_freqMainC, HAMLIB_ELAPSED_SET);
         break;
+#endif
 
     case RIG_VFO_SUB_A:
         rig->state.cache.freqSubA = freq;
@@ -1462,11 +1464,13 @@ static int get_cache_freq(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms)
         *cache_ms = elapsed_ms(&rig->state.cache.time_freqSubB, HAMLIB_ELAPSED_GET);
         break;
 
+#if 0 // 5.0
     case RIG_VFO_C:
     //case RIG_VFO_MAINC: // not used by any rig yet
         *freq = rig->state.cache.freqMainC;
         *cache_ms = elapsed_ms(&rig->state.cache.time_freqMainC, HAMLIB_ELAPSED_GET);
         break;
+#endif
 
 #if 0 // no known rigs use this yet
     case RIG_VFO_SUBC:

commit 65a9895361109a3a2eb77d3b5b4f407a27ac755e
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Mon Feb 8 12:54:10 2021 -0600

    Fix c++ make check when -static flag is used

diff --git a/c++/Makefile.am b/c++/Makefile.am
index 2f313af1..f295fb4a 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -1,13 +1,14 @@
 
 lib_LTLIBRARIES = libhamlib++.la
 libhamlib___la_SOURCES = rigclass.cc rotclass.cc
-libhamlib___la_LDFLAGS = -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE)
+libhamlib___la_LDFLAGS = -no-undefined -version-info $(ABI_VERSION):$(ABI_REVISION):$(ABI_AGE) $(LDFLAGS)
 libhamlib___la_LIBADD = $(top_builddir)/src/libhamlib.la
+AM_CXXFLAGS=$(CXXFLAGS)
 
 check_PROGRAMS = testcpp
 
 testcpp_SOURCES = testcpp.cc
-testcpp_LDADD = libhamlib++.la
+testcpp_LDADD = libhamlib++.la $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
 testcpp_DEPENDENCIES = libhamlib++.la
 
 check_SCRIPTS = testcpp.sh

-----------------------------------------------------------------------

Summary of changes:
 c++/Makefile.am      | 5 +++--
 include/hamlib/rig.h | 4 ++++
 src/misc.h           | 4 +++-
 src/rig.c            | 4 ++++
 4 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries