Commit graph

264 commits

Author SHA1 Message Date
Jonathan Naylor
711bcbf745 Reformat code and make small alterations. 2017-11-15 10:47:56 +00:00
ON7LDS
3b62bd1666 New Nextion screen layout with better looking fonts
New parameter for selecting ON7LDS Nextion screen layout
The active ip address of the host is showed on main screen
Nextion DMR page:
* Talker alias (if available) will be decoded and displayed (in green to know it's the TA)
* Font will get smaller if TA is to long
GPS data will be decoded and logged
2017-11-13 21:48:47 +01:00
Jonathan Naylor
90e4794a3d Revert "Devel" 2017-10-24 21:55:58 +01:00
Jonathan Naylor
4430294fc5 Merge pull request #337 from on7lds/devel
Devel
2017-10-24 21:43:09 +01:00
Jonathan Naylor
3299fbe030 Fix indentation. 2017-10-04 21:56:40 +01:00
Jonathan Naylor
8fe16ca217 Fix bug in Short LC and add the last (unused) category. 2017-10-04 11:36:51 +01:00
Jonathan Naylor
323e5f7680 Revert "Simplify and fix the Short LC code."
This reverts commit 251c5fb361.
2017-10-04 11:20:37 +01:00
Jonathan Naylor
251c5fb361 Simplify and fix the Short LC code. 2017-10-04 10:50:05 +01:00
Jonathan Naylor
d6d87669d4 Remove unneeded code. 2017-10-03 12:18:06 +01:00
Jonathan Naylor
84a9f2e9b8 Upgrade the Short LC signalling for data preamble CSBKs. 2017-10-03 10:03:13 +01:00
root
3a9c011dfa Refinements of the Nextion displays
* better looking fonts
* DMR talker alias is shown (in green) if received
* font is automaticly  adapted when TA would be too long for display
* DMR ID, call or TA (depending on what was shown) goes to gray at voice end
* "MMDVM stopped" at rest screen when MMDVMHost application is ended
* active network interface and IP address on rest screen so you know how to contact it
2017-10-02 21:04:46 +02:00
Jonathan Naylor
ed9362845a Remove unused variable. 2017-05-21 11:52:26 +01:00
Jonathan Naylor
b4599dc89c Remove Talker Alias network reporting rate restriction. 2017-05-18 12:58:56 +01:00
Jonathan Naylor
f9e20cd737 Add new GPS and TA DMR network messages. 2017-05-17 18:16:08 +01:00
Jonathan Naylor
4378a2b938 Add network debugging for DMR headers. 2017-05-12 09:26:34 +01:00
Jonathan Naylor
1a49641fe0 Add extra headers for DMR DMO operation. 2017-04-02 13:39:28 +01:00
Jonathan Naylor
f2667cbd4f Tweak the DMR return value. 2017-03-13 08:28:38 +00:00
Jonathan Naylor
8e23051a95 Refine the timeout handling. 2017-03-12 19:25:01 +00:00
Jonathan Naylor
d7b8170364 Change of DMR timeout behaviour. 2017-03-12 19:06:47 +00:00
Jonathan Naylor
501300225f Remove unneeded end of data transmission terminator. 2017-03-05 19:33:03 +00:00
Jonathan Naylor
951a535d43 Finesse the talker dumping code from the last TA commit. 2017-02-28 08:27:56 +00:00
Jonathan Naylor
1dbaec9331 Increase TA and GPS to message level, and allow it to be controlled from
the ini file.
2017-02-27 20:17:55 +00:00
Jonathan Naylor
26010e5b54 Demote all of the embedded data dumping to debug level. 2017-02-27 08:18:00 +00:00
Jonathan Naylor
6ee6fc3cdc Restore rate 3/4 data logging that was lost in the last commit. 2017-02-13 08:50:23 +00:00
Jonathan Naylor
f0387d25dd Add BER display to the Nextion and reduce Talker Id logging. 2017-02-12 18:37:00 +00:00
Jonathan Naylor
e587d7a88d Add extra data logging. 2017-02-02 20:42:20 +00:00
phl0
8ffdb9bd20
Optional non Embedded LC data suppression 2017-01-16 13:10:23 +01:00
Jonathan Naylor
dfa359565a Upgrade the Embedded Data regeneration. 2017-01-10 19:27:12 +00:00
Jonathan Naylor
5968f3b47c Remove RSSI log data if no RSSI data to show. 2017-01-07 12:25:03 +00:00
Jonathan Naylor
36b494c581 Make empty single element embedded data more elegant. 2017-01-06 08:30:36 +00:00
Jonathan Naylor
3c9666e780 Display the RSSI on the Nextion screen. 2017-01-05 19:44:52 +00:00
Jonathan Naylor
af721f89e2 Add RSSI display for all modes. 2017-01-05 19:15:10 +00:00
Jonathan Naylor
8debea45e4 Add embedded data dumping. 2017-01-05 19:00:01 +00:00
Jonathan Naylor
15dd390fb5 Small cleanup of the RSSI code. 2016-12-22 11:10:08 +00:00
Jonathan Naylor
8732817437 Remove id validation of network data. 2016-12-22 09:08:37 +00:00
Jonathan Naylor
aac48cb58f Use a linear interpolator for the reported RSSI values. 2016-12-21 19:58:46 +00:00
Jonathan Naylor
59080e1bd7 Complete the restructuring of the DMR access control. 2016-12-21 19:06:29 +00:00
Jonathan Naylor
a3d28f71f4 Merge branch 'master' of github.com:g4klx/MMDVMHost 2016-12-21 18:07:04 +00:00
Jonathan Naylor
a28508b8b1 Initial removal of TG rewrite code. 2016-12-21 18:06:43 +00:00
Jonathan Naylor
d4d1773b8c Improve the DMR data performance on RF. 2016-12-21 08:55:30 +00:00
Jonathan Naylor
c66f3fa455 Add extra Preamble CSBK data dumping. 2016-12-11 16:01:30 +00:00
Jonathan Naylor
8195f91815 Remove all of the Embedded LC regeneration. 2016-12-10 13:21:25 +00:00
Jonathan Naylor
78e1abfcca Don't regenerate the Embedded LC. 2016-12-04 14:40:55 +00:00
Jonathan Naylor
031c504622 Unknown CSBKs are passed through. 2016-11-11 07:20:45 +00:00
Jonathan Naylor
eacc588636 Validate the wake up CSBK correctly. 2016-11-10 18:43:54 +00:00
Jonathan Naylor
18acbfe8f1 Allow network late entry on a PI header. 2016-11-01 18:07:10 +00:00
Jonathan Naylor
5ae3b6a9d2 Clean up the access control code for DMR. 2016-11-01 08:00:13 +00:00
Jonathan Naylor
4f6356212b Handle corrupted network DMR LCs more gracefully. 2016-10-31 17:55:38 +00:00
Simon
715369e06e DMRAccessControl: add per-slot dstid, src id and time 2016-10-17 13:59:52 +01:00
Jonathan Naylor
3c7bdd6e12 Further clean up of DMR Access Control. 2016-10-13 17:46:02 +01:00
Jonathan Naylor
989bd8a1fd Clean up the code formatting. 2016-10-10 19:27:08 +01:00
Jonathan Naylor
25cfff3ada Merge branch 'master' into P25 2016-09-27 19:47:07 +01:00
Simon
dfb3630315 Tidy up as per Jonathan's comments 2016-09-22 16:47:04 +01:00
Simon
e87eae94a1 Next release of TG Rewrite 2016-09-21 19:35:13 +01:00
Simon
65bdc54997 Adding ini options for TGRewrite code 2016-09-21 16:33:35 +01:00
Simon
aa3e592ebb Added check to exclude private calls from TG rewrite. (FLCO_GROUP) 2016-09-17 11:07:23 +01:00
Simon
9a90852566 Track over end time on RF 2016-09-15 22:03:43 +01:00
Simon
b6f4842b7f Completed TG Rewrite, added config options. 2016-09-15 20:41:14 +01:00
Simon
21691b046b Talkgroup rewrite now working 2016-09-15 14:19:00 +01:00
Simon
105d18594a more tg-rewrite work 2016-09-15 10:08:13 +01:00
Jonathan Naylor
9423fb25a6 Add P25 networking, and rename DMR network files. 2016-09-14 07:41:37 +01:00
Simon
a275e77902 fixed id/did logic 2016-09-11 18:26:27 +01:00
Simon
809153e0f2 Add TG rewrite code call to DMRSlot.cpp 2016-09-11 13:01:05 +01:00
Simon
c53a96baab Added TG rewrite code 2016-09-11 12:15:03 +01:00
Jonathan Naylor
e04d76584e Configurable DMR jitter buffer. 2016-09-06 19:42:15 +01:00
Jonathan Naylor
996db45b45 Clean up the DMR sync generation code. 2016-09-06 08:06:19 +01:00
Jonathan Naylor
e16c27be61 Change the DMR sync bytes when in DMO mode. 2016-09-05 18:03:23 +01:00
Jonathan Naylor
001d3f753c Revert "Add the DMO mode sync bytes in DMO mode."
This reverts commit 02f555d299.
2016-08-25 17:22:16 +01:00
Jonathan Naylor
02f555d299 Add the DMO mode sync bytes in DMO mode. 2016-08-23 19:06:16 +01:00
Jonathan Naylor
83b27188e5 Alter the format of the returned RSSI data. 2016-08-11 17:28:47 +01:00
Jonathan Naylor
19c7578bb9 Remove extra debugging messages. 2016-08-11 06:42:50 +01:00
Jonathan Naylor
4e35a8d47e Completely revert the DMR silence infilling. 2016-08-10 20:16:06 +01:00
Jonathan Naylor
27edf9fc1c More silence tweaks. 2016-08-10 14:33:34 +01:00
Jonathan Naylor
171f0ac8cc Tweak the silence infill parameters. 2016-08-10 11:50:43 +01:00
Jonathan Naylor
c67f8e861a Tweak the silence infill parameters a little more. 2016-08-09 21:20:25 +01:00
Jonathan Naylor
cd628a6005 lastFrameValid does not indicate the first frame. 2016-08-09 18:52:50 +01:00
Jonathan Naylor
443c363b1c Reset lastFrameValid when used up. 2016-08-09 17:20:26 +01:00
Jonathan Naylor
ad4cb859b5 Change the silence insertion parameters. 2016-08-09 08:11:43 +01:00
Jonathan Naylor
321246f7fc Add noisy sequence number debugging. 2016-08-09 08:06:59 +01:00
Jonathan Naylor
7e5cdea528 Removed unneeded timer reset. 2016-08-09 07:41:48 +01:00
Jonathan Naylor
04b2955e12 Increase the lost packet timeout to 400ms. 2016-08-09 07:35:31 +01:00
Jonathan Naylor
a4d8d7a121 Semi-revert to the older silence filling method. 2016-08-09 07:28:10 +01:00
Jonathan Naylor
203ec75aad Add dBm. 2016-08-09 06:46:04 +01:00
Jonathan Naylor
ecfe5dfb18 Use the correct bytes for the RSSI. 2016-08-09 06:24:13 +01:00
Jonathan Naylor
059b960959 Add RSSI reporting for DMR only. 2016-08-08 21:26:18 +01:00
Jonathan Naylor
eabf515403 Add rate 3/4 data debugging. 2016-08-08 18:05:14 +01:00
Jonathan Naylor
e458a3cb3f Fix missing audio detection. 2016-08-08 18:00:55 +01:00
Jonathan Naylor
299f53b551 Don't use someone elses infill audio! 2016-07-21 18:09:29 +01:00
Jonathan Naylor
d0ddb81c3f Avoid DMR buffer overflows, hopefully. 2016-07-21 17:46:37 +01:00
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