Commit Graph

256 Commits

Author SHA1 Message Date
Simon
7a314ba7df Fix SINGLE error in options 2021-03-20 17:00:05 +00:00
Simon
be6d58114e Add SINGLE to options 2021-03-13 11:35:12 +00:00
Simon
530d79313d Missing tmout 2021-03-12 17:35:27 +00:00
Simon
2cc471e9b8 Handle variable types 2021-03-07 16:24:54 +00:00
Simon
0090f1a65d Options support update:
New format:

TS1=;TS2=2350;DIAL=0;TIMER=12;VOICE=0

Old format is still supported

Also support for DMR+ format
2021-03-07 16:11:30 +00:00
Simon
40963656f1 Only bridge to OBP TGs > 89 2021-03-01 18:34:47 +00:00
Simon
def3e27e82 XLX working 2021-02-28 23:04:45 +00:00
Simon
ed7c371966 XLX work 2021-02-28 12:05:03 +00:00
Simon
638e585a46 Take callsign for voice ident from callsign sent in connection
rather than from system name. Now it will work with proxy setups too!
2021-02-26 19:13:58 +00:00
Simon
668d52c2ba We need to deepcopy() when using GENERATE 2021-02-24 22:24:19 +00:00
Simon
6ad5af1b2b Don't allow decimal point / full stop in TG in options 2021-02-23 15:31:58 +00:00
Simon
a4fe1995d2 Fix voice - again 2021-02-21 18:52:37 +00:00
Simon
b719a55e4c Add GENERATOR: N in MASTER deifnition
If GENERATOR is set to more than 1, the master definiton
is used as a template to generate N systems with sequential ports,
starting at the port listed in the defintion.

For example:

for N = 2:

G7RZU-0 - port 54000
G7RZU-1 - port 54001
2021-02-21 14:33:53 +00:00
Simon
2e3806cf4e Only process type MASTER in options config.
This should enable type PEER and type XLXPEER to be used
2021-02-21 12:35:04 +00:00
Simon
91dc7129bb Fix voices 2021-02-20 21:18:08 +00:00
Simon
0600332980 Internationalisation map 2021-02-14 15:42:43 +00:00
Simon
116a904d9f further typo 2021-02-14 13:20:51 +00:00
Simon
ed85784edf typo 2021-02-14 13:19:28 +00:00
Simon
acab830ef9 Only update UA timer when it's acptually changed ! 2021-02-14 13:18:26 +00:00
Simon
72fe31509b More fixes on options default timer handling 2021-02-14 13:13:12 +00:00
Simon
41d24ddec2 Options UA TIMER handling fix 2021-02-14 12:07:06 +00:00
Simon
fb45584aab Revert "Remove "to" from linked messages so it at least makes sense"
This reverts commit e882b4226b.
2021-02-09 09:37:44 +00:00
Simon
e882b4226b Remove "to" from linked messages so it at least makes sense
for all languages and doesn't cause to - two confusion
2021-02-08 14:41:23 +00:00
Simon
0b1015b5af Tidy up announcement voice sending
Including setting streamid variables within main reactor thread for consistency
2021-01-28 01:27:10 +00:00
Simon
23ac74dfdf Explicit returns in SQL thread 2021-01-27 21:30:37 +00:00
Simon
75bbc8baad Fix voice file support 2021-01-27 21:08:46 +00:00
Simon
a74c02d28c Change language of voice announcements in config file
(See ./Audio/ )
2021-01-27 19:55:09 +00:00
Simon
67db3f1acd Outline of language file support
Move sql.close() into SQL thread
2021-01-27 19:49:02 +00:00
Simon
91fe2e6f9d Get rid of Semaphores completely. 2021-01-27 18:54:31 +00:00
Simon
d3bc7fe5d8 All blocking code removed from main thread
What was I actually thinking ?!?!?
2021-01-27 18:47:55 +00:00
Simon
799a48b91d Indent error in sendspeec logging 2021-01-25 13:30:21 +00:00
Simon
d209f5b368 Move voice logging into INFO logs 2021-01-25 13:21:02 +00:00
Simon
4e64e5f740 a 2021-01-25 00:48:37 +00:00
Simon
8116fe38e1 Add handling of occasional exception in dmrbits.tobytes() in HBP class 2021-01-24 18:56:33 +00:00
Simon
95037683b7 Exclude decimal point from options TG string 2021-01-23 12:01:35 +00:00
Simon
ca054d5cd6 Add ability to specify table to SQL config 2021-01-22 13:09:28 +00:00
Simon
e7dca90355 Loads of threads! 2021-01-19 23:54:09 +00:00
Simon
e7b1c24ed9 Send announcements from ID 5000 2021-01-19 19:42:46 +00:00
Simon
586a9246b7 Fix possible semaphore bug in bridge table 2021-01-18 21:11:40 +00:00
Simon
f52e63cb77 More stream logging 2021-01-18 17:04:29 +00:00
Simon
4fa05fb503 tidy up stream trimmer logging 2021-01-18 17:02:09 +00:00
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