diff --git a/README.md b/README.md index 836ca18..813b208 100644 --- a/README.md +++ b/README.md @@ -82,4 +82,5 @@ At the end you can find the Programm in `/home/pi/bos/BOSWatch` - MySQL Database Server Thanks to smith_fms and McBo from [Funkmeldesystem.de - Forum](http://www.funkmeldesystem.de/) for Inspiration and Groundwork! -Greetz Schrolli + +######Greetz Schrolli diff --git a/boswatch.py b/boswatch.py index 9bddc10..824d95a 100644 --- a/boswatch.py +++ b/boswatch.py @@ -3,6 +3,7 @@ ##### Info ##### # BOSWatch +# Autor: Bastian Schroll # Python Script to Recive and Decode German BOS Information with rtl_fm and multimon-NG # For more Information see the README.md ##### Info ##### @@ -63,6 +64,7 @@ print(" / __ / / / /\__ \| | /| / / __ `/ __/ ___/ __ \ e") print(" / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / / t") print(" /_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/ a") print(" German BOS Information Script ") +print(" by Bastian Schroll ") print("") freq = args.freq @@ -113,7 +115,7 @@ try: zvei_double_ignore_time = int(config.get("ZVEI", "double_ignore_time")) #MySQL config - useMySQL = int(config.get("MySQL", "useMySQL")) #use MySQL support? + useMySQL = int(config.get("Module", "useMySQL")) #use MySQL support? if useMySQL: #only if MySQL is active dbserver = config.get("MySQL", "dbserver") dbuser = config.get("MySQL", "dbuser") diff --git a/config.ini b/config.ini index 9cf5251..561ddf8 100644 --- a/config.ini +++ b/config.ini @@ -2,23 +2,27 @@ # BOSWatch Config File # ######################## -#Data for MySQL connection -#useMySQL = (0|1) -[MySQL] -useMySQL = 0 -dbserver = localhost -dbuser = root -dbpassword = root -database = boswatch - -tableFMS = bos_fms -tableZVEI = bos_zvei -tablePOC = bos_pocsag - [FMS] #time to ignore same alarm in a row in seconds double_ignore_time = 10 [ZVEI] #time to ignore same alarm in a row in seconds -double_ignore_time = 5 \ No newline at end of file +double_ignore_time = 5 + +#can take on or off the modules (0|1) +[Module] +useMySQL = 0 +#useAudiorecord = 0 +#useHTTPrequest = 0 + +#Data for MySQL connection +[MySQL] +dbserver = localhost +dbuser = root +dbpassword = root +database = boswatch + +tableFMS = bos_fms +tableZVEI = bos_zvei +tablePOC = bos_pocsag \ No newline at end of file