[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.0 updated. 8120c068ec845f12bdb0e1c62a02837344587f03

[Nate B. <n0...@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, Hamlib-4.0 has been updated
       via  8120c068ec845f12bdb0e1c62a02837344587f03 (commit)
      from  99a92d63b4ac027282ffee1a85e81e5c211bf026 (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 8120c068ec845f12bdb0e1c62a02837344587f03
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Sep 12 08:59:55 2020 -0500

    Fix bindings since itu_region has been deprecated

diff --git a/bindings/luatest.lua b/bindings/luatest.lua
index 05de17b0..dd768745 100755
--- a/bindings/luatest.lua
+++ b/bindings/luatest.lua
@@ -22,15 +22,11 @@ function doStartup()
     my_rig:set_conf("retry", "5")
     my_rig:open()
 
-    -- 1073741944 is token value for "itu_region"
-    -- but using get_conf is much more convenient
-    region = my_rig:get_conf(1073741944)
-    regionstr = my_rig:get_conf("itu_region")
     tpath = my_rig:get_conf("rig_pathname")
     retry = my_rig:get_conf("retry")
 
     print (string.format("status(str):\t\t%s", Hamlib.rigerror(my_rig.error_status)))
-    print (string.format("get_conf:\t\tpath = %s, retry = %s, ITU region = %s, ITU region (str) = %s", tpath, retry, region, regionstr))
+    print (string.format("get_conf:\t\tpath = %s, retry = %s", tpath, retry))
 
     my_rig:set_freq(Hamlib.RIG_VFO_B, 5700000000)
     my_rig:set_vfo(Hamlib.RIG_VFO_B)
@@ -45,7 +41,6 @@ function doStartup()
     mode, width = my_rig:get_mode()
     print(string.format("mode:\t\t\t%s\nbandwidth:\t\t%d", Hamlib.rig_strrmode(mode), width))
 
-    print(string.format("ITU_region:\t\t%s", my_rig.state.itu_region))
     print(string.format("Backend copyright:\t%s",my_rig.caps.copyright))
 
     print(string.format("Model:\t\t\t%s", my_rig.caps.model_name))
diff --git a/bindings/perltest.pl b/bindings/perltest.pl
index e5c9db74..91652ad2 100755
--- a/bindings/perltest.pl
+++ b/bindings/perltest.pl
@@ -15,12 +15,9 @@ $rig->set_conf("rig_pathname","/dev/Rig");
 
 $rig->open();
 
-# 1073741944 is token value for "itu_region"
-# but using get_conf is much more convenient
-$region = $rig->get_conf(1073741944);
 $rpath = $rig->get_conf("rig_pathname");
 $retry = $rig->get_conf("retry");
-print "get_conf:\t\tpath = \"$rpath\", retry = $retry, ITU region = $region\n";
+print "get_conf:\t\tpath = \"$rpath\", retry = $retry\n";
 
 
 $rig->set_freq($Hamlib::RIG_VFO_A, 14266000);
@@ -38,7 +35,6 @@ $rig->set_vfo($Hamlib::RIG_VFO_B);
 
 $rig->set_mode($Hamlib::RIG_MODE_CW, $Hamlib::RIG_PASSBAND_NORMAL);
 
-print "ITU region:\t\t$rig->{state}->{itu_region}\n";
 print "Backend copyright:\t$rig->{caps}->{copyright}\n";
 print "Model:\t\t\t$rig->{caps}->{model_name}\n";
 print "Manufacturer:\t\t$rig->{caps}->{mfg_name}\n";
diff --git a/bindings/py3test.py b/bindings/py3test.py
index dd5b7456..8ed1cf42 100755
--- a/bindings/py3test.py
+++ b/bindings/py3test.py
@@ -25,15 +25,12 @@ def StartUp():
 
     my_rig.open ()
 
-    # 1073741944 is token value for "itu_region"
-    # but using get_conf is much more convenient
-    region = my_rig.get_conf(1073741944)
     rpath = my_rig.get_conf("rig_pathname")
     retry = my_rig.get_conf("retry")
 
     print("status(str):\t\t%s" % Hamlib.rigerror(my_rig.error_status))
-    print("get_conf:\t\tpath = %s, retry = %s, ITU region = %s" \
-          % (rpath, retry, region))
+    print("get_conf:\t\tpath = %s, retry = %s" \
+          % (rpath, retry))
 
     my_rig.set_freq(Hamlib.RIG_VFO_B, 5700000000)
     my_rig.set_vfo(Hamlib.RIG_VFO_B)
@@ -50,7 +47,6 @@ def StartUp():
 
     print("mode:\t\t\t%s\nbandwidth:\t\t%s" % (Hamlib.rig_strrmode(mode), width))
 
-    print("ITU_region:\t\t%s" % my_rig.state.itu_region)
     print("Backend copyright:\t%s" % my_rig.caps.copyright)
     print("Model:\t\t\t%s" % my_rig.caps.model_name)
     print("Manufacturer:\t\t%s" % my_rig.caps.mfg_name)
diff --git a/bindings/pytest.py b/bindings/pytest.py
index 797aa020..b271834a 100755
--- a/bindings/pytest.py
+++ b/bindings/pytest.py
@@ -25,15 +25,12 @@ def StartUp(verbose):
 
     my_rig.open()
 
-    # 1073741944 is token value for "itu_region"
-    # but using get_conf is much more convenient
-    region = my_rig.get_conf(1073741944)
     rpath = my_rig.get_conf("rig_pathname")
     retry = my_rig.get_conf("retry")
 
     print "status(str):\t\t", Hamlib.rigerror(my_rig.error_status)
-    print "get_conf:\t\tpath = %s, retry = %s, ITU region = %s" \
-          % (rpath, retry, region)
+    print "get_conf:\t\tpath = %s, retry = %s" \
+          % (rpath, retry)
 
     my_rig.set_freq(Hamlib.RIG_VFO_B, 5700000000)
     my_rig.set_vfo(Hamlib.RIG_VFO_B)
@@ -50,7 +47,6 @@ def StartUp(verbose):
 
     print "mode:\t\t\t", Hamlib.rig_strrmode(mode), "\nbandwidth:\t\t", width
 
-    print "ITU_region:\t\t", my_rig.state.itu_region
     print "Backend copyright:\t", my_rig.caps.copyright
     print "Model:\t\t\t", my_rig.caps.model_name
     print "Manufacturer:\t\t", my_rig.caps.mfg_name
diff --git a/bindings/tcltest.tcl.in b/bindings/tcltest.tcl.in
index 107085bc..51e9c0b7 100644
--- a/bindings/tcltest.tcl.in
+++ b/bindings/tcltest.tcl.in
@@ -31,10 +31,8 @@ set mode [rig_strrmode [lindex $moderes 0]]
 puts "mode:\t\t$mode\nbandwidth:\t[lindex $moderes 1]Hz"
 
 set state [my_rig cget -state]
-puts "ITU_region:\t[$state cget -itu_region]"
 
 # The following works well also
-# puts ITU_region:[[my_rig cget -state] cget -itu_region]
 
 set rigcaps [my_rig cget -caps]
 #set model [$rigcaps cget -model_name]

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

Summary of changes:
 bindings/luatest.lua    | 7 +------
 bindings/perltest.pl    | 6 +-----
 bindings/py3test.py     | 8 ++------
 bindings/pytest.py      | 8 ++------
 bindings/tcltest.tcl.in | 2 --
 5 files changed, 6 insertions(+), 25 deletions(-)


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