Merge branch 'develop' into dev_netHistory

.travis.yml

@@ -5,7 +5,6 @@ sudo: required
 branches:
   only:
     - master
-    - beta
     - develop
 
 before_script:

CHANGELOG.md

@@ -7,6 +7,7 @@
 ##### Changed
 ##### Deprecated
 ##### Removed
+- Beta Branch aus Readme, Installer und Travis-CI entfernt [#324](https://github.com/Schrolli91/BOSWatch/pull/324)
 ##### Fixed
 ##### Security
 

Konzept.md

@@ -2,6 +2,7 @@
 ============
 
 
+Python 3
 Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen.
 
 
@@ -12,11 +13,13 @@ Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen.
  - reine Dekodierung mittels rtl-fm und multimon
  - Keine Filter usw. nur die Dekoder, Daten verpacken, verschicken
  - per TCP Socket an den Server
+ - versch Eingabequellen (DVB-T Stick, Audio Eingang)
 
  ### Server:
  - Empfängt die TCP Socket Pakete der einzelnen Clients
  - Durch doubleFiltering fallen doppelt eingehende Alarme der Clienten sowieso raus
- - Danach Filterung usw. dann call an die plugins
+ - Danach Filterung nach neuen Filterkonzept
+ - dann call an die plugins
 
 
 

README.md

@@ -1,7 +1,6 @@
 |Branch|Code Qualität|CI-Build|
 |---|---|---|
 |master|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/master.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763821)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=master)](https://travis-ci.org/Schrolli91/BOSWatch)|
-|beta|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/beta.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=4213030)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=beta)](https://travis-ci.org/Schrolli91/BOSWatch)|
 |develop|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/develop.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763820)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=develop)](https://travis-ci.org/Schrolli91/BOSWatch)|
 
 

boswatch.py

@@ -18,11 +18,12 @@ GitHUB:		https://github.com/Schrolli91/BOSWatch
 import logging
 import logging.handlers
 
-import argparse     # for parse the args
-import ConfigParser # for parse the config file
-import os           # for log mkdir
-import time         # for time.sleep()
-import subprocess   # for starting rtl_fm and multimon-ng
+import argparse		# for parse the args
+import ConfigParser	# for parse the config file
+import os			# for log mkdir
+import sys			# for py version
+import time			# for time.sleep()
+import subprocess	# for starting rtl_fm and multimon-ng
 
 from includes import globalVars  # Global variables
 from includes import MyTimedRotatingFileHandler  # extension of TimedRotatingFileHandler
@@ -164,6 +165,7 @@ try:
 		logging.debug("SW Version:	%s",globalVars.versionNr)
 		logging.debug("Branch:		%s",globalVars.branch)
 		logging.debug("Build Date:	%s",globalVars.buildDate)
+		logging.debug("Python Vers:	%s",sys.version)
 		logging.debug("BOSWatch given arguments")
 		if args.test:
 			logging.debug(" - Test-Mode!")
@@ -221,6 +223,9 @@ try:
 			configHandler.checkConfig("FMS")
 			configHandler.checkConfig("ZVEI")
 			configHandler.checkConfig("POC")
+			configHandler.checkConfig("Plugins")
+			configHandler.checkConfig("Filters")
+			#NMAHandler is outputed below
 	except:
 		# we couldn't work without config -> exit
 		logging.critical("cannot read config file")

includes/globalVars.py

@@ -9,7 +9,7 @@ Global variables
 """
 
 # version info
-versionNr = "2.2.2"
+versionNr = "2.3"
 branch = "dev"
 buildDate = "unreleased"
 

install.sh

@@ -12,7 +12,7 @@ function exitcodefunction {
     echo "Action: $action on $module failed."
     echo "Exitcode: $errorcode"
     echo ""
-    echo " -> If you want to open an Issue at https://github.com/Schrolli91/BOSWatch/issues"
+    echo " -> If you want to open an issue at https://github.com/Schrolli91/BOSWatch/issues"
     echo "    please post the logfile, located at $boswatchpath/install/setup_log.txt"
     exit 1
   else
@@ -78,11 +78,10 @@ for (( i=1; i<=$#; i=$i+2 )); do
       -b|--branch)
       case $arg2 in
         dev|develop)  echo "       !!! WARNING: you are using the DEV BRANCH !!!       "; branch=dev ;;
-        beta)         echo "       !!! WARNING: you are using the BETA BRANCH !!!      "; branch=beta ;;
         *) branch=master ;;
       esac ;;
 
-      -p|--path)    echo " !!! WARNING: you install BOSWATCH to alternative path !!! "; boswatchpath=$arg2 ;;
+      -p|--path)    echo " !!! WARNING: you'll install BOSWATCH to alternative path !!! "; boswatchpath=$arg2 ;;
 
       *) echo "Internal error!" ; exit 1 ;;
     esac
@@ -205,16 +204,15 @@ tput cup 15 5
 echo "-> configure..........................."
 cd $boswatchpath/
 chmod +x *
-echo $'# BOSWatch - blacklist the DVB drivers to avoid conflict with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core' >> /etc/modprobe.d/boswatch_blacklist_sdr.conf
+echo $'# BOSWatch - blacklist the DVB drivers to avoid conflicts with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core' >> /etc/modprobe.d/boswatch_blacklist_sdr.conf
 
 tput cup 17 1
 echo "BOSWatch is now installed in $boswatchpath/"
 echo "Installation ready!"
 tput cup 19 3
-echo "Watch out: to run BOSWatch you have to generate and modify the config.ini!"
-echo "Do the following steps to have a running version of BOSWatch:"
-echo "sudo cp $boswatchpath/BOSWatch/config/config.template.ini $boswatchpath/BOSWatch/config/config.ini"
-echo "sudo nano $boswatchpath/BOSWatch/config/config.ini"
+echo "Watch out: to run BOSWatch you have to modify the config.ini!"
+echo "Do the following step to do so:"
+echo "sudo nano $boswatchpath/config/config.ini"
 echo "and modify the config as you need. This step is optional if you are upgrading an old version of BOSWatch. "
 
 tput cnorm