Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-23 16:40:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1222 commits 4 branches 17 tags 4 MiB
Commit graph

251 commits

Author SHA1 Message Date
f-kessler ce144c82e1
moved delete to the end of the function 2018-08-11 13:37:30 +02:00
f-kessler 8c1351ccbd
fixed the delete of all contents in multiList 2018-08-11 12:52:30 +02:00
f-kessler 58ad0e5308
Clear buffer after multicastAlarm_ric received 
Fix for networks that mix normal alarms with multicastAlarms (delimiter needs to be deactivated).
If the delimiter is deactivated, RICs in the buffer will be deleted only if they are older than multicastAlarm_ignore_time. This could cause a mixture of RICs of the current and the privious multicastAlarm. This problem can be fixed, by clearing the buffer after the multicastAlarm sequence has finished.
 2018-08-10 23:12:42 +02:00
f-kessler 6ce67f24dd Enhancement for multicastAlarm. The RICs configured in multicastAlarm_delimiter_ric and multicastAlarm_ric no longer need to be included in allow_ric or filter_range_start/filter_range_end. 2018-02-22 14:20:33 +01:00
Bastian Schroll ba1c35b44d dev ready for next version 2017-12-21 09:27:00 +01:00
Bastian Schroll decd4461d7 prepare new Version 2.3 2017-12-21 09:20:31 +01:00
f-kessler 59b78a4f64 multi delimiter and text RICs 
Changed to support multiple delimiters and text RICs
 2017-10-23 20:34:25 +02:00
Bastian Schroll 3b2275094d Merge branch 'develop' into dev-express-alarm 2017-10-21 23:08:10 +02:00
Bastian Schroll c144205eb0 edit version 2017-10-21 22:50:55 +02:00
f-kessler b7141d986b fixed remove of old RICs and replacement of data for calling alarmHandler 
Changed for loop to iterate over a copy of multiList
fixed replacement of data from xData
 2017-10-09 20:59:03 +02:00
f-kessler bcdac6e2e6 exclude netIdent_ric from multicastAlarm 
If not excluded it cannot be used anywhere
 2017-10-05 21:09:24 +02:00
Bastian Schroll 578750a810 fix global definition issue 2017-10-03 22:08:38 +02:00
Bastian Schroll fca69b974e add placeholder (unused var) 2017-10-03 19:32:09 +02:00
Bastian Schroll 03cd002cfe Merge branch 'develop' into dev-express-alarm 2017-10-03 19:18:37 +02:00
Bastian Schroll 3fed1ac12a decouple vers nr and branch name 2017-10-03 16:00:31 +02:00
Bastian Schroll fa90ba10cc Merge branch 'develop' into dev-express-alarm 2017-10-03 15:08:57 +02:00
Bastian Schroll 63f2e58310 edit multicastAlarm 2017-10-03 14:43:36 +02:00
f-kessler 3220088e6c update indexes after remove of typ from multiList 2017-10-03 12:43:12 +02:00
Bastian Schroll 9aaa8aa267 remove typ from adding 2017-10-03 12:13:05 +02:00
Bastian Schroll 9c446b0660 del typ and freq in adding routine 2017-10-03 12:10:08 +02:00
Bastian Schroll f701b6a010 del typ and freq in adding routine 2017-10-03 12:08:04 +02:00
Bastian Schroll b52d972c20 edit debug msg 2017-10-03 12:03:08 +02:00
f-kessler 6bcba28979 changed to send complete data to multicastAlarm for buffering 2017-10-03 11:39:57 +02:00
f-kessler 166dd3e3f8 changed data buffering and updating for alarms 2017-10-03 11:38:24 +02:00
f-kessler b6077d522d enumerate value correction 2017-10-02 15:32:01 +02:00
Bastian Schroll acbef6591c edits for codacy (#310) 2017-10-02 07:25:22 +02:00
Bastian Schroll c54bd55888 change to data-field at checks 2017-10-01 18:06:56 +02:00
Bastian Schroll fed717a22d Merge branch 'develop' into dev-express-alarm 2017-10-01 17:34:24 +02:00
Bastian Schroll 760f6c1aba Update globalVars.py 2017-09-30 16:05:23 +02:00
f-kessler 00e4e52352 Update multicastAlarm.py 2017-09-25 20:57:28 +02:00
f-kessler 8069ded206 enumerate() instead of range(len()) 2017-09-25 20:47:06 +02:00
f-kessler d30eee5866 Updated naming 2017-09-23 09:25:43 +02:00
f-kessler 07f42e15d8 Changed naming 2017-09-23 09:25:08 +02:00
Bastian Schroll 6af6981b68 changes for codacy 2017-09-20 06:25:06 +02:00
Bastian Schroll 4a89ed44db Merge branch 'develop' into dev-express-alarm 2017-09-19 22:03:43 +02:00
f-kessler 46a53dd8dc Add files via upload 
added processing of Express-Alarms
 2017-09-19 20:56:59 +02:00
f-kessler 81a146b78f Add files via upload 
new function to support Express-Alarm
 2017-09-19 20:55:59 +02:00
Bastian Schroll e5391a2b75 edit vers nr 2017-09-19 18:05:26 +02:00
Bastian Schroll 4f29129007 Merge branch 'beta' into develop 2017-09-19 17:59:31 +02:00
Bastian Schroll 53aa810df8 new release 2.2.1 2017-09-19 17:56:44 +02:00
Bastian Schroll 42e7de7d4c Merge pull request #286 from PeterLaemmle/develop 
Improve code style
 2017-08-06 15:18:44 +02:00
PeterLaemmle c9ffd6ae0d Update regexFilter.py 
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217):
-Using global for 'filterList' but no assignment is done
 2017-05-24 19:39:22 +02:00
PeterLaemmle c3398ccd3f Update descriptionList.py 
Correcting the following issues (https://github.com/Schrolli91/BOSWatch/issues/217):
-Using global for 'fmsDescribtionList' but no assignment is done
-Using global for 'zveiDescribtionList' but no assignment is done
-Using global for 'ricDescribtionList' but no assignment is done
 2017-05-24 19:35:02 +02:00
PeterLaemmle f6d62828b8 Update pynma.py 
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217)
-Using type() instead of isinstance() for a typecheck.
 2017-05-24 19:25:27 +02:00
PeterLaemmle 67a1028081 Update doubleFilter.py 
Correcting the following issues (https://github.com/Schrolli91/BOSWatch/issues/217)
-Consider using enumerate instead of iterating with range and len
 2017-05-24 19:20:53 +02:00
Bastian Schroll 0ab896b17a Merge branch 'develop' into patch-1 2017-05-24 06:16:57 +02:00
Rumbel84 3b9da8eb0e Update regexFilter.py 
Wenn ein Filter nicht Matched (Regex) kommt False
Wenn es gar keinen Filter gibt, kommt ein falsches True. Muss auch False sein.
 2017-05-23 20:46:01 +02:00
Florian daddd02279 Merge pull request #271 from jbollacke/feature/subric_description 
New feature: 
SubRIC is now used for a detailed description.
Remember that you have to have an entry of the main RIC - it is used as fallback.

The SubRICs are set as sufficix to the main description
 2017-05-01 10:08:32 +02:00
Jan Bollacke aeedcd4c8c
DescriptionList: Simplify conversion of keys to lowercase 
This reverts commit 418411e09c.
 2017-05-01 09:24:06 +02:00
Florian 418411e09c Converting everything to lowercase 
Ignore upper- or lowercase from csv-file - as the code translates to lowercase in poc.csv all entries will be switched to lowercase.
 2017-04-28 23:49:44 +02:00
Florian 4e23d9856e Fixing regex 
Searching in wrong field leads to error - fixing it
 2017-04-28 23:02:50 +02:00
Jan Bollacke bf9a604931
PocDecoder: use functionchar instead of subric in description lookup 2017-04-28 07:46:28 +02:00
Jan Bollacke a4c218887b
DescriptionList: fix lookup for ric and subric 2017-04-28 07:45:23 +02:00
Jan Bollacke 5ccd6d8cc0
DescriptionList: support functionchar while loading ids/rics 2017-04-28 07:44:12 +02:00
Jan Bollacke 58b3158e9a
PocDecoder: use subric in description lookup 2017-04-27 14:40:42 +02:00
Jan Bollacke de451ffc6f
DescriptionList: check if a description exists for ric w/o the subric 2017-04-27 14:39:28 +02:00
Jockel 80a9cdb6f4 removed lineBrakeAllowed 2017-04-25 10:52:03 +02:00
Bastian Schroll d6ce41f42b edit vers nr 2017-03-30 21:37:50 +02:00
Bastian Schroll e3fcd9033d edit vers nr 2017-03-30 21:37:22 +02:00
Bastian Schroll 29ffd30391 edit vers nr 2017-03-30 21:36:56 +02:00
Florian a29a4412bc Fixing string-search for ZVEI1 
fixing location of zvei tones
 2017-03-07 23:22:35 +01:00
Florian 88a4ae57ce Adaption for changes in ZVEI 
Due to changes from ZVEI2 to ZVEI1 there were 2 major changes:
- String from multimon-ng contains more information, so l. 60 had to be adapted
- Repeated tone signal is changed from F to E
 2017-03-06 22:36:38 +01:00
Bastian Schroll 98b50110a0 change from ZVEI2 to ZVEI1 2017-03-05 20:21:16 +01:00
Bastian Schroll deb23cf374 edit release vars 2017-02-23 13:30:50 +01:00
Florian 7eddc9ea8d Update poc.py 
Trying to remove the `<nul>`-tags in some variations; needs to be verified!
 2017-02-19 01:17:30 +01:00
Bastian Schroll d245ae8776 fix spell error in fms.py 2017-02-14 08:17:31 +01:00
Bastian Schroll 566585d6d0 do som other code quallity changes 2017-02-12 10:32:17 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
Bastian Schroll 1c56509e25 Merged master into develop 2017-02-12 09:57:33 +01:00
Bastian Schroll b84f84a420 Merge pull request #199 from flothi/flothi-fms-patch 
FMS patch
 2017-01-16 16:06:46 +01:00
Florian f996b72263 Update fms.py 
- enabling to (not) use the CRC-check from multimon-ng
- fixing location-information with regard to TR-BOS (hex value is read as decimal value)

ATTENTION:
For proper usage multimon-ng is to be updated - please take the latest version from repository!
 2017-01-16 14:07:11 +01:00
Florian 4f65b5159e Update decoder.py 
Fixing typos
 2017-01-16 14:03:51 +01:00
Florian c7ee204c41 Update poc.py 
Fixing wrong comment
 2017-01-09 09:31:42 +01:00
Florian 5c09b22cce Fixing filter 
Fixing function for filtering RIC:
- if RIC is denied by config, finish function and return false (denied RIC is strongest way to filter)
- l. 64 - fixing missing 0
 2017-01-08 12:21:44 +01:00
Florian 7a636ceeae poc.py 
Update filter-rules
 2016-12-22 22:36:35 +01:00
Florian ae1c27b45f Update poc.py 
Including upper and lower boundary
 2016-12-03 15:39:35 +01:00
Florian 2ded273271 Update poc.py 
Rewriting filter function so that both allow/deny-rule and filter-range will be evaluated. Suitable for e.g. signal-RIC
 2016-12-03 14:49:22 +01:00
Florian c96109899d Update wildcardHandler.py 
Fixing problem that replacement has been tried whether POC was alarmed or ZVEI; works fine for both POC and ZVEI.

Original author might verify, works fine for me
 2016-11-25 22:48:47 +01:00
Bastian Schroll d0c5bed6eb set new version number and date for version 2.1 2016-11-20 13:36:09 +01:00
Bastian Schroll e3b3377f9e resolve some Code Style Problems 2016-11-20 13:05:24 +01:00
Jockel 5e516c65a6 added var for static sub ric messages 2016-11-01 10:18:47 +01:00
Bastian Schroll 7bf7f3c47b remove some unnecessary pass statements 2016-10-03 16:45:12 +02:00
Bastian Schroll 6b520881b6 resolve some codacy problems 2016-10-03 16:32:54 +02:00
Bastian Schroll d16b28ce4f buf in regexFilter.py 2016-10-03 16:27:34 +02:00
Bastian Schroll fe86ae2a06 edit in regexFilter.py 
redefine builtin
 2016-10-03 12:36:15 +02:00
Bastian Schroll e938cdcd6d rename globals. call to globalVars. 2016-10-03 12:02:18 +02:00
Bastian Schroll f8fcda94b6 rename globals to globalVars 
to prevent to redifine an builtin function
 2016-10-03 11:56:27 +02:00
Bastian Schroll e8e870849d rename filter to regexFilter 
to prevent to redifine an builtin function
 2016-10-03 11:50:18 +02:00
Bastian Schroll 77fb7fb44f remove trailing whitespaces 
to improve codacy rating
 2016-10-02 21:28:04 +02:00
Bastian Schroll 6e6a0a4a45 edit interface.txt info 
information now in plugins/readme.md
 2016-10-02 12:38:47 +02:00
Bastian Schroll ff91d4b086 prepare for RC 
edit date and version number for RC
 2016-10-02 12:03:11 +02:00
Bastian Schroll 564c66e1cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-09-30 17:12:45 +02:00
Matthias Gilch 42a81ce6b5 Fix IndexError 
When multimon can't decode the full ZVEI there's an IndexError thrown.
This is a small fix for this issue.
 2016-08-29 12:10:54 +02:00
Bastian Schroll da38224e93 change gmtime to localtime in timeHandler #84 2016-07-18 15:44:26 +02: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
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