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

bindings/Makefile.am

@@ -3,13 +3,6 @@
 # more information on swig at http://www.swig.org
 #
 
-# Different installations need different locations for some reason
-# Trying to check for all the possible types seems a bit much
-# So right now we just install in both locations -- no harm done
-PERLINSTALL1 = install_site
-PERLINSTALL2 = pure_vendor_install
-echo Default install=$(PERLINSTALL1) and $(PERLINSTALL2)
-
 AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/bindings $(PYTHON_CPPFLAGS) \
 	$(TCL_INCLUDE_SPEC)
 
@@ -77,8 +70,7 @@ distcheck-perl: Hamlib-pl.mk
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
 
 install-perl: Hamlib-pl.mk
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk $(PERLINSTALL1)
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk $(PERLINSTALL2)
 
 ## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files
 ## anyway, so we'll have to figure out another way to remove the installed files.

bindings/luatest.lua

@@ -54,19 +54,19 @@ function doStartup()
     print(string.format("Backend license:\t%s", my_rig.caps.copyright))
     print(string.format("Rig info:\t\t%s", my_rig:get_info()))
 
-    my_rig:set_level("VOX", 1)
+    my_rig:set_level("VOXDELAY", 1)
     print(string.format("status:\t\t\t%s - %s", my_rig.error_status, Hamlib.rigerror(my_rig.error_status)))
-    print(string.format("VOX level:\t\t%d", my_rig:get_level_i("VOX")))
+    print(string.format("VOX delay:\t\t%d", my_rig:get_level_i("VOXDELAY")))
-    my_rig:set_level(Hamlib.RIG_LEVEL_VOX, 5)
+    my_rig:set_level(Hamlib.RIG_LEVEL_VOXDELAY, 5)
     print(string.format("status:\t\t\t%s - %s", my_rig.error_status, Hamlib.rigerror(my_rig.error_status)))
     -- see the func name (get_level_i) and format (%d)
-    print(string.format("VOX level:\t\t%d", my_rig:get_level_i(Hamlib.RIG_LEVEL_VOX)))
+    print(string.format("VOX delay:\t\t%d", my_rig:get_level_i(Hamlib.RIG_LEVEL_VOXDELAY)))
 
     af = 12.34
     print(string.format("Setting AF to %f...", af))
     my_rig:set_level(Hamlib.RIG_LEVEL_AF, af)
     print(string.format("status:\t\t\t%s - %s", my_rig.error_status, Hamlib.rigerror(my_rig.error_status)))
-    -- see the different of func name and format related to RIG_LEVEL_VOX!
+    -- see the different of func name and format related to RIG_LEVEL_VOXDELAY!
     print(string.format("AF level:\t\t%f", my_rig:get_level_f("AF")))
 
     print(string.format("strength:\t\t%d", my_rig:get_level_i(Hamlib.RIG_LEVEL_STRENGTH)))

bindings/py3test.py

@@ -58,13 +58,13 @@ def StartUp():
     print("Backend status:\t\t%s" % Hamlib.rig_strstatus(my_rig.caps.status))
     print("Rig info:\t\t%s" % my_rig.get_info())
 
-    my_rig.set_level("VOX",  1)
+    my_rig.set_level("VOXDELAY",  1)
 
-    print("VOX level:\t\t%s" % my_rig.get_level_i("VOX"))
+    print("VOX delay:\t\t%s" % my_rig.get_level_i("VOXDELAY"))
 
-    my_rig.set_level(Hamlib.RIG_LEVEL_VOX, 5)
+    my_rig.set_level(Hamlib.RIG_LEVEL_VOXDELAY, 5)
 
-    print("VOX level:\t\t%s" % my_rig.get_level_i(Hamlib.RIG_LEVEL_VOX))
+    print("VOX delay:\t\t%s" % my_rig.get_level_i(Hamlib.RIG_LEVEL_VOXDELAY))
 
     af = 12.34
 

bindings/pytest.py

@@ -58,13 +58,13 @@ def StartUp(verbose):
     print "Backend status:\t\t", Hamlib.rig_strstatus(my_rig.caps.status)
     print "Rig info:\t\t", my_rig.get_info()
 
-    my_rig.set_level("VOX",  1)
+    my_rig.set_level("VOXDELAY",  1)
 
-    print "VOX level:\t\t", my_rig.get_level_i("VOX")
+    print "VOX delay:\t\t", my_rig.get_level_i("VOXDELAY")
 
-    my_rig.set_level(Hamlib.RIG_LEVEL_VOX, 5)
+    my_rig.set_level(Hamlib.RIG_LEVEL_VOXDELAY, 5)
 
-    print "VOX level:\t\t", my_rig.get_level_i(Hamlib.RIG_LEVEL_VOX)
+    print "VOX delay:\t\t", my_rig.get_level_i(Hamlib.RIG_LEVEL_VOXDELAY)
 
     af = 12.34
 

bindings/tcltest.tcl.in

@@ -46,13 +46,13 @@ puts "Attenuators:\t[$rigcaps cget -attenuator]"
 
 puts "getinfo:\t[my_rig get_info]"
 
-my_rig set_level "VOX"  1
+my_rig set_level "VOXDELAY"  1
 puts "status:\t\t[my_rig cget -error_status]"
-puts "VOX level:\t[my_rig get_level_i 'VOX']"
+puts "VOX delay:\t[my_rig get_level_i 'VOXDELAY']"
 puts "status:\t\t[my_rig cget -error_status]"
-my_rig set_level $RIG_LEVEL_VOX 5
+my_rig set_level $RIG_LEVEL_VOXDELAY 5
 puts "status:\t\t[my_rig cget -error_status]"
-puts "VOX level:\t[my_rig get_level_i $RIG_LEVEL_VOX]"
+puts "VOX delay:\t[my_rig get_level_i $RIG_LEVEL_VOXDELAY]"
 puts "status:\t\t[my_rig cget -error_status]"
 
 puts "strength:\t[my_rig get_level_i $RIG_LEVEL_STRENGTH]"