Merge branch 'dev' of https://github.com/km4ack/pi-build into dev

conky/.conkyrc

@@ -1,39 +1,46 @@
-background yes
+conky.config = {
-use_xft yes
+	background = true,
-xftfont 123:size=8
+	use_xft = true,
-xftalpha 0.5
+	font = '123:size=8',
-update_interval 0.5
+	xftalpha = 0.5,
-total_run_times 0
+	update_interval = 0.5,
-own_window yes
+	total_run_times = 0,
-own_window_type normal
+	own_window = true,
-own_window_transparent yes
+	own_window_type = 'normal',
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+	own_window_transparent = true,
-double_buffer yes
+	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-minimum_size 250 5
+	double_buffer = true,
-maximum_width 400
+	minimum_width = 250, minimum_height = 5,
-draw_shades no
+	maximum_width = 400,
-draw_outline no
+	draw_shades = false,
-draw_borders no
+	draw_outline = false,
-draw_graph_borders no
+	draw_borders = false,
-default_color gray
+	draw_graph_borders = false,
-default_shade_color red
+	default_color = 'gray',
-default_outline_color green
+	default_shade_color = 'red',
-alignment top_right
+	default_outline_color = 'green',
-gap_x 10
+	alignment = 'top_right',
-gap_y 10
+	gap_x = 10,
-no_buffers yes
+	gap_y = 10,
-uppercase no
+	no_buffers = true,
-cpu_avg_samples 2
+	uppercase = false,
-net_avg_samples 1
+	cpu_avg_samples = 2,
-override_utf8_locale no
+	net_avg_samples = 1,
-use_spacer right
+	override_utf8_locale = false,
-TEXT
+	use_spacer = 'right',
+};
+
+conky.text = [[
 
 ${voffset 15}
 ${font Arial:size=30}${color Yellow}${alignc}N0CALL
 ${voffset -45}
 ${font Arial:bold:size=18}${color White}Gridsquare ${alignr}${color Yellow}${execi 25 $HOME/bin/conky/grid | cut -c1-8}
 #${font Arial:bold:size=18}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6}
+#${font Arial:bold:size=18}${color White}Radio Freq A ${if_match "VFOA" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOA | cut -c1-7}
+#${font Arial:bold:size=18}${color White}Radio Freq B ${if_match "VFOB" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOB | cut -c1-7}
 
 ${color Yellow}LOCAL${alignr}ZULU
 ${voffset -45}
@@ -90,3 +97,4 @@ ${font Arial:bold:size=10}${color White}${tail ~/Documents/mylog.txt 5}
 
 
 #$diskio
+]];

conky/conky-large

@@ -1,39 +1,46 @@
-background yes
+conky.config = {
-use_xft yes
+	background = true,
-xftfont 123:size=8
+	use_xft = true,
-xftalpha 0.5
+	font = '123:size=8',
-update_interval 0.5
+	xftalpha = 0.5,
-total_run_times 0
+	update_interval = 0.5,
-own_window yes
+	total_run_times = 0,
-own_window_type normal
+	own_window = true,
-own_window_transparent yes
+	own_window_type = 'normal',
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+	own_window_transparent = true,
-double_buffer yes
+	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-minimum_size 250 5
+	double_buffer = true,
-maximum_width 400
+	minimum_width = 250, minimum_height = 5,
-draw_shades no
+	maximum_width = 400,
-draw_outline no
+	draw_shades = false,
-draw_borders no
+	draw_outline = false,
-draw_graph_borders no
+	draw_borders = false,
-default_color gray
+	draw_graph_borders = false,
-default_shade_color red
+	default_color = 'gray',
-default_outline_color green
+	default_shade_color = 'red',
-alignment top_right
+	default_outline_color = 'green',
-gap_x 10
+	alignment = 'top_right',
-gap_y 10
+	gap_x = 10,
-no_buffers yes
+	gap_y = 10,
-uppercase no
+	no_buffers = true,
-cpu_avg_samples 2
+	uppercase = false,
-net_avg_samples 1
+	cpu_avg_samples = 2,
-override_utf8_locale no
+	net_avg_samples = 1,
-use_spacer right
+	override_utf8_locale = false,
-TEXT
+	use_spacer = 'right',
+};
+
+conky.text = [[
 
 ${voffset 15}
 ${font Arial:size=30}${color Yellow}${alignc}N0CALL
 ${voffset -45}
 ${font Arial:bold:size=18}${color White}Gridsquare ${alignr}${color Yellow}${execi 25 $HOME/bin/conky/grid | cut -c1-8}
 #${font Arial:bold:size=18}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6}
+#${font Arial:bold:size=18}${color White}Radio Freq A ${if_match "VFOA" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOA | cut -c1-7}
+#${font Arial:bold:size=18}${color White}Radio Freq B ${if_match "VFOB" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOB | cut -c1-7}
 
 ${color Yellow}LOCAL${alignr}ZULU
 ${voffset -45}
@@ -91,3 +98,4 @@ ${font Arial:bold:size=10}${color White}${tail ~/Documents/mylog.txt 5}
 
 
 #$diskio
+]];

conky/conky-medium

@@ -1,38 +1,45 @@
-background yes
+conky.config = {
-use_xft yes
+	background = true,
-xftfont 123:size=8
+	use_xft = true,
-xftalpha 0.5
+	font = '123:size=8',
-update_interval 0.5
+	xftalpha = 0.5,
-total_run_times 0
+	update_interval = 0.5,
-own_window yes
+	total_run_times = 0,
-own_window_type normal
+	own_window = true,
-own_window_transparent yes
+	own_window_type = 'normal',
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+	own_window_transparent = true,
-double_buffer yes
+	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-minimum_size 250 5
+	double_buffer = true,
-maximum_width 250
+	minimum_width = 250, minimum_height = 5,
-draw_shades no
+	maximum_width = 250,
-draw_outline no
+	draw_shades = false,
-draw_borders no
+	draw_outline = false,
-draw_graph_borders no
+	draw_borders = false,
-default_color gray
+	draw_graph_borders = false,
-default_shade_color red
+	default_color = 'gray',
-default_outline_color green
+	default_shade_color = 'red',
-alignment top_right
+	default_outline_color = 'green',
-gap_x 10
+	alignment = 'top_right',
-gap_y 10
+	gap_x = 10,
-no_buffers yes
+	gap_y = 10,
-uppercase no
+	no_buffers = true,
-cpu_avg_samples 2
+	uppercase = false,
-net_avg_samples 1
+	cpu_avg_samples = 2,
-override_utf8_locale no
+	net_avg_samples = 1,
-use_spacer right
+	override_utf8_locale = false,
-TEXT
+	use_spacer = 'right',
+};
+
+conky.text = [[
 
 ${font Arial:size=18}${color Yellow}${alignc}N0CALL
 ${voffset -25}
 ${font Arial:bold:size=12}${color White}Gridsquare ${alignr}${color Yellow}${execi 25 $HOME/bin/conky/grid | cut -c1-8}
 #${font Arial:bold:size=12}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6}
+#${font Arial:bold:size=12}${color White}Radio Freq A ${if_match "VFOA" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOA | cut -c1-7}
+#${font Arial:bold:size=12}${color White}Radio Freq B ${if_match "VFOB" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOB | cut -c1-7}
 ${color Yellow}LOCAL${alignr}ZULU
 ${color DarkSlateGray}${hr 2}
 ${font Arial:bold:size=15}${color White}${time %H:%M:%S}\
@@ -87,3 +94,4 @@ ${font Arial:bold:size=08}${color White}${tail ~/Documents/mylog.txt 5}
 
 
 #$diskio
+]];

conky/conky-small

@@ -1,38 +1,45 @@
-background yes
+conky.config = {
-use_xft yes
+	background = true,
-xftfont 123:size=8
+	use_xft = true,
-xftalpha 0.5
+	font = '123:size=8',
-update_interval 0.5
+	xftalpha = 0.5,
-total_run_times 0
+	update_interval = 0.5,
-own_window yes
+	total_run_times = 0,
-own_window_type normal
+	own_window = true,
-own_window_transparent yes
+	own_window_type = 'normal',
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+	own_window_transparent = true,
-double_buffer yes
+	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
-minimum_size 200 5
+	double_buffer = true,
-maximum_width 200
+	minimum_width = 200, minimum_height = 5,
-draw_shades no
+	maximum_width = 200,
-draw_outline no
+	draw_shades = false,
-draw_borders no
+	draw_outline = false,
-draw_graph_borders no
+	draw_borders = false,
-default_color gray
+	draw_graph_borders = false,
-default_shade_color red
+	default_color = 'gray',
-default_outline_color green
+	default_shade_color = 'red',
-alignment top_right
+	default_outline_color = 'green',
-gap_x 10
+	alignment = 'top_right',
-gap_y 10
+	gap_x = 10,
-no_buffers yes
+	gap_y = 10,
-uppercase no
+	no_buffers = true,
-cpu_avg_samples 2
+	uppercase = false,
-net_avg_samples 1
+	cpu_avg_samples = 2,
-override_utf8_locale no
+	net_avg_samples = 1,
-use_spacer right
+	override_utf8_locale = false,
-TEXT
+	use_spacer = 'right',
+};
+
+conky.text = [[
 
 ${font Arial:size=12}${color Yellow}${alignc}N0CALL
 ${voffset -20}
 ${font Arial:bold:size=08}${color White}Gridsquare ${alignr}${color Yellow}${execi 25 $HOME/bin/conky/grid | cut -c1-8}
 #${font Arial:bold:size=12}${color White}Radio Freq ${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq | cut -c1-6}
+#${font Arial:bold:size=12}${color White}Radio Freq A ${if_match "VFOA" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOA | cut -c1-7}
+#${font Arial:bold:size=12}${color White}Radio Freq B ${if_match "VFOB" == "${execi 5 $HOME/bin/conky/get-vfo}"}*$endif\
+#${alignr}${color Yellow}${execi 5 $HOME/bin/conky/get-freq VFOB | cut -c1-7}
 ${color Yellow}LOCAL${alignr}ZULU
 ${voffset -20}
 ${color DarkSlateGray}${hr 2}
@@ -88,3 +95,4 @@ ${font Arial:bold:size=6}${color White}${tail ~/Documents/mylog.txt 5}
 
 
 #$diskio
+]];

conky/get-freq

@@ -1,22 +1,40 @@
 #!/bin/bash
 
 #get freq of radio to display in conky
+#optional parameter: VFOA VFOB
 #20191217 km4ack
+#20200428 modified
 
-source $HOME/patmenu2/config
+source "$HOME/patmenu2/config"
 
 MAIN () {
 
-FREQ=$($RIG f)
+# If first argument, $1, is empty or unset, use 'VFOA' as its value.
-FREQCH=$(echo $FREQ | grep error)
+VFO=${1:-'VFOA'}
+
+FREQ=$($RIG -o f "$VFO")
+FREQCH=$(echo "$FREQ" | grep error)
 
 if [ -z "$FREQCH" ]
 then
-echo $FREQ
+HZ_TO_MHZ "$FREQ"
 else
-MAIN
+MAIN "$1"
 fi
 
 }
 
-MAIN
+HZ_TO_MHZ () {
+
+#Inject decimal into number six places from right.
+#First, and only, parameter expected to be a string of six or more digits
+
+DP=.
+SIX_DIGITS='[0-9][0-9][0-9][0-9][0-9][0-9]'
+MHZ="${1%%$SIX_DIGITS}"
+HZ="${1##$MHZ}"
+printf "%s$DP%s\n" "$MHZ" "$HZ"
+
+}
+
+MAIN "$1"

conky/get-vfo

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#get VFO of radio to display in conky
+#20200428
+
+source "$HOME/patmenu/config"
+
+MAIN () {
+
+VFO=$($RIG v)
+VFOCH=$(echo "$VFO" | grep error)
+
+if [ -z "$VFOCH" ]
+then
+echo "$VFO"
+else
+MAIN
+fi
+
+}
+
+MAIN