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

361 Commits

Author SHA1 Message Date
Simon
ed9c715efb Stop TGs 9990-9999 from going over OBPs. These are for local server services only 2021-07-29 22:52:29 +01:00
Simon
422bfd5f53 replace master with corrected merge from hrt 2021-07-23 17:01:16 +01:00
Simon
732942d7c4 Revert "Merge branch 'hrt'" 
This reverts commit de9892a1c2, reversing
changes made to dff06fff62.
 2021-07-22 21:58:08 +01:00
Simon
de9892a1c2 Merge branch 'hrt' 2021-07-22 15:59:49 +01:00
Simon
0f8374cea9 More BCSQ logging tidying 2021-07-22 01:55:39 +01:00
Simon
25a7e3d397 Log all BCSQ the same 2021-07-22 01:48:42 +01:00
Simon
86c70aa1ca more fixing streamid 2021-07-22 01:42:50 +01:00
Simon
82b02ec8ec fix streamid 2021-07-22 01:41:30 +01:00
Simon
2e42df99c0 Handle RX BCSQ 2021-07-22 01:39:33 +01:00
Simon
75ccf3fe3c Clearer logging of BCSQ 2021-07-22 01:26:09 +01:00
Simon
df2bb56ba7 fi in logs 2021-07-22 01:03:43 +01:00
Simon
e2c810d3f3 Andy 2021-07-22 00:52:35 +01:00
Simon
09d1614adb Fix logic error 2021-07-22 00:50:54 +01:00
Simon
dff06fff62 Revert "Use hi-res timer for loop control" 
This reverts commit cbd25b924d.
 2021-07-21 23:38:10 +01:00
Simon
cbd25b924d Use hi-res timer for loop control 2021-07-21 23:37:30 +01:00
Simon
501a557116 Revert "Override SERVER_ID that is sent for this OBP" 
This reverts commit 36e7ed58b9.
 2021-07-20 23:14:59 +01:00
Simon
36e7ed58b9 Override SERVER_ID that is sent for this OBP 
Generally, this is used for connecting to non-FreeDMR systems.
Should usually be set to:
OVERRIDE_SERVER_ID: False
** USE WITH CAUTION **
 2021-07-20 01:10:20 +01:00
Simon
423bb3e5cd Silently Apply TGID ACL to outbound as well as inbound traffic 
when the target is an OpenBridge
 2021-07-05 01:10:26 +01:00
Simon
cc5700878a Fix bug in DMR+ style options 
Allow for 9 TG per TS like DMR+ does
 2021-06-30 01:19:57 +01:00
Simon
e0463ef0c4 Ignore non-ascii chars in options 
(Damn you smart-quotes)
 2021-06-30 00:55:21 +01:00
Simon
aa319c6ae4 Debug options 2021-06-30 00:37:43 +01:00
Simon
00e1d2109a Debug LC exception 2021-06-15 21:02:24 +01:00
Simon
fa20a25852 Add traffic source validation: 
Change behaviour of NETWORK_ID in OPENBRIDGE config:

This should be the ID of remote system. If traffic received on this bridge is not shown as
from this ID, it will be disgarded.

Fix reporting of PEER so it actually takes the peer from the incoming connection, not NETWORK_ID:

So, in short:

SERVER_ID in [GLOBAL] - the ID you send to other servers via OBP
NETWORK_ID in OPENBRIDGE - the expected ** remote ** ID for the bridge.
 2021-06-15 00:24:49 +01:00
Simon
b7c91e75ee Fix install script - NOW WORKS! 2021-05-31 17:27:44 +01:00
Simon
5904d471b7 Experimental passing of data sent as a group call 2021-05-29 19:00:54 +01:00
Simon
b29fdd0fce Fix re.sub() to work properly on line 710 2021-05-29 18:48:34 +01:00
Simon
8c165b9122 Don't reset timers when calling info seervices 2021-05-24 23:12:02 +01:00
Simon
c20c0f4aec Send contents of numbered AMBE files in language directory. 
So, for example, for lang en_GB:

When you manual dial 9991, file en_GB_2/9991.ambe is played
 2021-05-24 22:32:54 +01:00
Simon
edeaf2fbe7 Allow ANNOUNCEMENT_LANGUAGE in MySQL DB: 
To update DB:

alter table repeaters add column ANNOUNCEMENT_LANGUAGE VARCHAR(8);

update repeaters set announcement_language='en_GB_2';
 2021-05-22 22:56:20 +01:00
Simon
aaf8580d3d Fix error in LANG when using peers and xlxpeers 2021-05-14 22:36:36 +01:00
Simon
a3c01e393e Working 2021-05-14 22:26:50 +01:00
Simon
25bd7db348 Allow loading if multiple languages and selection both via 
default in config file and OPTIONS.

Remove ANNOUNCEMENT_LANGUAGE from [GLOBAL]
Replace with ANNOUNCEMENT_LANGUAGES - Comma Separated list

Current list:

ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE

Add:

ANNOUNCEMENT_LANGUAGE to MASTER definition. If using GENERATOR, this becomes
the template default.

To change via OPTIONS add LANG=<language code>

take codes from list above
 2021-05-14 00:07:11 +01:00
Simon
15d2986492 This is .... 2021-05-09 16:53:38 +01:00
Simon
4f8f3e5a33 argg 2021-05-09 16:11:55 +01:00
Simon
4d6961ec07 Fix freedmr ambe file 
Add FreeDMR identifier to ident
 2021-05-09 16:08:54 +01:00
Simon
034b6405a1 Enable sierra in en_GB_2 2021-05-09 14:42:42 +01:00
Simon
6ba08711e2 Alternative voice files for en_GB_2 
Also, added abilty to read from separate ambe files in a dir
as well as the G4KLX style indexed files
 2021-05-09 14:36:02 +01:00
Simon
b3388da319 Trying to get logger exception logging working properly 2021-05-06 21:33:33 +01:00
Simon
22326f6319 If ENHANCED_OBP, don't start sending to system until at least one BCKA seen from system 2021-05-04 01:41:35 +01:00
Simon
0f546e9636 Make KA report correct time 2021-05-02 21:04:25 +01:00
Simon
502adddf8c Revert "Revert "Try allowing XLX again"" 
This reverts commit 45b70cf604.
 2021-05-02 19:24:47 +01:00
Simon
45b70cf604 Revert "Try allowing XLX again" 
This reverts commit d6b67f8004.
 2021-05-02 19:08:46 +01:00
Simon
d6b67f8004 Try allowing XLX again 2021-05-02 19:06:33 +01:00
Simon
190e17b50e CONFIG not config 2021-05-02 17:11:50 +01:00
Simon
45e10a9472 Error ia kaReporting 2021-05-02 01:44:16 +01:00
Simon
014edd8893 Report actual exception when we capture an exception in options 2021-05-01 23:36:35 +01:00
Simon
6c8ba4c442 Default statics for generator 2021-04-30 02:10:45 +01:00
Simon
e68b5c06fc Exception logging 2021-04-30 00:04:10 +01:00
Simon
99f8889f2b bad indent 2021-04-29 16:30:45 +01:00
Simon
f2c10e0b8a Catch all exceptions in options code 2021-04-29 16:28:57 +01:00