Merge pull request #449 from alanbjohnston/master-b5

Master b5

Welcome_Message.txt

@@ -0,0 +1,18 @@
+Welcome!
+
+Hello, and welcome to the CubeSatSim Pacsat Simulator!
+
+Here's what you can do with your PacSatSim:
+
+1. Downlink a Message by clicking on the message then the "FILE" button.  When it is Downlinked, the Message will show as "New". If you double click on it you can view it and save it to your computer using the 'Export' button.
+2. Uplink a Message using the "New Msg" button.  Under "Select Type" select "ASCII", type your message and then "Send"
+3. Reply to a Message by first Downlinking the message using the "FILE" button, then opening the Message and selecting "Reply" then "Send"
+4. Uplink a File using the "New Msg" button.  Under "Select Type" select "JPG" or "BINARY".  Remember the link is just 1200 bps, so don't try to Uplink anything larger than a few kilobytes.  You could Downlink the SSTV image and try Uplinking it.
+5. Send a Command using the "Command" button.  Under "Type" select "File System". Under "Commands" you can try "Pacsat Broadcast" then try setting "stop" or "start" then click "Send" to send the Command.  Or under "Type" select "File Uploads". You can select "Off" or "All Stations" and click "Send" to send the Command. You can restore using config -k
+6. You can clear the current Pacsat Directory.  You can always restore the default Directory contents running CubeSatSim/config -k and selecting Option 4 Reset PacSat Satellite. Using the "Command" button,  select "Delete Folder Contents" then select "PACSAT dir" and then "Send" to send the Command.
+
+You can post questions and comments on the CubeSatSim Discussions Board https://github.com/alanbjohnston/CubeSatSim/discussions
+
+73,
+Alan
+KU2Y

pacsatsim.sh

@@ -83,44 +83,45 @@ echo
 
 sleep 2
 
-if [ "$reset" = "0" ] ; then
+# if [ "$reset" = "0" ] ; then
+if [ ! -d "/home/pi/PacSat" ]; then
 
-  if [ ! -d "/home/pi/PacSat" ]; then
+#  if [ ! -d "/home/pi/PacSat" ]; then
   
-    echo "Setting up PacSatSim default configuration"
-    echo
+#    echo "Setting up PacSatSim default configuration"
+#    echo
   
-    cd
-    sudo rm pacsat-dir.zip
-    mkdir /home/pi/PacSat
-    mkdir /home/pi/PacSat/pacsat
-    mkdir /home/pi/PacSat/pacsat/dir
-  #  wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pacsat-dir.zip
-    cp /home/pi/pi_pacsat/zip/pacsat-dir.zip .
-    unzip pacsat-dir.zip 
-    sudo rm pacsat-dir.zip
+#    cd
+#    sudo rm pacsat-dir.zip
+#    mkdir /home/pi/PacSat
+#    mkdir /home/pi/PacSat/pacsat
+#    mkdir /home/pi/PacSat/pacsat/dir
+##  wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pacsat-dir.zip
+ #   cp /home/pi/pi_pacsat/zip/pacsat-dir.zip .
+  #  unzip pacsat-dir.zip 
+  #  sudo rm pacsat-dir.zip
   
-    cd
-    sudo rm /home/pi/pi_pacsat/Debug/pacsat.config
-    sudo rm /home/pi/pi_pacsat/Debug/pacsat.state
-    sudo rm /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat
-    sudo rm pi_pacsat.zip
-  #  wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pi_pacsat.zip
-    cp /home/pi/pi_pacsat/zip/pi_pacsat.zip .
-    unzip pi_pacsat.zip 
-    sudo rm pi_pacsat.zip
-
-    sudo sed -i 's/dir_max_file_age_in_seconds=4320000/dir_max_file_age_in_seconds=60480000/g' /home/pi/pi_pacsat/Debug/pacsat.state
-    sudo sed -i 's/ftl0_max_upload_age_in_seconds=432000/ftl0_max_upload_age_in_seconds=60480000/g' /home/pi/pi_pacsat/Debug/pacsat.state
-
-    echo
-    echo "pacsat.state:"
-    cat /home/pi/pi_pacsat/Debug/pacsat.state
-    echo
+   # cd
+  #  sudo rm /home/pi/pi_pacsat/Debug/pacsat.config
+  #  sudo rm /home/pi/pi_pacsat/Debug/pacsat.state
+  #  sudo rm /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat
+  #  sudo rm pi_pacsat.zip
+  ##  wget https://github.com/alanbjohnston/pi_pacsat/releases/download/v0.2/pi_pacsat.zip
+#    cp /home/pi/pi_pacsat/zip/pi_pacsat.zip .
+ #   unzip pi_pacsat.zip 
+  #  sudo rm pi_pacsat.zip
+#
+ #   sudo sed -i 's/dir_max_file_age_in_seconds=4320000/dir_max_file_age_in_seconds=60480000/g' /home/pi/pi_pacsat/Debug/pacsat.state
+  #  sudo sed -i 's/ftl0_max_upload_age_in_seconds=432000/ftl0_max_upload_age_in_seconds=60480000/g' /home/pi/pi_pacsat/Debug/pacsat.state
+
+   # echo
+    #echo "pacsat.state:"
+    # cat /home/pi/pi_pacsat/Debug/pacsat.state
+ #   echo
   
-  fi
+#  fi
 
-else
+# else
 
   echo "Resetting pi_pacsat to empty configuration"
   echo
@@ -128,7 +129,8 @@ else
   mkdir /home/pi/PacSat
   mkdir /home/pi/PacSat/pacsat
   mkdir /home/pi/PacSat/pacsat/dir
-  
+  mkdir /home/pi/PacSat/pacsat/txt
+  cp /home/pi/CubeSatSim/Welcome_Message.txt /home/pi/PacSat/pacsat/txt/Welcome_Message.txt
   cd /home/pi/pi_pacsat/Debug
   
   sudo rm pacsat_last_command_time.dat
@@ -154,7 +156,7 @@ else
   
   touch /home/pi/pi_pacsat/Debug/pacsat_upload_table.dat
 
-  exit
+#  exit
 fi
 
 value=`cat /home/pi/CubeSatSim/sim.cfg`