Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2025-12-06 07:42:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
488 commits 4 branches 17 tags 4 MiB
Commit graph

488 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bastian Schroll a472b42e22 add qt4-default to install's 
see Issue #89
problem at ubuntu server 15.10
 2016-04-15 16:20:26 +02:00
Bastian Schroll dba4bdc890 insert an install file for the dev branch 2016-03-26 10:13:50 +01:00
Bastian Schroll 4e2229e8b0 fix bug #85 
fix the bug drom issue #85
 2016-03-26 09:44:45 +01:00
Schrolli91 0c3ed6d788 insert -g --gain function 2015-12-25 23:13:12 +01:00
Schrolli91 b500d0ad3f Merge pull request #78 from Schrolli91/master 
edit readme
 2015-12-25 23:01:08 +01:00
Schrolli91 1330ead162 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2015-12-25 22:54:14 +01:00
Schrolli91 89710f9ee8 Merge pull request #75 from imsoftware/patch-1 
Update README.md
 2015-12-14 13:23:29 +01:00
imsoftware 1870b79b2a Update README.md 
Removed canceled text and Plugins section update.
 2015-11-27 00:16:32 +01:00
Schrolli91 cbab0eadd0 edit readmes 2015-10-12 22:03:04 +02:00
JHCD 41122e9a6a add csv-field eventPrefix to NMA-Plugin 
will be insert in front of "id/description"
f.e.: "Alarm: 1234567" or "Alarm: POCSAG testdata äöüß"
 2015-07-31 20:16:13 +02:00
JHCD 02efb9552a reduce entries in globals.py 
only entries for use in more than one .py-file have to stay here...
 2015-07-31 19:50:27 +02:00
JHCD e26fc45313 rename includes/converter.py -> includes/helper/freqConverter.py 2015-07-31 19:20:05 +02:00
JHCD e7b5bffdd3 add data['timestamp'] #72 
to make sure, that all Plugins use the same timestamp
 2015-07-31 19:09:27 +02:00
JHCD 28936d68ec change string converting for NMA and firE plugins #73 2015-07-30 22:18:31 +02:00
JHCD 30320b3c71 add possibility to start Plugins asynchron 
If you are using many Plugins or Plugins with a long execution time you could execute them in an asynchronous manner.
It must be pointed out that enabling (0|1) this consume time, so don't use it for one rapid Plugin.
 2015-07-30 18:55:36 +02:00
JHCD 3e7cc1f365 add more logging.debug for #67 2015-07-29 18:43:25 +02:00
JHCD b529e93763 expand notifyMyAndroid-plugin for multi recipients and/or different priorities #33 
use csv/nma.csv to config different priorities or multiple recipients
 2015-07-28 22:50:22 +02:00
JHCD 990f0b579d more docu 2015-07-28 20:36:46 +02:00
JHCD dbe33a30d8 add appName to config.ini #33 2015-07-28 20:24:57 +02:00
JHCD 19653e5515 add line break to eMail plugin #71 2015-07-28 19:44:14 +02:00
JHCD f95a270177 replace passwords and apikeys with "***" in logging #69 2015-07-27 20:55:50 +02:00
JHCD 6520edea4c change replace wildcards to helper-function 2015-07-24 19:52:18 +02:00
JHCD 65a35d4a64 change logging behaviour of NMAHandler #33 
NMA applicationname is now configurable
NMA event contains now module and function
 2015-07-24 14:39:32 +02:00
JHCD b09f1731ea add logging handler for NotifyMyAndroid #46 2015-07-23 20:37:33 +02:00
JHCD 997b5eeec3 add NMA plugin #33 
first version, only with one receiver
 2015-07-19 20:29:22 +02:00
JHCD a8cacf9e42 add load history from mysql and filelogging 
additional small changes and bugfixes
 2015-07-17 20:26:38 +02:00
JHCD 25de05c709 changes in display-interface and adding alarmsound 2015-07-15 19:59:06 +02:00
JHCD 302bd8997e Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 2015-07-15 16:04:09 +02:00
JHCD f7ee3afb5c insert history and status pages to alarmMonitorRPi 2015-07-15 16:02:36 +02:00
Schrolli d8b60b3fa6 logo in main-dir + edit readme logo path 2015-07-15 08:43:52 +02:00
JHCD 646a2b2913 Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 2015-07-15 07:50:45 +02:00
JHCD dbd09445fa resolve list problem with configParser 2015-07-15 07:50:14 +02:00
JHCD 06458794ee resolve list problem with configParser 2015-07-15 07:47:44 +02:00
JHCD 4e013ee55d add alarmMonitor for Rasbperry with RPiDisplay 
This is an alarmMonitor for receive alarm-messages from BOSWatch and show them on a touchscreen
The jsonSocketServer controlls an Watterott RPi-Display in case of received POCSAG-RIC

Implemented functions:
- asynchronous threads for display control
- show ric-description and alarm-message on display
- different colours for no alarm, test alarm and alarm
- auto-turn-off display
- show POCSAG is alive status (coloured clock)
 2015-07-15 00:59:54 +02:00
JHCD ce97760b00 fix logo-path 2015-07-14 21:44:36 +02:00
JHCD ad88f65d0b move www-dir to exampleAddOns 2015-07-14 21:40:56 +02:00
JHCD beb955567f rename serverExamples -> exampleAddOns 2015-07-14 21:37:30 +02:00
JHCD e6ca09c550 delete unused row 2015-07-14 19:13:04 +02:00
JHCD 6b7cf98034 make sure MySQL use utf-8 #63 2015-07-14 19:11:54 +02:00
JHCD 876d3dbec6 change csv-files to utf-8 #63 2015-07-14 18:28:13 +02:00
JHCD e936298ed6 change send eMail to UTF-8 #63 2015-07-14 17:35:58 +02:00
Bastian Schroll ae0fd40e06 fix timeHandler problem in eMail plugin 2015-07-14 16:59:02 +02:00
JHCD 1558f05e37 Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 2015-07-14 16:51:04 +02:00
JHCD f3db4635c7 convert csv-files to UTF-8 #63 2015-07-14 16:49:14 +02:00
Schrolli91 aaa575ddda Merge pull request #65 from kevinkleist/develop 
Änderungen am Webinterface
 2015-07-14 15:12:23 +02:00
kevinkleist de6b5febd8 Änderungen am Webinterface 
Bitte einmal vorher testen.
Habe hier leider grade keine Möglichkeit zu testen.
 2015-07-14 14:11:49 +02:00
kevinkleist 7517fb81f3 Merge pull request #2 from Schrolli91/develop 
Develop
 2015-07-14 13:50:13 +02:00
Schrolli a15043e8f4 edit simple_webend 
- click on the glass in overview shows the entry highlighted
 2015-07-14 13:46:17 +02:00
Schrolli 19aa6b2136 edit in webends #62: 
- rename folder in enhanced_webend (new) and simple_webend (old)
- little changes in simple_webend overview page
 2015-07-14 11:31:18 +02:00
Schrolli 87c1e9c307 edit in old_webend 
- more information in overview page with the mysql concat() method
 2015-07-14 11:01:15 +02:00