ShaYmez
/
RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
649 Commits 1 Branch 0 Tags 3.1 MiB
Commit Graph

365 Commits

Author SHA1 Message Date
Simon f87534f69c Streamy 2021-01-18 16:50:27 +00:00
Simon 77bfacf2e5 Bug in stream trimmer 2021-01-18 15:04:00 +00:00
Simon 76927ebf95 Proper debug for streamtrimmer problem 2021-01-18 12:31:56 +00:00
Simon e6edd4c16b Debugging for stream problems 2021-01-18 11:09:05 +00:00
Simon 8f5bdceec8 Except 2021-01-17 22:54:44 +00:00
Simon f05d192a1b Handle keyerror in stream trimmer 2021-01-17 22:45:45 +00:00
Simon 4626917326 It doesn't make sense to be able to link #9 to TG9 ! 2021-01-17 12:59:40 +00:00
Simon 3889eabda7 Another indent problem 2021-01-16 16:19:12 +00:00
Simon 8010a7aad3 Fix indent 2021-01-16 16:16:05 +00:00
Simon 9a719489c5 Target active 2021-01-16 16:14:51 +00:00
Simon f83d092b1c Reinstate old TG9 code for HBP only 2021-01-16 15:54:52 +00:00
Simon 31e9432063 Set stat trimmer back to once an hour 2021-01-16 13:05:53 +00:00
Simon d9e42685cc Make stat trimmer handle active and inactive correctly 2021-01-16 13:03:20 +00:00
Simon 6064be77d7 Run stat trimmer every hour 2021-01-16 12:13:47 +00:00
Simon 117ab55358 Fix statTrimmer 2021-01-16 12:05:09 +00:00
Simon a355f5bf3b Revert "Single mode changes" 
This reverts commit 585e50ad9e.
 2021-01-10 21:08:20 +00:00
Simon 585e50ad9e Single mode changes 2021-01-10 21:06:48 +00:00
Simon ac0de92e5a Revert "Revert "Revert "Revert "Try another method to match all for dial bridges"""" 
This reverts commit f28ef3eb16.
 2021-01-10 20:48:45 +00:00
Simon f28ef3eb16 Revert "Revert "Revert "Try another method to match all for dial bridges""" 
This reverts commit 2f38da5ba8.
 2021-01-10 20:46:53 +00:00
Simon 71f1f5e83d Revert "Revert "Revert "Try another method to match all for dial bridges""" 
This reverts commit 2f38da5ba8.
 2021-01-10 20:44:26 +00:00
Simon 2f38da5ba8 Revert "Revert "Try another method to match all for dial bridges"" 
This reverts commit 2ce31622be.
 2021-01-10 20:41:17 +00:00
Simon 2ce31622be Revert "Try another method to match all for dial bridges" 
This reverts commit 7272289a23.
 2021-01-10 20:12:35 +00:00
Simon 7272289a23 Try another method to match all for dial bridges 2021-01-10 20:10:17 +00:00
Simon e2b137d6aa This reverts commit 176009a323. 2021-01-10 19:56:59 +00:00
Simon 176009a323 Change bridge selection logic in HBP class to match via bridge number 2021-01-10 19:54:40 +00:00
Simon 71d35eb26d Locking in bridge table when trimming STAT bridges 2021-01-10 14:03:45 +00:00
Simon 4682ad2228 On-the-fly generation of static bridges 2021-01-10 13:50:37 +00:00
Simon 79a2dd1099 Fix missing master maintainance loop bug (peers not timing out) 2021-01-06 01:38:09 +00:00
Simon d7e9ae9a4a OPtions - preserve peers 2021-01-05 17:18:02 +00:00
Simon e4f1a932c0 Add some locking around peers 2021-01-04 23:09:48 +00:00
Simon 287ebc49cb needs int() if default reflector 2020-12-28 00:07:28 +00:00
Simon 11df210f8a there is a better way 2020-12-27 21:03:41 +00:00
Simon 6155507644 Quote removal from options 2020-12-27 21:01:37 +00:00
Simon 023d2f98af Wrong var 2020-12-27 18:55:22 +00:00
Simon c49a7cb279 fix vauleerror 2020-12-27 17:44:10 +00:00
Simon 0e5e91850c Add support for HBP options line 2020-12-27 17:32:38 +00:00
Simon 28e4800283 Add HBP Options (RPTO) handling 2020-12-23 00:31:27 +00:00
Simon b782748944 fix seq rollover 2020-12-21 17:16:50 +00:00
Simon 5e24fea463 Seq > 1 2020-12-21 17:07:05 +00:00
Simon 6f1254ac9a Add handling of: 
Duplicate packet
missing packet(s)
out-of-order packets

by using the Seqeunce number the the OBP packet
 2020-12-21 15:19:41 +00:00
Simon 11cc0f59f3 remove dedup logging 2020-12-20 23:28:13 +00:00
Simon 32c25e306c Revert "Back off logging for dedup code" 
This reverts commit 4a2bdaf80f.
 2020-12-20 21:48:48 +00:00
Simon 4a2bdaf80f Back off logging for dedup code 2020-12-20 21:25:34 +00:00
Simon b56b73f763 Show source in debug log 2020-12-20 18:23:19 +00:00
Simon f4c17e9540 Only ignore openbridge (again) 2020-12-20 18:05:19 +00:00
Simon 7ed54e09ae ia 2020-12-20 17:17:07 +00:00
Simon 7086174e34 Only avoid openbridge for dups 2020-12-20 17:10:13 +00:00
Simon 90409a5e25 Allow relfectors over openbridge 2020-12-19 19:04:07 +00:00
Simon afbf8c4239 Does refl work without dupes this time 
Reworked it

Added some logging
 2020-12-19 18:51:52 +00:00
Simon 26eeb9fbba Another try at reflectors 2020-12-13 18:35:23 +00:00
Simon 9fb429c2e3 try again 2020-12-13 15:53:37 +00:00
Simon a3c1f1182f Fix for packet dupes (currently debugging enabled) 2020-12-13 15:17:35 +00:00
Simon 7b4795e560 still 2020-12-09 17:20:28 +00:00
Simon 39009a37b6 got last change slightly wrong 2020-12-09 16:55:32 +00:00
Simon 83cb446835 Create bridges for TGs 5 and over 2020-12-09 16:30:20 +00:00
Simon 9750df7beb Disable reflectors 2020-12-06 13:34:27 +00:00
Simon 79e75ccd79 Revert "Revert the ability to activate the same TG on two slots (why would you want to?)" 
This reverts commit b19a5be6b0.
 2020-12-06 13:18:10 +00:00
Simon b19a5be6b0 Revert the ability to activate the same TG on two slots (why would you want to?) 2020-12-06 12:27:44 +00:00
Simon 6b76c0cea6 same as before but on obp 2020-12-05 21:47:51 +00:00
Simon 6982978651 Move ignore to outside for 2020-12-05 21:46:48 +00:00
Simon 634e9fdd67 Typos - getting code blind now! 2020-12-05 21:22:47 +00:00
Simon f02f7f3069 it's append not push in python! 2020-12-05 21:12:13 +00:00
Simon 0eb6876f0b helps if I make change to both obp and hbp 2020-12-05 21:03:44 +00:00
Simon c810bd4339 indent issue - damn python ;-) 2020-12-05 20:58:40 +00:00
Simon 01917ff5da bridge2 2020-12-05 20:49:35 +00:00
Simon 6130170f36 Does it really work now? 2020-12-05 20:27:54 +00:00
Simon d474ab1023 I hope this fixes the openspot issue! 2020-12-05 20:06:38 +00:00
Simon bd6715566b Fix multiple packets being sent on OBP connections 2020-12-03 20:28:23 +00:00
Simon b251cee899 Add new TO_TYPE - STAT 2020-11-30 22:09:51 +00:00
Simon d8c1f40bc3 Add support for multiple upstream bridges 2020-11-28 15:56:02 +00:00
Simon 806e8566de Fix bug where you can't use the same TG on both slots simultaneously 
Well, I thought this might well be a feature, but it was an easy fix so...
 2020-11-24 11:33:11 +00:00
Simon 0aa3f57a08 Preserve peers in config dict 2020-11-16 20:45:02 +00:00
Simon 057318ef44 bracketing 2020-11-14 16:40:04 +00:00
Simon 4aae0302e0 Fix timer on reflectors 2020-11-14 10:45:45 +00:00
Simon d076096faa Route between TGs / |Reflectors on HBP systems 2020-11-13 22:24:31 +00:00
Simon 18ae439125 Don't try and kill master maintenance loop if it isn't actually running! 2020-11-08 20:12:53 +00:00
Simon e7b13ef19a Fix error in re-activation of default reflector because reflector brdige was being incorrectly deleted 2020-11-08 14:52:16 +00:00
Simon bb449d2436 timer on reflectors now fixed 2020-11-07 17:36:15 +00:00
Simon c521e4d513 try again 2020-11-07 17:20:03 +00:00
Simon 4261604981 fix timer for single reflector 2020-11-07 17:14:49 +00:00
Simon f5f87d540b Add more silence padding to voice 2020-11-07 17:03:40 +00:00
Simon bdad00ffdc Check master maintenance loop is running before we try and stop it to avoid exception 2020-11-07 16:01:41 +00:00
Simon a1bf50e698 remove some unneeded debugging 2020-11-07 14:59:53 +00:00
Simon f0d1e8ed8a Fix error in reset_default_reflector 2020-11-07 14:58:46 +00:00
Simon 851b7c1d12 Fix timer error 2020-11-07 14:57:32 +00:00
Simon d9bf484bc0 Delete unused bridges now works 2020-10-25 23:40:54 +00:00
Simon 052f3d58d0 more work in unused bridge logic 2020-10-24 23:50:31 +01:00
Simon ac157b0f86 bridge used logic 2020-10-24 23:43:08 +01:00
Simon 09737dd2d8 Exclude OBP link to master 2020-10-24 23:38:42 +01:00
Simon 694c38d1be automatically remove unused bridges 2020-10-24 23:35:54 +01:00
Simon a555f075a1 arggh - branch bleed 2020-10-24 00:07:28 +01:00
Simon a1e14af0e4 Fix minor bug in timer switches 2020-10-24 00:04:45 +01:00
Simon ef5cd26def more work on tg bridge creation 2020-10-22 21:31:15 +01:00
Simon 0f0dc820af create bridge logic fix 2020-10-22 21:21:45 +01:00
Simon 70f25744c3 tidy up ident 2020-10-19 22:45:28 +01:00
Simon d8d2a55eab Fix ident 2020-10-19 22:41:44 +01:00
Simon 7bc15c6dd3 More error debugging in mysql 
Handle changes to ACLs in DB
 2020-10-19 21:02:04 +01:00
Simon a307898bea Enable and disable bridges when repeater is enabled and disabled 2020-10-18 13:41:38 +01:00
Simon bce34ccb2c more fixes and tuning to voice 2020-10-12 16:30:32 +01:00
Simon efb341ac76 fix 2020-10-12 16:18:35 +01:00
Simon db5ea4f937 slot 2020-10-12 16:17:36 +01:00
Simon 57d80fe621 Add streamid to voice to stop clash 
Semaphore control for bridge dict
Semaphore control for MySQL
 2020-10-12 16:04:01 +01:00
Simon 4cd3ce6780 static tgs work and various other tidying up 2020-10-06 22:20:57 +01:00
Simon 7b91306e36 update static TGS when updated in the db 2020-10-06 12:12:49 +01:00
Simon 1a719a7bcd preparation to static tgs to mysql thread 2020-10-05 23:32:36 +01:00
Simon e62e9bab0d Static TGs on startup 2020-10-05 23:29:00 +01:00
Simon a7de755223 take out print 2020-10-04 16:18:08 +01:00
Simon b472f01f34 revert openbridge stuff as for some reason it does not work 2020-10-04 16:16:48 +01:00
Simon 6c119315aa test 2 2020-10-04 16:14:18 +01:00
Simon b02b485ca0 test 2020-10-04 16:11:43 +01:00
Simon c43f3772cf discconected voice fix 2020-10-04 16:05:13 +01:00
Simon f20e3cfcbc logic master 2020-10-04 15:50:13 +01:00
Simon c4e1376aae tidy up special openbridge handling 2020-10-04 15:42:52 +01:00
Simon 63195f928e openbridg 2020-10-04 15:29:10 +01:00
Simon 92dab73400 Default reflectors now working 2020-10-04 15:19:46 +01:00
Simon 8cad240efc disconnected voice 2020-10-04 01:40:44 +01:00
Simon e26fab9272 timig is everything 2020-10-04 00:03:01 +01:00
Simon de2e9beed2 fix silly naming problem 2020-10-04 00:01:15 +01:00
Simon 6e4e8907e7 put backk sql preread 2020-10-03 22:25:30 +01:00
Simon e512673eb1 fix bytes error in passphrase 
disable early loading of MySQL config
 2020-10-03 22:03:14 +01:00
Simon 09c66faf80 fix acl processor 2020-10-03 21:51:22 +01:00
Simon 182645acf8 it lives 2020-10-02 22:56:16 +01:00
Simon f38f3c677a A 2020-10-02 21:17:59 +01:00
Simon 935bcba271 Various changes to use threads and make code thread safe 2020-10-02 20:47:04 +01:00
Simon 0392790dd4 Moving towards stuff 2020-10-02 17:13:49 +01:00
Simon dacf57648a dd 2020-10-01 00:23:20 +01:00
Simon 29e8b9519a ea 2020-10-01 00:22:53 +01:00
Simon 3e82d2ff91 restarts on state change 2020-10-01 00:14:31 +01:00
Simon 842eed71a9 aa 2020-09-30 21:45:01 +01:00
Simon 28ac8f9734 SQL fix error logic 2020-09-30 20:56:07 +01:00
Simon e31427879a Add new systems from MySQL every minute 2020-09-30 20:46:35 +01:00
Simon c4777acf8c sucessfully reads repeater config from MySQL 2020-09-29 14:43:17 +01:00
Simon d79c8e053e Skip over openbridges in ident code 2020-09-23 10:50:33 +01:00
Simon 2014015421 Ident config option 2020-09-22 20:06:07 +01:00
Simon 0ecd8ffd19 Make log messages clearer 2020-09-20 16:06:56 +01:00
Simon fb3c7afaf6 Fixed the linkedto - notlinked on PC5000 
Added more logging around voice events
 2020-09-20 15:58:29 +01:00
Simon 708eaa06b6 Add letters for reflector logic log rules 
Add numbers for TG logic log rules
 2020-09-19 14:16:19 +01:00
Simon 99372356e0 Bridge and reflector logic tweaks 2020-09-19 14:05:52 +01:00
Simon 14ce37c3a6 Send a speech packet every 60ms 2020-09-18 17:06:14 +01:00
Simon 6f3f1738cd Sequence number. 
Turn off callsign
 2020-09-18 00:49:48 +01:00
Simon c2585a8b3f Remove useless logging 2020-09-17 21:39:13 +01:00
Simon 8b6436db5e Reflector voices work! 2020-09-17 20:34:50 +01:00
Simon 4b5d069763 Working on voice playback 2020-09-13 18:04:11 +01:00
Simon dbe0fe7e0e Typo in reflector add 2020-09-03 17:09:53 +01:00
Simon bd7cdb53e7 Dynamic TG Reflectors is working 2020-09-02 18:34:25 +01:00
Simon 3dfeebe880 I then reflectors finally work 2020-08-31 16:58:30 +01:00
Simon 184fc02226 Reflectors are working 2020-08-31 16:05:25 +01:00
Simon 407dd2800a Working on reflectors even more 2020-08-31 11:03:51 +01:00
Simon G7RZU 609a502638 Added config option for Single mode - single TG per slot 2020-08-26 15:57:42 +01:00
Simon G7RZU 6fb3a86361 Add config option for UA timer to hblink.cfg 2020-08-26 15:24:06 +01:00
Simon G7RZU 248453ddf3 Fixed logic for adding UA systems to rules 2020-08-26 10:48:44 +01:00
Simon G7RZU de0ee31001 It works 2020-08-23 20:19:23 +01:00
Simon cd6f8d2dc0 ify 2020-08-23 16:58:29 +01:00
Simon 544cc299d3 inext 2020-08-23 16:55:47 +01:00
Simon ff7a4b5115 ihmm 2020-08-23 16:50:56 +01:00
Simon a1621a5ae3 notty 2020-08-23 16:47:43 +01:00
Simon 7085493730 try again 2020-08-23 16:45:06 +01:00
Simon 9b6df60855 debug mode 2020-08-23 15:08:15 +01:00
Simon c76691ef15 first working version if Single TG per Slot (Single Mode) 2020-08-23 14:48:13 +01:00
Simon 60ab968649 Add OBP handling for make_single_bridge 
Tidy up timer logic
 2020-08-23 13:27:26 +01:00
Simon a6ccff3b61 A 2020-08-22 21:35:40 +01:00
Simon 676e3efe88 Unknown talkgroups from repeater side automatically create bridges 
and set as user-activated.
 2020-08-22 19:18:26 +01:00
Simon 94d48c8396 It compiles! 2020-08-22 11:49:09 +01:00
Simon a4d3664d6c Create copy of bridge_all to work on 2020-08-20 16:47:17 +01:00
Simon 2c7e6a5396 added new file for modifications 2020-08-19 20:59:20 +01:00