Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2759 commits 33 branches 0 tags 24 MiB
Commit graph

2759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Naylor
dbf771d80c Fixed M17 to be compatible with the latest protocol speciication. 2021-03-25 21:07:44 +00:00
Jonathan Naylor
6b43bce561
Merge pull request #690 from f1rmb/f1rmb_fix_network_isConnected 
Fix *Network::isConnected().
 2021-03-23 22:54:43 +00:00
Daniel Caujolle-Bert
b5420fef15
Fix *Network::isConnected(). 
As m_enabled is changed accordingly to the modem current mode, it's not valid to use it for network connexion status.
 2021-03-23 22:32:36 +01:00
Jonathan Naylor
69a4fdd23c Merge branch 'master' into M17_AX25_FM 2021-03-22 22:14:54 +00:00
Jonathan Naylor
d26f3ea567
Merge pull request #689 from f1rmb/f1rmb_remote_status 
Add RemoteCommand 'status' command.
 2021-03-22 22:07:05 +00:00
Daniel Caujolle-Bert
27b7d3fc41
Add RemoteCommand 'status' command. 
As DMRGateway, it reports connection status.

Command sent: "status" to port: 7642
dstar:n/a dmr:conn ysf:n/a p25:n/a nxdn:n/a fm:n/a

RemoveCommand has been slighlty modified, as using Log on a read-only filesystem simply forbids the strings to be displayed.
Another solution would be to set LogInitialisse's filePath to "/tmp/" for *nix systems.
 2021-03-22 20:32:43 +01:00
Jonathan Naylor
9373b15e58 Merge branch 'master' into M17_AX25_FM 2021-03-22 19:23:03 +00:00
Jonathan Naylor
0088b0b225
Merge pull request #688 from f1rmb/f1rmb_remote_command_unifying 
Unitying RemoteCommand with latest DMRGateway's RemoteControl PR.
 2021-03-22 19:16:37 +00:00
Daniel Caujolle-Bert
629cdcfb2a
Unitying RemoteCommand with latest DMRGateway's RemoteControl PR. 2021-03-20 18:12:25 +01:00
Jonathan Naylor
95cb575a2e Improve FM data tracing. 2021-03-14 22:54:33 +00:00
Jonathan Naylor
a3e4a250bd Make the Null Controller respond properly. 2021-03-14 21:00:47 +00:00
Jonathan Naylor
42570c905d Handle updated M17 modem serial data. 2021-03-14 19:04:54 +00:00
Jonathan Naylor
d0ccc0ee61 Try and fix a crash. 2021-03-14 16:24:48 +00:00
Jonathan Naylor
75e8e95aad Add FM network audio gain and optional pre- and de-emphasis. 2021-03-14 14:59:34 +00:00
Jonathan Naylor
fb0d1ef5e2 Allow the USRP audio format to be used natively by the FM networking. 2021-03-14 12:16:39 +00:00
Jonathan Naylor
7c14a6ec40 Merge branch 'master' into M17_AX25_FM 2021-03-13 12:03:22 +00:00
Jonathan Naylor
69c9500cb1
Merge pull request #687 from jg1uaa/oled 
delete unused variable
 2021-03-13 11:57:27 +00:00
SASANO Takayoshi
c2be5ab2f7 delete unused variable 2021-03-13 12:27:23 +09:00
Jonathan Naylor
f1de23e568 Merge branch 'master' into M17_AX25_FM 2021-03-12 19:56:57 +00:00
Jonathan Naylor
125f21735b Move the host lookup for the DMR Direct Network. 2021-03-12 19:56:05 +00:00
Jonathan Naylor
5111d16b99
Merge pull request #685 from jg1uaa/oled 
revise UserDB display setting on OLED
 2021-03-12 19:46:35 +00:00
SASANO Takayoshi
51e74c6182 revise UserDB display setting on OLED 
To display UserDB on OLED, either Slot1=0/Slot2=1 or Slot1=1/Slot2=0
of [DMR Network] in MMDVM.ini was required.

Other displays such as LCDproc, HD44180 and TFTSurenoo uses duplex value of
[General], OLED also uses same entry from now.
 2021-03-10 21:09:58 +09:00
Jonathan Naylor
6f2bd43c53 Merge branch 'master' into M17_AX25_FM 2021-03-09 20:59:38 +00:00
Jonathan Naylor
79fc7623dc DMR networking code cleanup. 2021-03-09 20:59:04 +00:00
Jonathan Naylor
39e89584e1 Akter the FM Network data standard. 2021-03-07 19:25:21 +00:00
Jonathan Naylor
46b8ea56d3 Merge branch 'master' into M17_AX25_FM 2021-03-07 17:51:06 +00:00
Jonathan Naylor
5d8d1a3fb9 Add mode 4 (force off) for the DMR OVCM flag. 2021-03-07 17:42:55 +00:00
Jonathan Naylor
5537ebbb65
Merge pull request #684 from randybuildsthings/patch-1 
Ref #683: Fix misaligned talker alias pointer
 2021-03-07 17:08:08 +00:00
Randy Hall
c6f5a21a27
Proposed fix for #683 
Adding 2 byte offset to the data pointer passed to CDMRTA::add() in the "RF" section of CDMRSlot.cpp::writeModem(). Fixes the bug that incorrectly decodes talker alias coming in over RF.
 2021-03-07 07:27:34 -08:00
Jonathan Naylor
5c292f77e5 Put example modem IP parameters into the MMDVM.ini file. 2021-02-19 17:42:58 +00:00
Jonathan Naylor
fe3be93a2e Small UDP modem update. 2021-02-18 22:56:20 +00:00
Jonathan Naylor
e291096d22 Final modem refactoring. 2021-02-17 21:36:47 +00:00
Jonathan Naylor
279afb75f3 Finish off the UDP Controller and more clean-ups. 2021-02-17 19:35:28 +00:00
Jonathan Naylor
8ace65b86d More sane modem port protocol handling. 2021-02-16 22:34:25 +00:00
Jonathan Naylor
ff9712b36a Refactored some class names. 2021-02-16 20:05:03 +00:00
Jonathan Naylor
6344f8b9ef Merge branch 'master' into M17_AX25_FM 2021-01-02 12:56:27 +00:00
Jonathan Naylor
b64359a157
Merge pull request #675 from timclassic/enhance-dstar-frame-logging 
Add frame content details to D-Star debug logging
 2021-01-02 12:55:44 +00:00
Tim Stewart
0e6208cc67 Add frame content details to D-Star debug logging 
Commit bf5651b deleted all log entries related to D-Star frame
contents.  This change adds some detail to the existing D-Star frame
debugging log entries.  Rather than always printing "audio", frames
may be logged as one of "audio", "nullaudio", or "fastdata".

A minimum width has been set for some fields so that the log messages
form columns while watching a data stream.

By virtue of centralizing the frame log messages, this commit also
adds debugging entries for frames originating from the network.

Example log entries that contain all three types as generated by a
Kenwood TH-D74 using fast data:

  M: 2021-01-01 19:52:44.255 D-Star, received RF header from KG4BXH  /D74  to CQCQCQ
  D: 2021-01-01 19:52:44.282 D-Star, RF nullaudio sequence no.  0
  D: 2021-01-01 19:52:44.282 D-Star, RF nullaudio sequence no.  1
  D: 2021-01-01 19:52:44.309 D-Star, RF nullaudio sequence no.  2
  D: 2021-01-01 19:52:44.332 D-Star, RF nullaudio sequence no.  3
  D: 2021-01-01 19:52:44.354 D-Star, RF nullaudio sequence no.  4
  D: 2021-01-01 19:52:44.365 D-Star, RF nullaudio sequence no.  5
  D: 2021-01-01 19:52:44.388 D-Star, RF nullaudio sequence no.  6
  D: 2021-01-01 19:52:44.404 D-Star, RF nullaudio sequence no.  7
  D: 2021-01-01 19:52:44.426 D-Star, RF nullaudio sequence no.  8
  D: 2021-01-01 19:52:44.443 D-Star, RF nullaudio sequence no.  9
  D: 2021-01-01 19:52:44.465 D-Star, RF nullaudio sequence no. 10
  D: 2021-01-01 19:52:44.488 D-Star, RF nullaudio sequence no. 11
  D: 2021-01-01 19:52:44.510 D-Star, RF nullaudio sequence no. 12
  D: 2021-01-01 19:52:44.526 D-Star, RF nullaudio sequence no. 13
  D: 2021-01-01 19:52:44.543 D-Star, RF nullaudio sequence no. 14
  D: 2021-01-01 19:52:44.565 D-Star, RF nullaudio sequence no. 15
  D: 2021-01-01 19:52:44.588 D-Star, RF nullaudio sequence no. 16
  D: 2021-01-01 19:52:44.604 D-Star, RF nullaudio sequence no. 17
  D: 2021-01-01 19:52:44.627 D-Star, RF nullaudio sequence no. 18
  D: 2021-01-01 19:52:44.649 D-Star, RF nullaudio sequence no. 19
  D: 2021-01-01 19:52:44.665 D-Star, RF nullaudio sequence no. 20
  D: 2021-01-01 19:52:44.704 D-Star, RF fastdata  sequence no.  0
  D: 2021-01-01 19:52:44.704 D-Star, RF fastdata  sequence no.  1
  D: 2021-01-01 19:52:44.726 D-Star, RF fastdata  sequence no.  2
  D: 2021-01-01 19:52:44.748 D-Star, RF fastdata  sequence no.  3
  D: 2021-01-01 19:52:44.765 D-Star, RF fastdata  sequence no.  4
   ... many fastdata frames elided ...
  D: 2021-01-01 19:52:45.486 D-Star, RF fastdata  sequence no. 19
  D: 2021-01-01 19:52:45.508 D-Star, RF fastdata  sequence no. 20
  D: 2021-01-01 19:52:45.548 D-Star, RF fastdata  sequence no.  0
  D: 2021-01-01 19:52:45.548 D-Star, RF fastdata  sequence no.  1
  D: 2021-01-01 19:52:45.565 D-Star, RF fastdata  sequence no.  2
  D: 2021-01-01 19:52:45.587 D-Star, RF audio     sequence no.  3, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.609 D-Star, RF audio     sequence no.  4, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.631 D-Star, RF audio     sequence no.  5, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.648 D-Star, RF audio     sequence no.  6, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.670 D-Star, RF audio     sequence no.  7, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.687 D-Star, RF audio     sequence no.  8, errs:  0/48 (  0.0%)
  D: 2021-01-01 19:52:45.709 D-Star, RF fastdata  sequence no.  9
  D: 2021-01-01 19:52:45.731 D-Star, RF fastdata  sequence no. 10
  D: 2021-01-01 19:52:45.753 D-Star, RF fastdata  sequence no. 11
  D: 2021-01-01 19:52:45.775 D-Star, RF fastdata  sequence no. 12
  D: 2021-01-01 19:52:45.786 D-Star, RF fastdata  sequence no. 13
   ... many more fastdata frames with periodic audio as above ...
 2021-01-01 17:55:48 -05:00
Jonathan Naylor
e761e9c083 Merge branch 'master' into M17_AX25_FM 2021-01-01 14:45:08 +00:00
Jonathan Naylor
a209c00479 Allow DMR/P25 and NXDN Id reload with a SIGUSR1 or via a remote command. 2021-01-01 13:54:03 +00:00
Jonathan Naylor
d07782696c Merge branch 'master' into M17_AX25_FM 2021-01-01 13:20:25 +00:00
Jonathan Naylor
4ec33c86a7
Merge pull request #674 from s-s-s/patch-2 
New format of DMRIds.dat file
 2021-01-01 12:32:51 +00:00
Sergei
397b10131f
New format of DMRIds.dat file 
Generate new format of DMRIds.dat file
 2020-12-29 12:41:06 +03:00
Jonathan Naylor
9d85b6451c Update the M17 sync words. 2020-12-26 12:12:52 +00:00
Jonathan Naylor
1c3f6ae75e Merge branch 'master' into M17_AX25_FM 2020-12-26 12:01:32 +00:00
Jonathan Naylor
28f2203f5a
Merge pull request #673 from SA7BNT/master 
Update DMRIDUpdate.sh
 2020-12-26 12:00:30 +00:00
SA7BNT
75a6a67c17
Update DMRIDUpdate.sh 
Change DB adress
 2020-12-26 02:13:01 +01:00
Jonathan Naylor
37c298c885 Merge branch 'master' into M17_AX25_FM 2020-12-16 13:06:50 +00:00
Jonathan Naylor
02141f55ff
Merge pull request #669 from jg1uaa/master 
revise POCSAG layout for decoded ROT1 message
 2020-12-16 13:02:04 +00:00
SASANO Takayoshi
d76d4b063c revise POCSAG layout for decoded ROT1 message 
POCSAGControl.cpp has ROT1 decoder now and it sends
(rublic index) "message" format.

To display whole message, parse text to fit OLED.

- rublic index is after RIC
- discard leading/trailing double quote character
 2020-12-16 20:39:00 +09:00