improve ordering to ensure that updating message stays on the emonPi LCD

Author: TrystanLea

update/emonpi.sh

@@ -16,3 +16,6 @@ echo "avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:$ope
 avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:$openenergymonitor_dir/emonpi/firmware/compiled/latest.hex
 
 sudo systemctl start emonhub
+
+echo "waiting for emonpi to stop controlling LCD"
+sleep 3

update/emonsd.sh

@@ -7,3 +7,8 @@ echo "-------------------------------------------------------------"
 if [ -f $openenergymonitor_dir/emonpi/lcd/install.sh ]; then
     $openenergymonitor_dir/emonpi/lcd/./install.sh
 fi
+
+echo "Stopping emonPiLCD service"
+sudo systemctl stop emonPiLCD
+echo "Display update message on LCD"
+sudo $openenergymonitor_dir/emonpi/lcd/./emonPiLCD_update.py

update/main.sh

@@ -78,6 +78,29 @@ cd $openenergymonitor_dir/EmonScripts/update
 
 # -----------------------------------------------------------------
 
+if [ "$type" == "all" ] || [ "$type" == "emonhub" ]; then
+    echo "Start emonhub update script:"
+    $openenergymonitor_dir/EmonScripts/update/emonhub.sh
+    echo
+fi
+
+# -----------------------------------------------------------------
+
+if [ "$type" == "all" ] || [ "$type" == "emoncms" ]; then    
+    echo "Start emoncms update:"
+    $openenergymonitor_dir/EmonScripts/update/emoncms_core.sh
+    $openenergymonitor_dir/EmonScripts/update/emoncms_modules.sh
+    echo
+fi
+
+# -----------------------------------------------------------------
+
+if [ "$type" == "all" ] && [ "$emonSD_pi_env" = "1" ]; then  
+    $openenergymonitor_dir/EmonScripts/update/emonsd.sh
+fi
+
+# -----------------------------------------------------------------
+
 if [ "$type" == "all" ] || [ "$type" == "firmware" ]; then
 
     if [ "$firmware" == "emonpi" ]; then
@@ -99,29 +122,17 @@ fi
 
 # -----------------------------------------------------------------
 
-if [ "$type" == "all" ] || [ "$type" == "emonhub" ]; then
-    echo "Start emonhub update script:"
-    $openenergymonitor_dir/EmonScripts/update/emonhub.sh
+if [ "$hardware" == "EmonPi" ]; then
     echo
-fi
-
-# -----------------------------------------------------------------
-
-if [ "$type" == "all" ] || [ "$type" == "emoncms" ]; then    
-    echo "Start emoncms update:"
-    $openenergymonitor_dir/EmonScripts/update/emoncms_core.sh
-    $openenergymonitor_dir/EmonScripts/update/emoncms_modules.sh
+    # Wait for update to finish
+    echo "Starting emonPi LCD service.."
+    sleep 5
+    sudo service emonPiLCD restart
     echo
 fi
 
 # -----------------------------------------------------------------
 
-if [ "$type" == "all" ] && [ "$emonSD_pi_env" = "1" ]; then  
-    $openenergymonitor_dir/EmonScripts/update/emonsd.sh
-fi
-
-# -----------------------------------------------------------------
-
 datestr=$(date)
 
 echo