Commit graph

142 commits

Author SHA1 Message Date
Simon 8ed2565a25 XLX: Add option to overide default module in config. 2018-10-21 15:26:54 +01:00
Simon 3ce8076e89 Add config option to enable/disable user XLX link control 2018-10-21 10:18:55 +01:00
Jonathan Naylor 6e65ce5e18 Close the fds as the log initialisation. 2018-07-26 18:47:55 +01:00
Jonathan Naylor 3738d428cd Move the log initialisation. 2018-06-18 18:27:35 +01:00
Jonathan Naylor afe593d7b5 Add identification of the DMR Gateway to connected networks. 2018-06-04 21:56:10 +01:00
Jonathan Naylor d4d376eb4e Add an optional third DMR Network. 2017-11-21 11:30:13 +00:00
Jonathan Naylor 6d23b8e792 Add extra logging. 2017-10-09 09:38:13 +01:00
Jonathan Naylor fc2c027604 Allow for info override. 2017-10-08 14:13:52 +01:00
Tony Corbett, G0WFV f4f5ec4024 Change conversion method
1
2017-10-04 16:18:29 +01:00
Tony Corbett, G0WFV 1d08926da2 Alter reconnection behaviour
Allow XLX to go back to where you were once network restored (used to relink to default XLX room)
2017-10-04 15:50:57 +01:00
Tony Corbett, G0WFV 0d13b2247d Correct message 2017-10-04 15:26:14 +01:00
Tony Corbett, G0WFV c25fa65dda Change XLX reflector log messages
Convert command number to room letter
2017-10-04 15:06:27 +01:00
Jonathan Naylor ffda76dc74 Change the voice prompts a little. 2017-09-29 23:09:35 +01:00
Jonathan Naylor 233cb78ad1 Re-enable voice prompt on reflector module change. 2017-09-27 09:18:48 +01:00
Jonathan Naylor 2159abb418 Simplify the format of the XLX Hosts file a little. 2017-09-26 14:58:22 +01:00
Jonathan Naylor a057f757ab Add a reload time for the XLX Hosts file. 2017-09-26 13:08:35 +01:00
Jonathan Naylor 82e6b90454 Make it link to the default room on a new reflector link. 2017-09-26 09:19:55 +01:00
Jonathan Naylor 5b8a61f04b Allow for XLX000. 2017-09-25 09:22:22 +01:00
Jonathan Naylor 3f03319e7f Fix the XLX number mapping. Reported by Adrian VK4TUX. 2017-09-24 09:11:21 +01:00
Jonathan Naylor 7d304f8bca Merge branch 'master' into XLXs 2017-09-22 21:10:40 +01:00
Jonathan Naylor b966fe7167 Add seperate timeouts for RF and network. 2017-09-22 21:03:44 +01:00
Jonathan Naylor c62c5fe061 Use the rewritten slot for checking if it is free. 2017-09-22 20:49:12 +01:00
Jonathan Naylor 5faeeed423 Merge branch 'master' into XLXs 2017-09-16 14:50:30 +01:00
Jonathan Naylor 9289d48939 Optionally suppress location information info being sent to the masters. 2017-09-16 14:33:04 +01:00
Jonathan Naylor 37384c6a16 More changes to relinking and startup. 2017-08-24 08:54:20 +01:00
Jonathan Naylor d80de2c215 Add more complexit to relinking. 2017-08-22 09:34:37 +01:00
Jonathan Naylor a379d2447e Change the voice to include the XLX number. 2017-08-22 09:13:27 +01:00
Jonathan Naylor aec4a08e46 Alter the relink timer strategy. 2017-08-21 13:21:43 +01:00
Jonathan Naylor da12799d04 Allow the XLXBase to affect the reflector choice command. 2017-08-21 13:17:21 +01:00
phl0 c3087a4b76
Correct if statement 2017-08-20 23:45:48 +02:00
Jonathan Naylor ee2b701bb8 Small bug fixes. 2017-08-20 22:37:28 +01:00
Jonathan Naylor e5d4dab793 Allow for switching between XLX reflectors. 2017-08-20 21:48:49 +01:00
Jonathan Naylor 8a3f2ca64d Handle TA and Embedded GPS data correctly. 2017-08-02 19:30:39 +01:00
Jonathan Naylor 367116bdf4 Add optional names for each network for use in the log, 2017-08-01 21:51:22 +01:00
phl0 3b2a9bf7aa
Also suppress duplicate TGs during startup 2017-07-31 13:45:39 +02:00
Jonathan Naylor cf170a571c Convert the relink code to using the Timer class. 2017-06-23 20:57:50 +01:00
phl0 5e1a084790
Fix reformatting mistake 2017-06-23 12:19:38 +02:00
Jonathan Naylor bee2f21184 Reformat the code. 2017-06-23 09:07:50 +01:00
Simon 9a5a4a1b69 XLX: add unlink before re-link 2017-06-22 19:16:44 +01:00
phl0 1002f399ea
Make Relink timer disabled if set to 0 2017-06-20 16:22:30 +02:00
Simon 982faf30ef XLX: Add connected check to relink code. 2017-06-20 14:00:54 +01:00
Simon 7f4c586036 Add configuration option "Relink" to specify re-link timeout for XLX 2017-06-20 13:50:23 +01:00
Simon 6050be6406 Timeout XLX reflectors and return to startup after period of inactivity 2017-06-19 18:50:36 +01:00
Jonathan Naylor 048abc0888 Optimise the tracing to remove duplicate traces. 2017-06-09 20:14:26 +01:00
Jonathan Naylor 87bee93b2b First stage of rationalising the rule tracing code. 2017-06-07 21:22:01 +01:00
Jonathan Naylor 06a8b203ce Move the RF passall processing after all of the other rewrites are done. 2017-06-07 20:40:51 +01:00
g0wfv 64b3f0848c Add SIGINT handling and alter termination signal logging 2017-06-07 19:35:48 +01:00
Jonathan Naylor 7cd557de8a Fix bug in tracing code, now enabled correctly. 2017-06-04 19:12:16 +01:00
Jonathan Naylor 2e257da997 Add basic rule tracing. 2017-06-04 15:17:43 +01:00
Jonathan Naylor efbf42ff83 Allow for passing of beacon requests from the networks to the repeater. 2017-06-02 16:29:01 +01:00
Tony Corbett G0WFV fc70b6813c Stop gateway bombing out when MMDVMHost stops after the gateway has restarted 2017-06-02 11:42:54 +01:00
g0wfv b92b119e8d Satisfying my CDO 2017-06-01 18:18:30 +01:00
Tony Corbett G0WFV c8fbef1051 Cleanup 2017-06-01 17:41:16 +01:00
Tony Corbett G0WFV d9b0410fa0 Add status when connected or disconnected via PC to 5000 +/- base! 2017-06-01 17:34:51 +01:00
g0wfv 61e21d4eb5 Merge remote-tracking branch 'upstream/master' 2017-06-01 16:40:51 +01:00
g0wfv 9914c43e1a Add status request (while connected only I think) to XLX - PC to 5000 (plus base!) 2017-06-01 16:40:14 +01:00
Jonathan Naylor f90dbb5874 Add informative messages at startup. 2017-05-30 21:52:44 +01:00
Jonathan Naylor 8bc79767c5 Allow for a startup XLX reflector. 2017-05-30 13:42:30 +01:00
Simon 63310e3401 Fixed typo that stopped PassAll options from working with net. DMR-1 2017-05-30 12:13:17 +01:00
Jonathan Naylor 8861ff6dfe Allow for direct linking from one reflector to another. 2017-05-29 19:24:13 +01:00
Jonathan Naylor 8830141c4d Allow for a clean exit when waiting for the MMDVM connect. 2017-05-29 18:52:36 +01:00
Kim - DG9VH 77af11886c fixed bug with XLX
Added correct data-Channel (Talkgroup) for XLX-connections
2017-05-28 21:49:34 +02:00
Jonathan Naylor 0446acc6c4 Remove compiler warnings. 2017-05-27 16:55:39 +01:00
Jonathan Naylor a4cff2f3d7 Add Pass All parameters for TGs and Private Calls. 2017-05-27 16:50:34 +01:00
Jonathan Naylor 92bda23094 Split RF and network processing functionality. 2017-05-27 16:26:52 +01:00
Jonathan Naylor ee438fd2dc Allow for a second XLX reflector. 2017-05-26 13:26:39 +01:00
Jonathan Naylor 87e261e99e Add an XLX base so the control ids can be shifted. 2017-05-25 18:24:05 +01:00
Jonathan Naylor d12ac3ecb4 Revert "Make PC Rewrite bi-directional."
This reverts commit f3c95d6618.
2017-05-25 18:19:47 +01:00
Jonathan Naylor c2bcec4a59 Modify Type Rewrite to handle BM Echo. 2017-05-24 17:46:07 +01:00
Jonathan Naylor f3c95d6618 Make PC Rewrite bi-directional. 2017-05-24 17:44:01 +01:00
Jonathan Naylor 864bcb1293 Enable the Options for DMR Network 1 and 2. 2017-05-24 17:42:48 +01:00
phl0 c7a7d0adef
Add compilation time stamp and GitID to binaries 2017-05-23 10:07:44 +02:00
Jonathan Naylor 90f5e17be9 Pass through new GPS and TA data. 2017-05-17 18:58:46 +01:00
Jonathan Naylor 5eff056ed0 Add a range to the SrcRewrite and a new config. 2017-05-16 18:42:37 +01:00
Jonathan Naylor f92ec4263f Add two more rewrite types. 2017-05-15 21:16:52 +01:00
Jonathan Naylor 1e5d387d81 Use the unified rewriting code. 2017-05-14 18:14:09 +01:00
Jonathan Naylor 25bc41e408 Rename Rewrite to TG Rewrite. 2017-05-13 17:55:20 +01:00
Jonathan Naylor db069edd1b Add extra logging to XLX data. 2017-05-12 17:19:39 +01:00
Jonathan Naylor ce69be754a Fix bug in the rewrite code. 2017-05-08 18:34:41 +01:00
Jonathan Naylor 16c943b551 Remove silly asserts. 2017-05-07 08:45:17 +01:00
Jonathan Naylor 1ef304ae88 Flo's fixes and other bits. 2017-05-06 17:17:34 +01:00
Jonathan Naylor 9a1334e36d Allow seperate Ids and bug fixing. 2017-05-06 09:57:17 +01:00
Jonathan Naylor 90f3e0e597 The first version of the multi network version. 2017-05-03 17:48:55 +01:00
Jonathan Naylor 196908bedc More work on audio prompts. 2017-05-01 20:05:41 +01:00
Jonathan Naylor b9ebdee601 Start the voice transmission module. 2017-05-01 14:46:43 +01:00
Jonathan Naylor 503af50070 Virtualise the repeater protocol class. 2017-04-30 11:13:35 +01:00
Jonathan Naylor 847de9f470 Handle unlinking. 2017-04-30 11:01:54 +01:00
Jonathan Naylor a66db5d32a Clean up the code. 2017-04-29 09:55:49 +01:00
Jonathan Naylor 6e9156497d Add the TG rewrite code. 2017-04-28 16:45:05 +01:00
Jonathan Naylor ee978a6521 Fix bugs and improve logging. 2017-04-27 20:39:46 +01:00
Jonathan Naylor 5941d983ac First round of bug fixes and cleanups. 2017-04-23 20:17:25 +01:00
Jonathan Naylor c04c3e1aef Initial commit. 2017-04-20 20:51:30 +01:00