Commit graph

197 commits

Author SHA1 Message Date
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