Fix bindings since itu_region has been deprecated

pull/376/head
Michael Black W9MDB 2020-09-12 08:59:55 -05:00
rodzic 03ad7a953f
commit d47987db85
5 zmienionych plików z 6 dodań i 25 usunięć

Wyświetl plik

@ -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))

Wyświetl plik

@ -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";

Wyświetl plik

@ -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)

Wyświetl plik

@ -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

Wyświetl plik

@ -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]