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
458 commits 4 branches 17 tags 4 MiB
Commit graph

458 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Schrolli 9758505904 little changes in old_webend 2015-07-14 10:31:26 +02:00
Schrolli 1e18c2ed67 edit the old webend 
- insert all new fields from the database
- own page for each function
- overview for last 50 alarm of all function in one
 2015-07-14 10:23:43 +02:00
Schrolli bfd4e2c1a4 move old and new webend in separate folders #62 2015-07-14 07:16:56 +02:00
Schrolli91 d1042e6fd7 Merge pull request #62 from kevinkleist/develop 
new Webinterface from @kevinkleist
 2015-07-14 07:15:23 +02:00
Schrolli a3667f5a4c Revert "move the old webend data in separate folder" 
This reverts commit c93d50c616.
 2015-07-14 07:14:38 +02:00
Schrolli c93d50c616 move the old webend data in separate folder 2015-07-14 07:13:41 +02:00
kevinkleist 2e05b29efe new Webinterface 2015-07-13 23:33:36 +02:00
kevinkleist 1232d497ff Merge pull request #1 from Schrolli91/develop 
Develop
 2015-07-13 23:23:52 +02:00
JHCD e829778db2 add convert csv-field "description" to utf-8 
to make sure, that only utf-8 chars are in process
 2015-07-13 19:43:47 +02:00
JHCD 1c78f9ad78 add missing primary key to bos_pocsag 2015-07-13 15:03:31 +02:00
JHCD ffb1495a3b changes in database 
- rename "funktion" to "function"
- change structure/type of some fields (performance)
 2015-07-13 14:15:33 +02:00
Schrolli d8981ba114 insert header and encoding in __init__.py (Issue #60) 2015-07-13 10:23:09 +02:00
Schrolli c19a89859b change encoding 
- change code encoding from cp1252 to UTF-8 (Issue #60)
 2015-07-13 10:19:45 +02:00
Schrolli 1ea5cce24e edit build date 2015-07-13 09:42:54 +02:00
Schrolli 0eebab4564 remove trailing whitespaces in testdata.txt 2015-07-09 08:29:01 +02:00
Schrolli bd6432b1e5 Fix error in pluginLoader.py 
see Issue #52
 2015-07-09 08:04:55 +02:00
Schrolli 76686e016c insert configHandler.checkConfig() helper in all plugins so save always same code 2015-07-09 07:52:21 +02:00
Schrolli cbb9481c5c edit plugin readme Issue #40 2015-07-09 07:09:32 +02:00
Schrolli 49b93daa95 use configHandler.checkConfig() helper in template plugin for demonstration 2015-07-08 09:45:36 +02:00
Schrolli 07872ac817 edit plugin readme Issue #40 
remove interface.txt - all infos now in the plugins/readme.md
 2015-07-08 09:44:13 +02:00
Schrolli 1ab3b61ef4 insert helper configHandler.py 
little edit in wildcardHandler.py error message
 2015-07-08 09:42:52 +02:00
Schrolli 88bdaa2c29 edit plugin readme Issue #40 2015-07-08 07:30:09 +02:00
Schrolli 3880227fc2 edit plugin readme Issue #40 2015-07-07 14:24:41 +02:00
Schrolli 1d65f9fb97 edit plugin readme Issue #40 2015-07-07 14:08:46 +02:00