Commit graph

225 commits

Author SHA1 Message Date
Jonathan Naylor 8b45e04ea0 Merge branch 'master' into M17_AX25_FM 2021-04-25 10:26:57 +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 cfe9e0fba4 Remove the FM networking sample rate conversion. 2021-04-11 19:15:23 +01:00
Jonathan Naylor dbf771d80c Fixed M17 to be compatible with the latest protocol speciication. 2021-03-25 21:07:44 +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 8ace65b86d More sane modem port protocol handling. 2021-02-16 22:34:25 +00:00
Jonathan Naylor d77e2a00ce Restore the branch 2020-12-15 16:21:07 +00:00
Jonathan Naylor 135fd04e0d Revert "Merge branch 'M17_AX25_FM'"
This reverts commit e1427e3e37, reversing
changes made to bcdba292eb.
2020-12-15 15:52:27 +00:00
Jonathan Naylor fcf45d3e4b Merge branch 'master' into M17_AX25_FM 2020-12-09 09:47:49 +00:00
Jonathan Naylor 6e05225522 Reinstate the full RPTC command. 2020-12-09 09:41:11 +00:00
Jonathan Naylor ef6056506c Merge branch 'master' into M17_AX25_FM 2020-12-06 16:46:10 +00:00
Jonathan Naylor 136deac61a Allow optional direct connections to masters again. 2020-12-06 16:12:54 +00:00
Jonathan Naylor 67b93d6310 Partial work supporting the latest M17 specification. 2020-11-26 11:30:16 +00:00
Jonathan Naylor f89145b772 Remove support for the UMP (sob). 2020-11-10 09:58:10 +00:00
Jonathan Naylor a57397e274 Merge branch 'AX25_FM' into M17_AX25_FM 2020-11-06 15:43:12 +00:00
Jonathan Naylor 06ba457da2 Merge branch 'SimpleDMR' into AX25_FM 2020-10-31 21:45:48 +00:00
Jonathan Naylor 9559cdb060 Merge branch 'SimpleDMR' into M17 2020-10-31 21:41:45 +00:00
Jonathan Naylor a0d60b894d Add optional log file rotation and UDP socket reopening. 2020-10-31 21:35:09 +00:00
Jonathan Naylor cd5624c2fb Merge branch 'SimpleDMR' into M17 2020-10-30 13:58:32 +00:00
Jonathan Naylor 098cc74c9e Merge branch 'SimpleDMR' into AX25_FM 2020-10-30 13:57:58 +00:00
Jonathan Naylor bbe44df3e9 Merge branch 'master' into SimpleDMR 2020-10-30 13:47:25 +00:00
Jonathan Naylor 99cdcf1f50
Merge pull request #522 from sp5lg/master
DStar SelfOnly with WhiteList
2020-10-30 13:44:54 +00:00
Jonathan Naylor 61afb194c5 Revert "Merge pull request #648 from xfxian/logrotate"
This reverts commit 9932394840, reversing
changes made to cfc313e5b9.
2020-10-30 13:34:13 +00:00
Jacob Schramm 7a5bbda248 Changing RotateLogs to TimestampLogs 2020-10-29 22:45:57 +01:00
Jacob Schramm 53ae146667 Introducing RotateLog configuration option that allows disabling timestamps on the logfiles. 2020-10-29 00:08:04 +01:00
Jonathan Naylor 31002c2757 Allow encrypted M17 data to be rejected. 2020-10-26 10:10:31 +00:00
Jonathan Naylor 8536294b76 Initial work on the M17 protocol. 2020-10-14 16:16:54 +01:00
Jonathan Naylor 2502ee94d7 Merge branch 'SimpleDMR' into AX25_FM 2020-09-03 12:10:01 +01:00
Jonathan Naylor 3de54f6dd8 Merge branch 'ipv6' into SimpleDMR 2020-09-03 11:43:42 +01:00
Jonathan Naylor 2349520964 Remove the location information from the new config message. 2020-08-27 10:13:02 +01:00
Jonathan Naylor 98879b5c14 Reinstated the location field. 2020-08-26 12:13:34 +01:00
Jonathan Naylor 66a17f4849 Simplify the Host to DMR Gateway protocol. 2020-08-26 09:29:11 +01:00
Jonathan Naylor 11c8403829 Merge branch 'master' into AX25_FM 2020-08-04 10:04:47 +01:00
msraya 52ca12e88a Update files to remove DG-ID and mantain consistency in code 2020-08-03 19:48:25 +01:00
Jonathan Naylor 0579b4387a Add the noise squelch configuration items. 2020-07-28 14:22:26 +01:00
Jonathan Naylor da077c73f8 Allow the FM network sample rate to be specified. 2020-07-27 10:38:07 +01:00
Jonathan Naylor 9c4d2f46bb Merge branch 'master' into AX25_FM 2020-07-15 12:15:07 +01:00
Jonathan Naylor 3e6d5d5a7f Add UseCOSAsLockout and FM Access Mode parameters. 2020-07-13 16:02:04 +01:00
Jonathan Naylor 1e833d78cf Remove KerchunkTX. 2020-07-07 17:54:46 +01:00
SASANO Takayoshi 74adbd4895 Merge remote-tracking branch 'upstream/master' into ipv6
simply merged upstream code.

following files are conflicted, all fixed
GPSD.h, MobileGPS.cpp, NXDNNetwork.cpp, NXDNNetwork.h, UDPSocket.h

NXDNIcomNetwork and NXDNKenwoodNetwork is still original code,
not support IPv6-UDPSocket yet.
2020-07-03 04:17:14 +09:00
Jonathan Naylor d2be920254 Add AX25 SlotTime and P-Persist parameters. 2020-07-01 10:59:46 +01:00
Jonathan Naylor 8291470698 Merge branch 'AX25' into AX25_FM 2020-06-29 11:44:14 +01:00
Jonathan Naylor 35a283d7b4 Merge branch 'master' into AX25 2020-06-29 11:26:17 +01:00
Jonathan Naylor edce667018 Replace MobileGPS with gpsd. 2020-06-29 11:25:10 +01:00
Jonathan Naylor 97f1ebb25f Convert TXTwist to TXDelay. 2020-06-27 22:47:54 +01:00
Jonathan Naylor e164538b09 Fix compilation bugs. 2020-06-25 21:23:43 +01:00
Jonathan Naylor 2953ce85a0 Merge branch 'FM_Ext' into AX25_FM 2020-06-25 13:41:19 +01:00
Jonathan Naylor 692d6519db Add the AX.25 modem parameters and start reworking the AX,25 RX
processing.
2020-06-21 14:15:37 +01:00
Jonathan Naylor fe77cbd68c Add the extra AX.25 parameters. 2020-06-20 21:28:39 +01:00