Commit Graph

262 Commits

Author SHA1 Message Date
Cort Buffington
55b5afe41f Bug fixes 2016-12-21 19:55:11 -06:00
Cort Buffington
627a5ae33d fixed missing value: GROUP_HANGTIME 2016-12-20 20:59:56 -06:00
Cort Buffington
0652abef02 Descriptions added (below copyright and license area) 2016-12-19 08:36:17 -06:00
Cort Buffington
b8f4915760 resolve conflicts 2016-12-19 07:59:16 -06:00
Cort Buffington
76ea038f62 update 2016-12-19 07:55:17 -06:00
Cort Buffington
40086a09bc eliminating unused files. 2016-12-19 07:52:02 -06:00
Cort Buffington
8b9dfdf739 Merge branch 'modularization'
# Conflicts:
#	bptc.py
#	constants.py
#	crc.py
#	dec_dmr.py
#	golay.py
#	hamming.py
#	hb_const.py
#	hb_router.py
#	qr.py
2016-12-19 07:50:30 -06:00
Cort Buffington
6675f2e83d update 2016-12-17 11:40:43 -06:00
Cort Buffington
e1e1db2913 update 2016-12-17 11:32:44 -06:00
Cort Buffington
4a6bd4bd10 update 2016-12-16 08:08:51 -06:00
Cort Buffington
eb88a0a285 Removed unused config parameter 2016-12-15 12:22:05 -06:00
Cort Buffington
21b036352c Merge remote-tracking branch 'origin/modularization' into modularization
# Conflicts:
#	hb_confbridge.py
2016-12-15 12:11:13 -06:00
Cort Buffington
d561daddcd Move utilities to their own package 2016-12-15 12:10:29 -06:00
Cort Buffington
b653de92ec random update 2016-12-14 11:18:23 -06:00
Cort Buffington
d001fdf9af Remove unused function definitions 2016-11-26 18:32:22 -06:00
Cort Buffington
edc52e1892 Refactoring completed.... just testing now 2016-11-26 18:20:16 -06:00
Cort Buffington
e458c32230 READY FOR TESTING!!! 2016-11-26 14:59:38 -06:00
Cort Buffington
f27af4c4dd Further Modularization 2016-11-26 14:36:24 -06:00
Cort Buffington
31cc1f41b5 NEW CONFERENCE BRIDGE APP!!!
This is what most of you wanted – and the call router isn’t.
2016-11-26 12:10:03 -06:00
Cort Buffington
2493d45c6d more error fixes 2016-11-25 08:39:59 -06:00
Cort Buffington
174ad1b743 error fixes 2016-11-25 08:39:14 -06:00
Cort Buffington
03e2dff984 Cleanup errors 2016-11-25 08:14:36 -06:00
Cort Buffington
141fa3ecc4 Dynamic Rules File definition added 2016-11-23 16:37:53 -06:00
Cort Buffington
9fefedc2fd fix typos 2016-11-23 15:07:10 -06:00
Cort Buffington
eeec223609 Modularized... I think this works. 2016-11-23 15:01:05 -06:00
Cort Buffington
a1593468e5 License Update 2016-11-23 07:38:08 -06:00
Cort Buffington
13e99a9392 Update __license__ 2016-11-22 20:02:09 -06:00
Cort Buffington
a4e0fd7e69 reference config 2016-11-21 19:54:23 -06:00
Cort Buffington
cc54b76ce8 added pointer to CONFIG & explicit arguments to the class 2016-11-21 19:46:07 -06:00
Cort Buffington
05b5fcbf10 License Change 2016-11-21 19:13:32 -06:00
Cort Buffington
16198ba889 Better way to build hex strings 2016-11-20 10:16:53 -06:00
Cort Buffington
23e862ca56 Merge branch 'decoding-full-dmr' 2016-11-19 17:53:11 -06:00
Cort Buffington
30879970b7 Merge branch 'master' into decoding-full-dmr 2016-11-19 17:52:40 -06:00
Cort Buffington
521dccc3ca Merge branch 'decoding-full-dmr' 2016-11-19 17:51:03 -06:00
Cort Buffington
5728459328 Trying to resolve collision of updates. 2016-11-19 10:52:41 -06:00
Cort Buffington
4e70abd457 Merge remote-tracking branch 'origin/decoding-full-dmr' into decoding-full-dmr
# Conflicts:
#	hb_router.py
2016-11-19 10:43:10 -06:00
Cort Buffington
92a2d5bd66 Logging updates 2016-11-19 10:37:09 -06:00
Cort Buffington
cf4e2ecafb Merge pull request #11 from g4eml/decoding-full-dmr
Fix an issue with multiple rules targeting the same talkgroup.
2016-11-19 10:22:31 -06:00
g4eml
343ba53c8c Fix an issue with multiple rules targeting the same talkgroup.
If two rules are trying to send simultaneously to the same destination one was correctly being routed and the other rejected.  
However when the routed stream ended the waiting stream was not processed correctly and was routed with missing packets. 
This was because the change in stream ID had already happened and was failing to trigger the 'new stream' part of the code. 
This fix triggers on change of stream or change of source or change of talkgroup.
2016-11-19 16:02:06 +00:00
Cort Buffington
45528c7877 Access Control List & UA/Timer Hooks added 2016-11-19 08:43:37 -06:00
Cort Buffington
0a23c813eb More fixes to follow G4EML's last discovery
need to have the contention handler look at the timers on the
DESTINATION side instead of source as well.
2016-11-19 08:33:47 -06:00
Cort Buffington
5fb213b867 Merge pull request #10 from g4eml/decoding-full-dmr
Changes to Contention code to cover Timeslot changes
2016-11-19 08:00:18 -06:00
g4eml
92fe12566c Changes to Contention code to cover Timeslot changes
Hi Cort..
The contention code didn't seem to be working. Especially when the destination timeslot was different to the source.
The contention code was using _slot when refering to the target where I  think it should be using rule['DST_TS'] 
This version works better and group hangtime seems to work.
...Colin.
2016-11-19 12:32:00 +00:00
Cort Buffington
9670a8bec4 Abandon Stream ID for contention handling
Moved back to the system used in DMRlink, and removed dependence on
Stream ID.
2016-11-18 17:10:48 -06:00
Cort Buffington
64b4479c6c Fixed contention handler (again) THX G4EML 2016-11-18 14:53:36 -06:00
N4IRS
2baacf8f82 Added comments explaining rules 2016-11-18 12:49:46 -05:00
N4IRS
c3ebc7db5c Rename for consistency 2016-11-18 11:25:04 -05:00
root
02fda0e31d Match 'client' login from MMDVMHost 2016-11-18 09:27:57 -05:00
Cort Buffington
447ee1fdc2 Fixed type 2016-11-18 07:47:16 -06:00
Cort Buffington
421e0ec44e Logging - Minor update 2016-11-17 19:01:16 -06:00