From 329045a81f3b3e81c4678c6622d7a13e6f6991ce Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 22 Nov 2023 10:52:59 -0500 Subject: [PATCH 1/4] Update update add defaults to sim.cfg test --- update | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/update b/update index 7aa04e5a..8d22ba85 100755 --- a/update +++ b/update @@ -227,6 +227,29 @@ git pull --no-rebase > .updated_p #fi + value=`cat /home/pi/CubeSatSim/sim.cfg` + echo "$value" > /dev/null + set -- $value + + echo -e "Current sim.cfg configuration file:" + echo + echo $1 $2 $3 $4 $5 $6 $7 $8 $9 + echo + + if [ -z "$1" ] ; then n1="AMSAT" ; else n1=$1 ; fi + if [ -z "$2" ] ; then n2="AMSAT" ; else n2=$2 ; fi + if [ -z "$3" ] ; then n3="AMSAT" ; else n3=$3 ; fi + if [ -z "$4" ] ; then n4="AMSAT" ; else n4=$4 ; fi + if [ -z "$5" ] ; then n5="AMSAT" ; else n5=$5 ; fi + if [ -z "$6" ] ; then n6="AMSAT" ; else n6=$6 ; fi + if [ -z "$7" ] ; then n7="AMSAT" ; else n7=$7 ; fi + if [ -z "$8" ] ; then n8="AMSAT" ; else n8=$8 ; fi + if [ -z "$9" ] ; then n9="AMSAT" ; else n9=$9 ; fi + + echo -e "\nCubeSatSim configuraation sim.cfg file updated to: \n" + echo + echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 + echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 > /home/pi/CubeSatSim/sim.cfg if [ $FLAG -eq 1 ]; then echo "systemctl daemon-reload and reboot" From ed1dd9c04e916164b7f6bf00b4824c10f5c50e01 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 22 Nov 2023 10:57:49 -0500 Subject: [PATCH 2/4] Update update only write sim.cfg if changed --- update | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/update b/update index 8d22ba85..fa21943a 100755 --- a/update +++ b/update @@ -227,29 +227,32 @@ git pull --no-rebase > .updated_p #fi - value=`cat /home/pi/CubeSatSim/sim.cfg` - echo "$value" > /dev/null - set -- $value - +changed=0 +value=`cat /home/pi/CubeSatSim/sim.cfg` +echo "$value" > /dev/null +set -- $value + +if [ -z "$1" ] ; then n1="AMSAT" ; else n1=$1 ; fi +if [ -z "$2" ] ; then n2="AMSAT" ; else n2=$2 ; fi +if [ -z "$3" ] ; then n3="AMSAT" ; else n3=$3 ; fi +if [ -z "$4" ] ; then n4="AMSAT" ; else n4=$4 ; fi +if [ -z "$5" ] ; then n5="AMSAT" ; else n5=$5 ; fi +if [ -z "$6" ] ; then n6="AMSAT" ; else n6=$6 ; fi +if [ -z "$7" ] ; then n7="AMSAT" ; else n7=$7 ; fi +if [ -z "$8" ] ; then n8="AMSAT" ; else n8=$8 ; fi +if [ -z "$9" ] ; then n9="AMSAT" ; changed=1 ; else n9=$9 ; fi + +if [ $changed -eq 1 ]; then echo -e "Current sim.cfg configuration file:" echo echo $1 $2 $3 $4 $5 $6 $7 $8 $9 echo - - if [ -z "$1" ] ; then n1="AMSAT" ; else n1=$1 ; fi - if [ -z "$2" ] ; then n2="AMSAT" ; else n2=$2 ; fi - if [ -z "$3" ] ; then n3="AMSAT" ; else n3=$3 ; fi - if [ -z "$4" ] ; then n4="AMSAT" ; else n4=$4 ; fi - if [ -z "$5" ] ; then n5="AMSAT" ; else n5=$5 ; fi - if [ -z "$6" ] ; then n6="AMSAT" ; else n6=$6 ; fi - if [ -z "$7" ] ; then n7="AMSAT" ; else n7=$7 ; fi - if [ -z "$8" ] ; then n8="AMSAT" ; else n8=$8 ; fi - if [ -z "$9" ] ; then n9="AMSAT" ; else n9=$9 ; fi echo -e "\nCubeSatSim configuraation sim.cfg file updated to: \n" echo echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 > /home/pi/CubeSatSim/sim.cfg +fi if [ $FLAG -eq 1 ]; then echo "systemctl daemon-reload and reboot" From 63e41e5faf99ca43a534b91c3bb4fce869a9787c Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 22 Nov 2023 11:03:06 -0500 Subject: [PATCH 3/4] Update update added sim.cfg defaults --- update | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/update b/update index fa21943a..92c95b1b 100755 --- a/update +++ b/update @@ -232,15 +232,15 @@ value=`cat /home/pi/CubeSatSim/sim.cfg` echo "$value" > /dev/null set -- $value -if [ -z "$1" ] ; then n1="AMSAT" ; else n1=$1 ; fi -if [ -z "$2" ] ; then n2="AMSAT" ; else n2=$2 ; fi -if [ -z "$3" ] ; then n3="AMSAT" ; else n3=$3 ; fi -if [ -z "$4" ] ; then n4="AMSAT" ; else n4=$4 ; fi -if [ -z "$5" ] ; then n5="AMSAT" ; else n5=$5 ; fi -if [ -z "$6" ] ; then n6="AMSAT" ; else n6=$6 ; fi -if [ -z "$7" ] ; then n7="AMSAT" ; else n7=$7 ; fi -if [ -z "$8" ] ; then n8="AMSAT" ; else n8=$8 ; fi -if [ -z "$9" ] ; then n9="AMSAT" ; changed=1 ; else n9=$9 ; fi +if [ -z "$1" ] ; then n1="AMSAT" ; changed=1 ; else n1=$1 ; fi # callsign +if [ -z "$2" ] ; then n2="0" ; changed=1 ; else n2=$2 ; fi # reset count +if [ -z "$3" ] ; then n3="0" ; changed=1 ; else n3=$3 ; fi # lat +if [ -z "$4" ] ; then n4="0" ; changed=1 ; else n4=$4 ; fi # lon +if [ -z "$5" ] ; then n5="no" ; changed=1 ; else n5=$5 ; fi # sim mode +if [ -z "$6" ] ; then n6="3" ; changed=1 ; else n6=$6 ; fi # squelch +if [ -z "$7" ] ; then n7="434.9000" ; changed=1 ; else n7=$7 ; fi # transmit frequency +if [ -z "$8" ] ; then n8="436.0000" ; changed=1 ; else n8=$8 ; fi # receive frequency +if [ -z "$9" ] ; then n9="no" ; changed=1 ; else n9=$9 ; fi # hab mode if [ $changed -eq 1 ]; then echo -e "Current sim.cfg configuration file:" From df597d5df8f288e48ff35f126c75465ffed37929 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Wed, 22 Nov 2023 11:08:02 -0500 Subject: [PATCH 4/4] Update update cleanup --- update | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/update b/update index 92c95b1b..f0d2d72b 100755 --- a/update +++ b/update @@ -246,12 +246,11 @@ if [ $changed -eq 1 ]; then echo -e "Current sim.cfg configuration file:" echo echo $1 $2 $3 $4 $5 $6 $7 $8 $9 - echo - echo -e "\nCubeSatSim configuraation sim.cfg file updated to: \n" echo echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 echo $n1 $n2 $n3 $n4 $n5 $n6 $n7 $n8 $n9 > /home/pi/CubeSatSim/sim.cfg + echo fi if [ $FLAG -eq 1 ]; then