Merge pull request #21 from davecrump/master

Interim changes for new express_server

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Updated by davecrump on 20170202
+# Updated by davecrump on 20170209
 
 # Update the package manager, then install the packages we need
 sudo dpkg --configure -a
@@ -149,7 +149,7 @@ cd /etc/kbd
 sudo sed -i 's/^BLANK_TIME.*/BLANK_TIME=0/' config
 sudo sed -i 's/^POWERDOWN_TIME.*/POWERDOWN_TIME=0/' config
 
-# Download, amend, compile and install DATV Express-server
+# Download, compile and install DATV Express-server
 
 cd /home/pi
 wget https://github.com/G4GUO/express_server/archive/master.zip
@@ -157,8 +157,6 @@ unzip master.zip
 mv express_server-master express_server
 rm master.zip
 cd /home/pi/express_server
-sed -i 's/^     express_handle_events( 32 ).*/     express_handle_events( 1 );/' express.cpp
-sed -i 's/^set ptt tx.*/set ptt rx/' datvexpress.txt
 make
 sudo make install
 

scripts/a.sh

@@ -150,11 +150,7 @@ case "$MODE_OUTPUT" in
       # From its own folder otherwise it doesnt read the config file
       sudo rm /tmp/expctrl >/dev/null 2>/dev/null
       cd /home/pi/express_server
-      if (( $SYMBOLRATEK \< 999 )); then
-        sudo nice -n -40 /home/pi/express_server/express_server -nb  >/dev/null 2>/dev/null &
-      else
-        sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
-      fi
+      sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
       cd /home/pi
       sleep 5
     fi
@@ -181,10 +177,9 @@ case "$MODE_OUTPUT" in
       GAIN="30";
     fi
 
-    # Gain nees to be in range 6 - 100 step 2,
-    #  so translate from Windows levels of 0-47
-    GAINC=`echo - | awk '{print '$GAIN' * 2 +6}'`
-    echo "set level "$GAINC >> /tmp/expctrl
+    # Set Gain
+    echo "set level "$GAIN >> /tmp/expctrl
+
     # Make sure that carrier mode is off
     echo "set car off" >> /tmp/expctrl
   ;;

scripts/latest_version.txt

@@ -1 +1 @@
-201702060
+201702090

scripts/menu.sh

@@ -471,6 +471,7 @@ if [ $? -eq 0 ]; then
   DTX1)	;;
 
   DATVEXPRESS)
+    echo "Starting the DATV Express Server.  Please wait."
     if pgrep -x "express_server" > /dev/null; then
       # Express already running
       sudo killall express_server  >/dev/null 2>/dev/null
@@ -479,11 +480,7 @@ if [ $? -eq 0 ]; then
       sudo rm /tmp/expctrl >/dev/null 2>/dev/null
       # Start Express from its own folder otherwise it doesnt read the config file
       cd /home/pi/express_server
-      if (( $SYMBOLRATEK \< 999 )); then
-        sudo nice -n -40 /home/pi/express_server/express_server -nb  >/dev/null 2>/dev/null &
-      else
-        sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
-      fi
+      sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
       cd /home/pi
       sleep 5
   ;;
@@ -506,8 +503,6 @@ do_symbolrate_setup()
   SYMBOLRATE=$(whiptail --inputbox "$StrOutputSymbolrateContext" 8 78 $SYMBOLRATE --title "$StrOutputSymbolrateTitle" 3>&1 1>&2 2>&3)
   if [ $? -eq 0 ]; then
     set_config_var symbolrate "$SYMBOLRATE" $CONFIGFILE
-    # Kill express server because it might need to restart in narrowband
-    sudo killall express_server  >/dev/null 2>/dev/null
   fi
 }
 
@@ -1345,11 +1340,7 @@ if [ "$MODE_OUTPUT" == "DATVEXPRESS" ]; then
     sudo rm /tmp/expctrl >/dev/null 2>/dev/null
     # From its own folder otherwise it doesn't read the config file
     cd /home/pi/express_server
-    if (( $SYMBOLRATEK \< 999 )); then
-      sudo nice -n -40 /home/pi/express_server/express_server -nb  >/dev/null 2>/dev/null &
-    else
-      sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
-    fi
+    sudo nice -n -40 /home/pi/express_server/express_server  >/dev/null 2>/dev/null &
     cd /home/pi
     sleep 5                # Give it time to start
     reset                  # Clear message from screen

src/gui/rpidatvtouch.c

@@ -472,9 +472,6 @@ void SelectSR(int NoButton)  // Symbol Rate
   sprintf(Value,"%d",SR);
   printf("************** Set SR = %s\n",Value);
   SetConfigParam(PATH_CONFIG,Param,Value);
-
-  // Kill express_server in case SR has gone from nb to wb or vice versa
-  system("sudo killall express_server >/dev/null 2>/dev/null");
 }
 
 void SelectFec(int NoButton)  // FEC

update.sh

@@ -154,7 +154,7 @@ sudo sed -i 's/^BLANK_TIME.*/BLANK_TIME=0/' config
 sudo sed -i 's/^POWERDOWN_TIME.*/POWERDOWN_TIME=0/' config
 cd /home/pi
 
-# Delete, download, amend, compile and install DATV Express-server (201702021)
+# Delete, download, compile and install DATV Express-server (201702021)
 
 if [ ! -f "/bin/netcat" ]; then
   sudo apt-get -y install netcat
@@ -169,10 +169,9 @@ unzip master.zip
 mv express_server-master express_server
 rm master.zip
 cd /home/pi/express_server
-sed -i 's/^     express_handle_events( 32 ).*/     express_handle_events( 1 );/' express.cpp
-sed -i 's/^set ptt tx.*/set ptt rx/' datvexpress.txt
 make
 sudo make install
+cd /home/pi
 
 # Update pi-sdn (201702020)
 rm -f /home/pi/pi-sdn

version_history.txt

@@ -1,3 +1,6 @@
+201702090
+Interim release to support updated DATV Express Server files.  Adds PTT Switching
+
 201702060
 Adds support for the DATV Express modulator.  See https://wiki.batc.tv/Controlling_a_DATVExpress
 Minor stability improvements