Commit graph

2677 commits

Author SHA1 Message Date
Jonathan Naylor
40a1dec98e Merge branch 'M17_AX25_FM' into I2C 2021-04-25 11:11:19 +01:00
Jonathan Naylor
7008c624d9 Regularise the local address handling across all of the protocol. 2021-04-25 11:10:35 +01:00
Jonathan Naylor
8b45e04ea0 Merge branch 'master' into M17_AX25_FM 2021-04-25 10:26:57 +01:00
Jonathan Naylor
db1eef6b0e
Merge pull request #696 from f1rmb/f1rmb_network_port_datatype
Fix network ports datatype (unsigned int -> unsigned short). UDPSocket: fix old bug using m_port instead of m_port[x].
2021-04-25 09:36:41 +01:00
Daniel Caujolle-Bert
ec0bc51899
Fix network ports datatype (unsigned int -> unsigned short). UDPSocket: fix old bug using m_port instead of m_port[x]. 2021-04-25 07:47:06 +02:00
Jonathan Naylor
609f1e356a Add the USDP metadata header to the FM network output. 2021-04-24 08:43:48 +01:00
Jonathan Naylor
5659e91960 Merge branch 'M17_AX25_FM' into I2C 2021-04-20 22:37:53 +01:00
Jonathan Naylor
82b5b010eb Add an end of transmission marker to the USRP protocol. 2021-04-20 22:37:17 +01:00
Jonathan Naylor
f2a84a844e Merge branch 'M17_AX25_FM' into I2C 2021-04-11 19:16:33 +01:00
Jonathan Naylor
cfe9e0fba4 Remove the FM networking sample rate conversion. 2021-04-11 19:15:23 +01:00
Jonathan Naylor
9fcdd3bf1f Merge branch 'M17_AX25_FM' into I2C 2021-04-11 17:45:58 +01:00
Jonathan Naylor
a5ee4284f2 Add new modem debug message type. 2021-04-11 17:45:23 +01:00
Jonathan Naylor
d67e0e006e Merge branch 'M17_AX25_FM' into I2C 2021-04-11 17:32:07 +01:00
Jonathan Naylor
3a73a25c1e Update M17 to the latest secification, removal of the CRC from the
stream data.
2021-04-11 17:31:05 +01:00
Jonathan Naylor
e6e7425982 Merge branch 'M17_AX25_FM' into I2C 2021-04-08 19:03:10 +01:00
Jonathan Naylor
e6d5ef9055 Merge branch 'master' into M17_AX25_FM 2021-04-08 18:44:51 +01:00
Jonathan Naylor
b30d5465f5 Merge branch 'master' of https://github.com/g4klx/MMDVMHost 2021-04-08 18:36:59 +01:00
Jonathan Naylor
dad34bea98 Don't send RPTCL on DMR under error conditions. 2021-04-08 18:36:27 +01:00
Jonathan Naylor
6ae01af364
Merge pull request #692 from f1rmb/f1rmb_fix_UDPSocket_close
Fix nasty bug in UDPSocket::close().
2021-04-08 18:14:27 +01:00
Jonathan Naylor
ffb4bdb042 Refactor the Golay 24,12,8 code and its uses. 2021-04-07 19:56:28 +01:00
Daniel Caujolle-Bert
c08b41a17a
Fix nasty bug in UDPSocket::close(). 2021-03-31 13:34:31 +02:00
Jonathan Naylor
8dc54ed21f Ignore M17 packet data, for now. 2021-03-29 19:36:55 +01:00
Jonathan Naylor
389bd3b928 Remove the CRC4 processing. 2021-03-28 15:29:26 +01:00
Jonathan Naylor
6ac672e106 Finally process the Golay(24,12,8) parity bit. 2021-03-27 20:00:53 +00:00
Jonathan Naylor
4422444179 Disable the LICH CRC and clean up the payload checksum handling. 2021-03-27 14:51:53 +00:00
Jonathan Naylor
8efd77132f Rename the CRC4 functions correctly. 2021-03-26 22:45:33 +00:00
Jonathan Naylor
0a94b0deb6 Add the LICH CRC. 2021-03-26 22:21:20 +00:00
Jonathan Naylor
242cf50240 Remove the CAN processing from the LICH. 2021-03-26 20:34:08 +00:00
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