Merge branch 'master' of http://github.com/alanbjohnston/CubeSatSim

OliveTin/config.yaml

@@ -134,14 +134,17 @@ actions:
 
   - title: "Connect to WiFi using SSID and Password" 
     icon: "🛜" # wireless
-    shell: echo "If this works, this web page won't work again until you connect to the new WiFi network!" && echo && sudo nmcli device wifi rescan && sleep 1 && sudo nmcli device wifi connect "{{ wifi_ssid }}" password "{{ wifi_password }}" && sudo reboot now 
+    exec: 
+      - /home/pi/CubeSatSim/set_wifi.sh 
+      - "{{ wifi_ssid }}" 
+      - "{{ wifi_password }}" 
     onclick: execution-dialog
     timeout: 10
     arguments:
       - name: wifi_ssid
         type: ascii_sentence
       - name: wifi_password 
-        type: ascii_sentence
+        type: password
 
   - title: "Change Hostname and Restart" 
     icon: "🛜" # wireless

groundstation/fctelem.sh

@@ -187,7 +187,7 @@ cp /home/pi/CubeSatSim/sstv/sstv_image_1_320_x_256.jpg ./image_file.jpeg
 python3 -m http.server 8002 &
 
 #setsid chromium-browser --check-for-update-interval=1 --simulate-critical-update  --noerrdialogs --disable-infobars http://127.0.0.1:8002 &>/dev/null & 
-setsid x-www-browser http://127.0.0.1:8002/
+setsid x-www-browser http://127.0.0.1:8002/ &
 
 cd /home/pi/fctelem