Commit graph

312 commits

Author SHA1 Message Date
Shawn Chain c2584066d8 Correct the m_ovcm flag check in DMRSlot 2019-11-18 20:47:56 +08:00
Shawn Chain 88d91e420a use enum DMR_OVCM_TYPES 2019-11-17 10:57:58 +08:00
Shawn Chain 2f9595949a Change ovcm config to int value 2019-11-16 23:06:26 +08:00
Patrick Maier 6caffb2bc0 Separate the config if OVCM should be supported in sending and receiving direction 2019-11-09 17:22:39 +01:00
Jonathan Naylor e74df4875b
Merge pull request #532 from maierp/maierp_ovcm_in_csbk
Include ovcm also in csbk
2019-11-06 15:28:34 +00:00
Jonathan Naylor bc5a1d24c4 Make the default for OVCM to be off. 2019-11-05 15:49:00 +00:00
maierp 1ed79d01c0
Merge pull request #2 from maierp/master
Merge changes from master to sidebranch
2019-10-18 19:58:16 +02:00
Patrick Maier 1993262c52 Also set the OVCM bit in the two supported CSBKs: "Unit to Unit Voice Service Request CSBK" and "Unit to Unit Voice Service Answer Response CSBK" 2019-10-18 19:40:35 +02:00
Jonathan Naylor 6bababeb96 Add OVCM support. 2019-10-11 18:24:25 +01:00
Jonathan Naylor 16a8bfd757 Remove use of NULL m_rfLC. 2019-10-10 13:06:28 +01:00
Jonathan Naylor 4f3ca97e69 Remove use of NULL m_netLC. 2019-10-10 11:53:08 +01:00
Jonathan Naylor 87e60a81f8 Add end of transmission data to DMR. 2019-09-29 17:30:25 +01:00
Jonathan Naylor 0f6945ef4e Stop any response from any mode when not enabled. 2019-01-20 17:09:40 +00:00
Jonathan Naylor ae9e6ea6ab Reset the mode's state machines when going to the disabled state. 2019-01-19 17:15:24 +00:00
Jonathan Naylor 335b56f4bd Add busy lockout to remote mode handling. 2019-01-10 09:05:15 +00:00
Shawn Chain 4ee8dc9dee Fixed incorrect DMRTA header packet length from RF side 2018-12-09 23:49:15 +08:00
Shawn Chain 334307cd4a Bugfix of the DMRTA decoding for blocks comes in with random order 2018-12-09 17:24:11 +08:00
Shawn Chain 50c2500f82 Extract the DMR talker alias decode logic from Display.cpp 2018-12-08 22:09:59 +08:00
Jonathan Naylor 66a37d7d25 Add the beginnings of mobile hotspot location. 2018-10-30 07:53:11 +00:00
Andy CA6JAU 3e435c5e82 Restore "Fix RF late entry in DMR" 2018-10-10 20:18:58 -03:00
Jonathan Naylor edaf37101a Add MMDVM lock file based on an idea by DB1OFH. 2018-10-10 20:05:24 +01:00
Andy CA6JAU 867e1745d8 Fix RF late entry in DMR 2018-10-07 20:33:32 -03:00
Andy CA6JAU 3e81d1eb64 Extend preamble length for network CSBK preamble 2018-09-23 11:11:44 -03:00
Andy CA6JAU 9d2d4c804e Little format cleanup 2018-09-22 12:53:52 -03:00
Andy CA6JAU 3694da2dcd Drop duplicate and out-of-sequence DMR audio frames from RF 2018-07-21 21:01:55 -04:00
KD4Z 08f8a07945 Camel case findWithName() 2018-04-13 17:40:54 -04:00
KD4Z 9d6bcb7ec8 Fix dashboard conflict, add IP address to D-Star screen
Tag: Version "v20180328.3z"
2018-04-10 18:08:48 -04:00
Jonathan Naylor 980efe3023 Remove the RSSI debug message if nothing interesting to show. 2018-03-06 20:12:29 +00:00
Andy CA6JAU aa77b9f37a Set LCSS in insertSilence 2018-02-09 17:43:26 -03:00
Andy CA6JAU 04934c5dcc Drop duplicate packets 2018-02-09 17:30:53 -03:00
Andy CA6JAU 051f8c46e3 Jitter slots insert should be always multiple of 6 to avoid break DMR sequence 2018-02-09 14:49:18 -03:00
Andy CA6JAU 88273f3f3b Improving packet loss detection 2018-02-09 14:32:52 -03:00
Jonathan Naylor bf1773ebcc Final jitter buffer rollback cleanups. 2018-02-08 20:34:18 +00:00
Jonathan Naylor e6ed2e17a1 Roll back the jitter buffer changes. 2018-02-08 20:25:03 +00:00
Andy CA6JAU a0394afd91 Discard DMR audio frames with N > 5 (RF side) 2018-02-04 14:46:09 -03:00
Andy CA6JAU 4435af975d Fix bug “DMR ghost private calls” 2018-02-03 11:07:13 -03:00
Jonathan Naylor 22ed285857 Only reset the stream id at the end, not the beginning. 2018-01-12 07:06:38 +00:00
Jonathan Naylor a3155c1def Hopefully fix issues with data transmissions and the jitter buffer. 2018-01-11 21:17:25 +00:00
Jonathan Naylor 526e2c436d Add the jitter buffer for DMR. 2018-01-10 19:05:59 +00:00
Jonathan Naylor 35629f8708 Remove compilation warnings. 2017-11-28 21:35:25 +00:00
Jonathan Naylor 4064aeb6cf Reject embedded GPS data when the positional uncertainy is too great. 2017-11-28 13:45:22 +00:00
Jonathan Naylor 220cd0a0f9 Revert "Full integration of the jitter buffer into DMR."
This reverts commit e1800c0fe0.
2017-11-28 10:09:29 +00:00
Jonathan Naylor 7a5176862b Revert "Re-add the small delay in the start of transmission of DMR network data."
This reverts commit d87877e460.
2017-11-28 10:06:02 +00:00
Jonathan Naylor fce14a745b Revert "Remove the additional delay."
This reverts commit e5201a5e3e.
2017-11-28 10:04:44 +00:00
Jonathan Naylor e5201a5e3e Remove the additional delay. 2017-11-26 18:03:14 +00:00
Jonathan Naylor a215ce2982 Handle 2's complement values in the embedded GPS data properly. 2017-11-26 17:56:20 +00:00
Jonathan Naylor d87877e460 Re-add the small delay in the start of transmission of DMR network data. 2017-11-24 08:53:39 +00:00
Jonathan Naylor e1800c0fe0 Full integration of the jitter buffer into DMR. 2017-11-23 13:18:37 +00:00
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