Commit graph

419 commits

Author SHA1 Message Date
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 48f95be982 Mostly complete processing of RF frames. 2020-10-17 21:59:27 +01:00
Jonathan Naylor 9a72e95ec0 Clean compile(-ish), still more to do. 2020-10-17 16:47:19 +01:00
Jonathan Naylor 8536294b76 Initial work on the M17 protocol. 2020-10-14 16:16:54 +01:00
Jonathan Naylor 6d313fce51 Merge branch 'SimpleDMR' into AX25_FM 2020-09-20 21:32:11 +01:00
Jonathan Naylor 5eabb93078 Fix Windows execution. 2020-09-20 21:31:32 +01:00
Jonathan Naylor 98b1e6478b Merge branch 'SimpleDMR' into AX25_FM 2020-09-06 14:27:55 +01:00
Jonathan Naylor 7d3e899104 Clean ups for IPv6. 2020-09-06 12:54:08 +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 aa8b78a311 Refactor the Modem class hierarchy. 2020-06-30 12:35:03 +01:00
Jonathan Naylor 14413963d9 Merge branch 'AX25' into AX25_FM 2020-06-30 11:45:58 +01:00
Jonathan Naylor e339de8fee Merge branch 'master' into AX25 2020-06-30 11:40:55 +01:00
Jonathan Naylor df47466aa2 Use USE_GPSD instead of USE_GPS. 2020-06-30 11:38:25 +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 2953ce85a0 Merge branch 'FM_Ext' into AX25_FM 2020-06-25 13:41:19 +01:00
Jonathan Naylor c026471aec Start the AX.25 transmit path development. 2020-06-21 18:53:38 +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
Jonathan Naylor f936a6c5b6 Add the Kerchunk TX parameter. 2020-06-20 20:44:02 +01:00
Jonathan Naylor d9e2940f08 Add AX.25 packet tracking. 2020-06-18 12:51:13 +01:00
Jonathan Naylor b3398710bc Merge branch 'master' into AX25 2020-06-17 15:48:20 +01:00
Jonathan Naylor 1ab09e21fe Merge branch 'master' into Kenwood 2020-06-13 17:48:03 +01:00
SASANO Takayoshi 816f8ea0a1 Merge remote-tracking branch 'origin' into ipv6 2020-06-12 20:24:17 +09:00
Jonathan Naylor d409700a31 X25 cleanups. 2020-06-09 14:32:05 +01:00
Jonathan Naylor dbe04c3c2f Initial code for AX.25 support. 2020-06-08 16:33:20 +01:00
Jonathan Naylor 933b9ef014 Fix crash with POCSAG and no network. 2020-06-08 14:34:29 +01:00
Jonathan Naylor 924baeacd1 More work on integrating the Kenwood NXDN protocol. 2020-05-27 12:07:21 +01:00
m0vse 26243c0247 Update RemoteCommand to disable/enable network modes 2020-05-25 20:29:49 +01:00
Jonathan Naylor 0b185a0900 Clean up the I2C controller code. 2020-05-23 16:49:21 +01:00
Jonathan Naylor 303a0163d3 Make the modem speed dynamic with a default of 115200. 2020-05-23 13:03:55 +01:00
Jonathan Naylor 4eb534aab6 Remove extraneous logging message. 2020-05-18 11:20:44 +01:00
Jonathan Naylor 9e52db3ef3 Merge branch 'FM' into FM_Ext 2020-05-13 12:06:35 +01:00
Jonathan Naylor dc5438e3aa Merge branch 'master' into FM 2020-05-13 12:06:16 +01:00
Jonathan Naylor 083cc1155b Merge branch 'master' into TXHang 2020-05-13 12:05:39 +01:00
Jonathan Naylor 8ac6a1b208 Merge branch 'FM' into FM_Ext 2020-05-12 16:24:42 +01:00
Jonathan Naylor ce121c59da Add the low CTCSS threshold value. 2020-05-12 13:43:43 +01:00
Jonathan Naylor 039ef44a63 Fix the setMode(MODE_FM) command. 2020-05-11 15:32:39 +01:00
Jonathan Naylor 29b36a66f8 Use more conventional handling of FM mode timing. 2020-05-11 12:59:28 +01:00
Jonathan Naylor ab437c0866 Merge branch 'FM' into FM_Ext 2020-05-09 12:48:08 +01:00
Jonathan Naylor 2ae966b7fb Fix for Windows compilation. 2020-05-09 12:47:26 +01:00
Jonathan Naylor 2a8e1ce9f4 Merge branch 'FM' into FM_Ext 2020-05-09 12:36:44 +01:00
Daniel Caujolle-Bert c3efabf56c
Redirect stderr messages to the log file, as in daemon mode assert() failure are silent and make wrong INI file hard to fix. 2020-05-09 12:11:08 +02:00
Jonathan Naylor 7ae77a01a9 Add the data packing and unpacking code. 2020-05-08 13:12:37 +01:00
Jonathan Naylor b3d287965f Create a dummy FM Control class. 2020-05-07 21:49:18 +01:00
Jonathan Naylor bc791577e7 Beginnings of FM networking. 2020-05-07 16:08:58 +01:00
Jonathan Naylor d6b367b8b5 Add the P25 and NXDN transmit hang timer settings. 2020-05-06 17:10:23 +01:00
Jonathan Naylor 5410ca3ce8 Add the COSInvert parameter. 2020-05-06 11:26:54 +01:00
Jonathan Naylor da0f1a6a76 Merge branch 'master' into FM 2020-05-05 20:53:40 +01:00
Andy Taylor ff492a518f
Update MMDVMHost.cpp 2020-05-05 19:30:56 +01:00
Andy Taylor dd2f5fbe26
Update MMDVMHost.cpp 2020-05-05 19:24:29 +01:00
Jonathan Naylor 1a142e36cb Host support for the CallsignAtLatch option. 2020-05-04 22:30:16 +01:00
m0vse 9796b400c8 Add enable/disable commands to RemoteCommand 2020-05-02 21:40:55 +01:00
Jonathan Naylor 4a923fb27e Rename RXBoost to RFAudioBoost. 2020-04-28 14:39:14 +01:00
Jonathan Naylor 56746e1320 Add the maximum deviation level. 2020-04-25 22:43:14 +01:00
Jonathan Naylor 3d1602e50e Add two more FM parameters. 2020-04-25 15:15:56 +01:00
Jonathan Naylor fbdee0edf1 Remove the FM RX level. 2020-04-24 12:59:33 +01:00
Jonathan Naylor 0d956b16fa Add a second callsign level setting. 2020-04-22 21:51:43 +01:00
Jonathan Naylor 93effcad3d Convert the CTCSS threshold to a raw value. 2020-04-20 13:21:56 +01:00
Geoffrey Merck 9acd523bc3 Fix Set FM params after creating modem, not before 2020-04-19 16:36:29 +02:00
Jonathan Naylor c359d874b5 Regularise the FM configuration. 2020-04-18 14:59:19 +01:00
Jonathan Naylor 11cd5679a7 Simplify the FM configuration. 2020-04-18 13:43:36 +01:00
Jonathan Naylor f8bce3823a Allow for a seperate FM timeout value. 2020-04-15 14:14:38 +01:00
Jonathan Naylor 960a60f382 Pass the net ack text to the modem. 2020-04-14 12:22:23 +01:00
Jonathan Naylor 1f17aec1f1 Add the minimum time for a 'K' parameter. 2020-04-13 15:53:18 +01:00
Jonathan Naylor 58aff1ab77 Split the RF and Network acks. 2020-04-13 13:36:16 +01:00
Jonathan Naylor 211e96a86d Convert to percentages. 2020-04-12 16:01:28 +01:00
Jonathan Naylor 927f31cdfa Move the levels to the overall MMDVM control message. 2020-04-12 15:10:51 +01:00
Jonathan Naylor dcdfca39d7 Add FM mode display. 2020-04-11 20:42:05 +01:00
SASANO Takayoshi 5df1fe551f add IPv6 support for RemoteControl
To specify IP(v4/v6) address for RemoteControl port,
add Address parameter in [RemoteControl] section to MMDVM.ini.

Different from other Address(es), the default IP address of RemoteControl
is 127.0.0.1 for security.
2020-04-11 13:12:19 +09:00
Jonathan Naylor 8cd75ce787 Add the FM repeater modem parameter writes. 2020-04-09 22:55:20 +01:00
Jonathan Naylor 535ddba1a0 Beginnings of FM support. 2020-04-09 22:02:47 +01:00
SASANO Takayoshi dad47317e6 set INADDR_ANY/IN6ADDR_ANY_INIT address string to m_socket
when CUDPSocket::open() is called with m_address (in CUDPSocket) is nothing,
IPv4 socket is created by "0.0.0.0" (INADDR_ANY) address.

This causes a problem that DMRGateway cannot connect to reflector on IPv6.
To choose default INADDR_ANY/IN6ADDR_ANY_INIT address, added
open(address_family) in UDPSocket.cpp.

Following code sets address string at construction, not modified.
	NXDNNetwork.cpp
	POCSAGNetwork.cpp
	YSFNetwork.cpp

Other codes does not set, modified open() -> open(address_family)
	DMRNetwork.cpp
	DStarNetwork.cpp
	MMDVMHost.cpp
	MobileGPS.cpp
	P25Network.cpp
	RemoteCommand.cpp
	RemoteControl.cpp

I think there is more clever method, but I have no other idea.

Maybe IPv6 support for digital radio works, but RemoteControl can work
IPv4 only.
2020-04-06 18:35:12 +09:00
SASANO Takayoshi c92039d83b modified for IPv6 supported CUDPSocket 2020-04-06 18:34:54 +09:00
Jonathan Naylor 4450caeddc Update the copyright date. 2020-02-16 15:56:31 +00:00
Shawn Chain 88d91e420a use enum DMR_OVCM_TYPES 2019-11-17 10:57:58 +08:00