Merge branch 'master' of github.com:filipsPL/autowx2

filipsPL · Apr 25, 2019 · 72804c5 · 72804c5
2 parents 11fccd3 + 576906b
commit 72804c5
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 5 deletions.
diff --git a/autowx2_conf.py.example b/autowx2_conf.py.example
@@ -154,6 +154,7 @@ webInterfacePort = 5010
 scriptToRunInFreeTime = baseDir + "bin/aprs.sh" 	# APRS monitor
 #scriptToRunInFreeTime = baseDir + "bin/radiosonde_auto_rx.sh" # radiosonde tracker, see https://github.com/projecthorus/radiosonde_auto_rx
 #scriptToRunInFreeTime = baseDir + "bin/pymultimonaprs.sh" # APRS iGate,
+#scriptToRunInFreeTime = baseDir + "bin/wspr.sh"      # Weak Signal Propagation Reporter
 
 # pymultimonaprs must be installed, see: https://github.com/asdil12/pymultimonaprs/
 #scriptToRunInFreeTime = baseDir + "bin/dump1090.sh"

diff --git a/bin/wspr.sh b/bin/wspr.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# runs WSPR receiver
+
+# read the global configuration file autowx2_conf.py via the bash/python configuration parser
+# do not change the following three lines
+scriptDir="$(dirname "$(realpath "$0")")"
+source $scriptDir/basedir_conf.py
+source $baseDir/_listvars.sh
+
+#--------------------------------------#
+
+# # # # Edit following variable with your correct data # # # #
+call="SA7BNT"
+gain="40"
+locator="JO77PP"
+hz="28.1246M"
+info_rx="Start reception 10 meters"
+sampling="0" #direct sampling [0,1,2] (default: 0 for Quadrature, 1 for I branch, 2 for Q branch)
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ##
+
+logfile="$recordingDir/rtlsdr_wspr/"$(date +"%Y/%m")/$(date +"%Y%m%d")".txt"
+
+mkdir -p $(dirname $logfile)
+
+duration=$1
+dongleShift=$2
+
+mkdir -p $(dirname $logfile)
+
+  sleep 1
+      pgrep rtlsdr_wsprd > /dev/null 2>&1
+       if [ $? -eq 0 ]; then
+         echo $'\n'"---Kill rtlsdr_wsprd pid---" >> $logfile
+        killall rtlsdr_wsprd &>> $logfile
+       fi
+         echo $'\n'"$(date)" >> $logfile
+       echo "$info_rx"$'\n' >> $logfile
+     sleep 1
+
+
+cd ~/rtlsdr-wsprd
+timeout --kill-after=1 $duration ./rtlsdr_wsprd -p "$dongleShift" -f "$hz" -c "$call" -l "$locator" -g "$gain" -d "$sampling" | tee -a $logfile
diff --git a/var/flask/templates/index.html b/var/flask/templates/index.html
@@ -5,10 +5,10 @@
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="autowx2 atomated satellite receiving station">
+    <meta name="description" content="autowx2 automated satellite receiving station">
     <meta name="author" content="filipsPL@github">
 
-    <title>autowx2 atomated satellite receiving station :: {{title}}</title>
+    <title>autowx2 automated satellite receiving station :: {{title}}</title>
 
     <!-- Bootstrap core CSS -->
     <link href="{{ url_for('static',filename='bootstrap.min.css') }}" rel="stylesheet">

diff --git a/var/www/index.tpl b/var/www/index.tpl
@@ -6,10 +6,10 @@ cat <<EOF
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="autowx2 atomated satellite receiving station $stationName">
+    <meta name="description" content="autowx2 automated satellite receiving station $stationName">
     <meta name="author" content="filipsPL@github">
 
-    <title>autowx2 atomated satellite receiving station $stationName :: $htmlTitle</title>
+    <title>autowx2 automated satellite receiving station $stationName :: $htmlTitle</title>
 
     <!-- Bootstrap core CSS -->
     <link href="$wwwRootPath/css/bootstrap.min.css" rel="stylesheet">
@@ -62,7 +62,7 @@ cat <<EOF
   $autowxUptime
   Software version: $autowx2version<br />
   $shortlistofnextpassess
-  
+
   $htmlBody
   </div>
 </div>