Commit graph

275 commits

Author SHA1 Message Date
Jonathan Naylor
2a53923c9a Revert packet timer changes. 2016-07-15 06:32:56 +01:00
Jonathan Naylor
f18c505852 Increase logging level for infill messages. 2016-07-14 20:33:40 +01:00
Jonathan Naylor
49b002a463 Make silence infillinf a little looser. 2016-07-14 20:31:29 +01:00
Jonathan Naylor
9e83d23c48 Simple minded rate 3/4 FEC decoding. 2016-07-14 18:58:03 +01:00
Jonathan Naylor
ad29c5c4b6 Remove packet timer and use the elapsed timer directly. 2016-07-14 18:20:06 +01:00
Simon
53fe88bf9e Add separate blacklist/whitelist for RF and NET 2016-07-10 21:37:11 +01:00
Simon
8e6344f50c Change access control to call validateAccess 2016-07-10 18:35:23 +01:00
Simon
f313615708 Move DMR Access Control to new class. 2016-07-10 16:46:02 +01:00
Simon
66415e004e Separate DMR Access control into new class: DMRAccessControl:: 2016-07-10 11:47:23 +01:00
Simon
8ed6eb7dec Merge remote-tracking branch 'upstream/master' 2016-07-08 14:05:24 +01:00
Simon
f48b982e93 Fix bug in whitelist logic that was blocking secondary TGs 2016-07-08 14:04:15 +01:00
Jonathan Naylor
d0e118e85c Start on DMR rate 3/4 data. 2016-07-07 20:23:30 +01:00
Jonathan Naylor
e0a6229d6c Added Rate 3/4 Data debugging output. 2016-07-07 14:05:38 +01:00
Simon
cfa70a0388 more whitelist tidying 2016-07-03 18:41:08 +01:00
Simon
48c273814c More fixes to black/white list behaviour 2016-07-03 10:20:32 +01:00
Simon
3da7ebe085 Fix blacklist hit causing crash 2016-07-03 10:03:50 +01:00
Jonathan Naylor
1e994e920a Let the modem handle the null Short LC itself. 2016-06-20 18:33:04 +01:00
Jonathan Naylor
ac87d8e779 Revert terminator behaviour for hotspot users. 2016-06-20 10:01:09 +01:00
Jonathan Naylor
8b571e96de Fix terminator transmission on incoming network data. 2016-06-17 10:52:48 +01:00
Jonathan Naylor
c1fcc2f2f4 Flush the queues if new data comes in. 2016-06-17 07:37:49 +01:00
Jonathan Naylor
199109417b Abort the terminators if a valid transmission is received. 2016-06-17 07:05:37 +01:00
Jonathan Naylor
8af3016583 Add a DMR hang time for locking out disimilar calls. 2016-06-16 21:40:05 +01:00
Simon
8acd2b4073 Whitelist allow IDs should be above 99999 not 10000 2016-06-11 13:07:35 +01:00
Simon
05c1b52540 Tidyed comments 2016-06-11 09:51:18 +01:00
Simon
63584b4a3a more logging tidying for acl 2016-06-10 10:57:58 +01:00
Simon
cb9ec738e1 Tided up logging text for acl 2016-06-10 10:42:04 +01:00
Simon
352503b823 Include secondary TGs in default block for TS1 TGs 2016-06-10 10:30:54 +01:00
Simon
89836def2f Added check for null whitelist 2016-06-10 10:22:02 +01:00
Simon
03280cd4e4 Improved acl logging (added dataType) 2016-06-09 22:19:13 +01:00
Simon
06a99a4d93 blacklist 2016-06-09 22:10:04 +01:00
Simon
811d8e6c30 Blacklist and whitelist traffic from network 2016-06-09 19:33:00 +01:00
Simon
3e3bb2ce4b Fixed blacklist/whitelist logic 2016-06-07 18:05:13 +01:00
Simon
8f7aac365c fixed end of non-void 2016-06-07 15:43:02 +01:00
Simon
5d9be0368c Merge remote-tracking branch 'upstream/master' 2016-06-07 15:35:08 +01:00
Simon
ff4bd9f82e Added blacklist and whitelist for TGs 2016-06-07 15:34:16 +01:00
Jonathan Naylor
ed8ea92468 Re-add debug BER displays for D-Star and DMR. 2016-06-01 09:43:39 +01:00
Jonathan Naylor
11907162e7 Increase the output queue size. 2016-05-10 18:54:35 +01:00
Jonathan Naylor
bd5946ccd2 Add a display hang time so quick transmissions aren't missed. 2016-05-09 18:14:27 +01:00
g0wfv
22a85b1455 Buying Jon a dictionary for Xmas ;) 2016-05-04 19:03:23 +01:00
Jonathan Naylor
27abecd31d Change timings to match a real repeater. 2016-05-03 21:18:44 +01:00
Jonathan Naylor
52de9f3970 Fix spelling mistakes. 2016-05-03 13:58:34 +01:00
Jonathan Naylor
1204ce30b6 Lookup CSBK id's to callsigns. 2016-04-28 10:32:11 +01:00
Jonathan Naylor
52ebde068a Remove some error messages, they confuse people! 2016-04-28 09:58:45 +01:00
Jonathan Naylor
dc3fed940c Remove AMBE FEC BER messages for DMR and D-Star. 2016-04-27 06:43:47 +01:00
Jonathan Naylor
a5c61cce24 Fix the elapsed counters. 2016-04-26 19:10:45 +01:00
Jonathan Naylor
029c7cf8f9 Handle empty data transmission and multiple data headers. 2016-04-26 18:22:47 +01:00
Jonathan Naylor
740aa174c3 Reduce the logging of lost network audio. 2016-04-26 18:05:18 +01:00
Jonathan Naylor
f7b0acd749 Convert network data to pass std::strings to the display. 2016-04-21 15:21:39 +01:00
phl0
23738d97f6
Change variable types for strings used in writeDMR 2016-04-21 14:01:53 +02:00
Jonathan Naylor
adf90f9381 Small fixes for DMR data modes. 2016-04-19 19:46:16 +01:00
Jonathan Naylor
646ae93c09 Increase the size of the RF queues. 2016-04-19 18:06:39 +01:00
phl0
5b144203d9 Add destination call lookup to display output as well 2016-04-15 15:35:45 +02:00
phl0
8cd2784529 Add lookup of destination call to log output 2016-04-15 15:24:57 +02:00
Jonathan Naylor
8eb564ba37 Translate DMR Id to callsign from a file. 2016-04-12 18:26:13 +01:00
Jonathan Naylor
371684ae03 Add black list functionality for D-Star and DMR. 2016-04-06 18:46:05 +01:00
Jonathan Naylor
f7e2cff004 Use the STL find function instead of an iterator. 2016-04-06 17:24:14 +01:00
Jonathan Naylor
a2130421a9 Add DMR prefix checking. 2016-04-04 19:03:38 +01:00
Jonathan Naylor
ea51eee15c Allow for locking the MMDVM to the callsign or id of the
repeater/hostspot.
2016-04-04 17:40:05 +01:00
Jonathan Naylor
4c80f52131 Standardise the number of headers transmitted. 2016-03-29 18:06:17 +01:00
Jonathan Naylor
49a278a952 Add the BER and a future RSSI to the DMR data. 2016-03-23 17:30:06 +00:00
Jonathan Naylor
4760f7aa64 More work on DMR Data Header block counts. 2016-03-15 22:46:36 +00:00
Jonathan Naylor
0a8c633ff5 Handle data headers with zero blocks to follow. 2016-03-15 20:28:19 +00:00
Jonathan Naylor
3f61e9a287 Handle group transmissions of Preamble CSBKs. 2016-03-14 21:22:09 +00:00
Jonathan Naylor
2cfb1f458e Improve timing within the protocol engines. 2016-03-14 20:55:15 +00:00
Jonathan Naylor
1d4443eafd Changes to improve DMR data efficiency. 2016-03-14 20:43:04 +00:00
Jonathan Naylor
43fdf57169 Display the contents of all DMR data transmission types. 2016-03-14 20:14:08 +00:00
Jonathan Naylor
0c80931d6f Better logging of CSBK information. 2016-03-14 17:33:05 +00:00
Jonathan Naylor
2298a7b1b3 Only transmit the data header once over RF. 2016-03-11 06:50:06 +00:00
Jonathan Naylor
d633dfa020 Temporarily disable DMR data header regeneration. 2016-03-10 21:52:25 +00:00
Jonathan Naylor
f824f044a3 Revert "Remove rate 1/2 data regeneration."
This reverts commit bd338df210.
2016-03-10 17:18:40 +00:00
Jonathan Naylor
bd338df210 Remove rate 1/2 data regeneration. 2016-03-10 12:27:25 +00:00
Jonathan Naylor
12fb99c00a Add more asserts to catch bugs. 2016-03-07 20:21:55 +00:00
Jonathan Naylor
bfb74d3155 Add extra debughing of the output queues. 2016-03-07 18:08:50 +00:00
Jonathan Naylor
05e720a635 Make the TFT Serial display look reasonable. 2016-03-03 21:27:03 +00:00
Jonathan Naylor
96589f8a7e Only use the AMBE silence frame if it's AMBE data! 2016-03-03 09:18:52 +00:00
Jonathan Naylor
6090f1f8fd Add the Embedded LC to the fill-in audio. 2016-03-01 19:04:04 +00:00
Jonathan Naylor
4b77e3fa96 Add regeneration of Embedded LCs. 2016-02-29 07:27:10 +00:00
Jonathan Naylor
8846123afb Fix the RF count of N. 2016-02-29 06:51:34 +00:00
Jonathan Naylor
2502d6ba78 Remove sync-less data handling. 2016-02-29 06:41:19 +00:00
Jonathan Naylor
bea76da41f Add special data spacer/termination after data transmission. 2016-02-28 18:22:17 +00:00
Jonathan Naylor
b6adf6931d Regularise the sending of headers and timeouts. 2016-02-28 17:40:15 +00:00
Jonathan Naylor
14a30286c7 Final changes for splitting the state machines. 2016-02-28 17:18:13 +00:00
Jonathan Naylor
b3d5bec4ad Regenerate the PI Header. 2016-02-25 19:59:09 +00:00
Jonathan Naylor
ddcde1d8e3 Split RF and network statues for all modes. 2016-02-25 19:54:18 +00:00
Jonathan Naylor
f29f48503e Regenerate the rate 1/2 data payload. 2016-02-24 07:37:58 +00:00
Jonathan Naylor
e0e1844aa5 Small change to DME AMBE FEC. 2016-02-24 07:29:05 +00:00
Jonathan Naylor
1d93f72b52 Handle sync-less data frames. 2016-02-23 21:01:14 +00:00
Jonathan Naylor
6792894c00 Remove unneeded debug statements. 2016-02-23 06:26:54 +00:00
Jonathan Naylor
0881df603d Regenerate the header structures and fix the data header. 2016-02-22 18:12:24 +00:00
Jonathan Naylor
63aa53c705 Fix the CCITT16 checksums for CSBK, DMR Data and D-Star Headers. 2016-02-18 21:56:26 +00:00
Jonathan Naylor
9a3fe18e91 Improve silence fillin messages. 2016-02-18 19:57:11 +00:00
Jonathan Naylor
56935be5e1 Add FEC BER debugging statements. 2016-02-18 18:18:37 +00:00
Jonathan Naylor
360ca91de0 Upgrade the TFT Serial display driver and displayed information. 2016-02-16 18:30:12 +00:00
Jonathan Naylor
1bfa3688c0 Add debugging to the ring buffers. 2016-02-15 20:18:30 +00:00
Jonathan Naylor
5185a0c245 Renamed DMR protocol files. 2016-02-15 18:45:57 +00:00
Jonathan Naylor
656be113f5 Allow half-duplex DMR for use with hotspot hardware. 2016-02-15 18:01:21 +00:00
Jonathan Naylor
fb3d76787a Add RF end of transmission when either RF or network is lost. 2016-02-07 20:12:24 +00:00
Jonathan Naylor
aa1a45394a Simplify mode changes. 2016-02-02 18:17:36 +00:00
Jonathan Naylor
2947888cad Add the status ack to D-Star. 2016-02-01 20:49:52 +00:00
Jonathan Naylor
279a709793 Add duration to the log messages. 2016-02-01 18:07:12 +00:00
Jonathan Naylor
b48d0b9b90 Change the silence infill for DMR and D-Star. 2016-01-28 06:50:54 +00:00
Jonathan Naylor
fd42b2971e Hopefully fix crashes due to divide by zero. 2016-01-27 20:14:02 +00:00
Jonathan Naylor
43731690f4 Calculate the correct BER. 2016-01-27 20:05:28 +00:00
Jonathan Naylor
b34cd230c7 Change infilling to be more lenient. 2016-01-27 06:49:16 +00:00
Jonathan Naylor
53d557bd57 Update the Short LC in the CACH for data transmissions. 2016-01-26 18:28:39 +00:00
Jonathan Naylor
c79fef5dae Make silence insertion less aggressive. 2016-01-26 18:12:08 +00:00
Jonathan Naylor
7bb53cf704 Beginnings of DMR data support. 2016-01-26 18:06:31 +00:00
Jonathan Naylor
c92434e474 Move the D-Star poll message to be run from the network class. 2016-01-25 23:08:34 +00:00
Jonathan Naylor
8860b72e6c Changes based on debugging. 2016-01-25 22:36:16 +00:00
Jonathan Naylor
9e7cde9fff Change silence handling (again) and handle CSBKs. 2016-01-25 21:56:57 +00:00
Jonathan Naylor
73375fb41e Change the network late entry and be less aggressive at filling silence. 2016-01-22 06:43:08 +00:00
Jonathan Naylor
a845f6b6d7 Allow for network late entry. 2016-01-21 21:08:10 +00:00
Jonathan Naylor
69dc24421d DMR AMBE FEC. 2016-01-21 20:06:08 +00:00
Jonathan Naylor
6fc525b780 Use a real silence packet. 2016-01-21 19:19:14 +00:00
Jonathan Naylor
77d34a0075 Use terminators instead of idle to end a voice transmission.
`
2016-01-21 18:38:45 +00:00
Jonathan Naylor
0322bac8c7 Record the BER on incoming network traffic also. 2016-01-20 07:12:28 +00:00
Jonathan Naylor
2f4f3f7bd7 Alter constants on lost network traffic fillin. 2016-01-19 21:37:29 +00:00
Jonathan Naylor
cdc29e85c3 Beginnings of AMBE FEC reconstruction. 2016-01-19 20:13:20 +00:00
Jonathan Naylor
df41284682 Handle missing frames. 2016-01-19 19:34:49 +00:00
Jonathan Naylor
ac31174b0d Small cleanups. 2016-01-19 17:43:33 +00:00
Jonathan Naylor
25c34af20e Handle data transmissions and use new method for timing spacing on RF. 2016-01-18 18:36:14 +00:00
Jonathan Naylor
510cb21af1 Update DMRSlot.cpp
Don't regenerate the LC until code is sorted out.
2016-01-15 13:10:11 +00:00
Jonathan Naylor
acf43628fb Ignore bad LC on network LC headers. 2016-01-14 20:48:09 +00:00
Jonathan Naylor
34672a02ba Improve network data holdoff. 2016-01-14 20:14:18 +00:00
Jonathan Naylor
d34d85c04b Initial commit 2016-01-14 18:45:04 +00:00