diff --git a/overlay/etc/skel/.conkyrc b/overlay/etc/skel/.conkyrc index 5b55577..cf0a64d 100644 --- a/overlay/etc/skel/.conkyrc +++ b/overlay/etc/skel/.conkyrc @@ -18,33 +18,34 @@ conky.config = { conky.text = [[ ${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}DATE/TIME -${font DejaVu Sans Mono:size=11}${color yellow}${alignc}${time %A, %B %d %Y} +${font DejaVu Sans Mono:size=10}${color yellow}${alignc}${time %A, %B %d %Y} Local: ${alignr}${time %H:%M:%S} UTC: ${alignr}${tztime UTC %H:%M:%S} GPS Time: ${alignr}${execpi 30 et-system-info et-time} ${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}SYSTEM -${font DejaVu Sans Mono:size=11}${color yellow}Uptime : ${uptime} +${font DejaVu Sans Mono:size=10}${color yellow}Uptime : ${uptime} CPU Util : ${cpu}% Disk Free: ${fs_free /} ${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}NETWORK -${font DejaVu Sans Mono:size=11}${color yellow}IP: ${execpi 60 /opt/emcomm-tools/bin/et-system-info ip} +${font DejaVu Sans Mono:size=10}${color yellow}IP: ${execpi 60 /opt/emcomm-tools/bin/et-system-info ip} ${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}INTERFACES -${font DejaVu Sans Mono:size=11}${color yellow}Radio: ${execpi 10 et-system-info active-radio} +${font DejaVu Sans Mono:size=10}${color yellow}Radio: ${execpi 10 et-system-info active-radio} CAT : ${execpi 10 et-system-info et-cat} GPS : ${execpi 10 et-system-info et-gps} Audio: ${execpi 10 et-system-info et-audio} -${if_existing /dev/et-sdr}SDR : ${execpi 10 et-system-info et-sdr}${endif} +SDR : ${execpi 10 et-system-info et-sdr} +LoRa : ${execpi 10 et-system-info et-lora} ${font DejaVu Sans:bold:size=10}${color #8d5133}${alignc}OPERATOR -${font DejaVu Sans Mono:size=11}${color yellow}Callsign: ${execpi 10 et-system-info callsign} +${font DejaVu Sans Mono:size=10}${color yellow}Callsign: ${execpi 10 et-system-info callsign} Grid : ${execpi 10 et-system-info grid} ${font DejaVu Sans:bold:size=10}${color white}${alignc}MODE -${font DejaVu Sans:bold:size=11}${color red}${alignc}${execpi 10 et-system-info et-mode} +${font DejaVu Sans:bold:size=10}${color red}${alignc}${execpi 10 et-system-info et-mode} -${font DejaVu Sans:bold:size=9}${color grey}${alignc}${execp /opt/emcomm-tools/bin/et-system-info release} +${font DejaVu Sans:bold:size=8}${color grey}${alignc}${execp /opt/emcomm-tools/bin/et-system-info release} ]]; diff --git a/overlay/etc/udev/rules.d/100-et-lora.rules b/overlay/etc/udev/rules.d/100-et-lora.rules new file mode 100644 index 0000000..aa3c398 --- /dev/null +++ b/overlay/etc/udev/rules.d/100-et-lora.rules @@ -0,0 +1,26 @@ +# Author : Gaston Gonzalez +# Date : 14 June 2026 +# Purpose : udev rules for supported LoRa devices +# +# Supported Devices +# 1. Heltec v4 +# +# Preconditions: +# 1. LoRa device connected via USB cable +# +# Postconditions: +# 1. /dev/et-lora created + +#KERNEL=="swradio0", \ +# GROUP="dialout", MODE="0660", SYMLINK+="et-sdr" + +# Heltec v4 +SUBSYSTEM=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", \ + GROUP="dialout", MODE="0660", SYMLINK+="et-lora" + + +# Heltec v3 +# Uses the CP210x so this will collide with radios already supported by et-radio +SUBSYSTEM=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", \ + GROUP="dialout", MODE="0660", SYMLINK+="et-lora" + diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info index dfcdd69..ca47a20 100755 --- a/overlay/opt/emcomm-tools/bin/et-system-info +++ b/overlay/opt/emcomm-tools/bin/et-system-info @@ -3,7 +3,7 @@ # Author : Gaston Gonzalez # Author : William McKeehan # Date : 6 October 2024 -# Updated : 5 September 2025 +# Updated : 14 June 2025 # Purpose : Utility script for dumping system information function usage() { @@ -13,6 +13,7 @@ function usage() { echo " et-audio - Show state of audio interface" echo " et-audio-card - Display audio card and device: ," echo " et-cat - Show state of CAT control interface" + echo " et-lora - Show state of LoRa interface" echo " et-gps - Show state of GPS interface" echo " et-time - Show if time is synched via GPS" echo " et-mode - Show current mode" @@ -143,6 +144,15 @@ case $1 in fi ;; + et-lora) + # 1. Check if the symlink was created by the udev rules + if [ -e /dev/et-lora]; then + echo "Connected"; + else + echo "Not connected"; + fi + + ;; et-sdr) # 1. Check if the symlink was created by the udev rules if [ -e /dev/et-sdr ]; then