Commit graph

414 commits

Author SHA1 Message Date
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
Shawn Chain 2f9595949a Change ovcm config to int value 2019-11-16 23:06:26 +08:00
Jonathan Naylor aa7ae2371c
Merge pull request #533 from maierp/maier_p_ovcm_rx
Config setting for sending OVCM to network (RX)
2019-11-15 11:58:02 +00:00
Patrick Maier 7cdbbdecb0 fix missing changes of ovcmRX in MMDVMHost.cpp 2019-11-09 20:50:03 +01:00
Jonathan Naylor f4f745d58c Fix variable scope bug. 2019-11-05 12:44:56 +00:00
Jonathan Naylor 98e0869257 Re-introduce optional network DMR beacons. 2019-11-05 08:42:21 +00:00
Jonathan Naylor 6bababeb96 Add OVCM support. 2019-10-11 18:24:25 +01:00
sp5lg bb0bd4bb46 DStar SelfOnly with WhiteList (beautyfied) 2019-10-06 16:29:57 +02:00
sp5lg ed79a7176a DStar SelfOnly with WhiteList 2019-10-06 16:15:25 +02:00
Christopher Hewitt 839a8c83ea Increase data buffer size to avoid buffer overflow for P25. 2019-09-03 15:22:24 -04:00
Jonathan Naylor 72fe13780f Remove the old System Fusion SQL config option and processing. 2019-02-12 11:29:05 +00:00
Jonathan Naylor fe2a01e1b1 Fix DMR beacon bug spotted by Shawnchain. 2019-01-26 12:56:24 +00:00
phl0 79805f0fa8
Fix typo 2019-01-23 10:09:34 +01:00
Jonathan Naylor 9b2352c877 Beginnings of allowing for local POCSAG message transmissions. 2019-01-22 21:33:49 +00:00
Jonathan Naylor ec986d97ee Fixed silly bug. 2019-01-22 14:56:15 +00:00
Jonathan Naylor b2050e673b Allow for optional fixed modes. Inspired by Adrian VK4TUX. 2019-01-22 14:38:38 +00:00
Jonathan Naylor b57d42327a Make the remote command handler more flexible and add an optional
timeout to the new mode.
2019-01-22 13:40:02 +00:00
Jonathan Naylor 8ae8894d6f Remove the concept of fixed modes. 2019-01-21 08:42:32 +00:00
Jonathan Naylor 393b53f8a1 Enable the modes in Idle mode and when enabled (obviously). 2019-01-19 21:28:58 +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 b16aaa653c Add the concept of fixed modes. 2019-01-18 15:57:05 +00:00
Jonathan Naylor 76badb28f1 Add more intelligence to the remote control. 2019-01-15 21:45:29 +00:00
Jonathan Naylor 455755328a Fix silly bug in remote control. 2019-01-11 13:02:33 +00:00
Jonathan Naylor 8366868382 Fix compile issue. 2019-01-10 21:50:57 +00:00
Jonathan Naylor e52d0e619f Move POCSAG to match the other modes. 2019-01-10 14:03:23 +00:00
Jonathan Naylor 335b56f4bd Add busy lockout to remote mode handling. 2019-01-10 09:05:15 +00:00
Jonathan Naylor 8aa2f00c1b Fixes for Windows. 2019-01-09 19:47:59 +00:00
Jonathan Naylor b43a354343 Expand range of commands. 2019-01-07 13:54:52 +00:00
Jonathan Naylor 42a48209d4 Add remote control interface. 2019-01-07 11:03:37 +00:00
Shawn Chain fba77bb95e Add NullModem support 2018-12-07 17:36:11 +08:00
Jonathan Naylor e847711d17 Add MobileGPS support for DMR. 2018-11-06 12:14:57 +00:00
Jonathan Naylor d2e0d82d56 Fix and clean up the new lock file code. 2018-10-11 07:50:30 +01:00
Jonathan Naylor edaf37101a Add MMDVM lock file based on an idea by DB1OFH. 2018-10-10 20:05:24 +01:00
Luca Marchesano f978a91519
Add select ack message dstar
AckMessage = 0 set BER status
AckMessage = 1 set RSSI status
2018-09-14 12:30:48 +02:00
root 574343c439 Process data from display to MMDVMHost (serial pass-through & transparent data)
also taking into account the sendFrameType parameter
Do not control Nextion backlight when active brightness is zero
2018-09-13 20:35:12 +02:00
root 64e3ae6d30 Better way to send to display that MMDVMHost is quitting 2018-08-15 18:17:42 +02:00
root 86fb3b6944 New option SendFrameType so one can send transparent data also to the modem serial port.
If set, one then has to specify the frame type (0x80 for modem serial of 0x90 for transparent data) as first byte af the message.
2018-08-13 20:39:16 +02:00
Shawn Chain 464d0fdc6f Move display creation from main class to static CDisplay::create() 2018-07-31 11:36:37 +08:00
Shawn Chain d715470b1c Extract I2C logic from SerialController to separate class 2018-07-30 21:58:35 +08:00
Jonathan Naylor f4718ebb9c Fix Windows compile error. 2018-07-26 18:43:57 +01:00
Andy CA6JAU e97006d7c9 Fix stderr messages in daemon mode 2018-07-24 00:29:05 -04:00
Jonathan Naylor 03682b000a Clean up the I2C code. 2018-07-19 18:42:23 +01:00
Hootie81 40db88d5f8 modified: Conf.cpp
modified:   Conf.h
	modified:   MMDVMHost.cpp
	modified:   Modem.cpp
	modified:   Modem.h
	modified:   SerialController.cpp
	modified:   SerialController.h
2018-07-19 13:09:00 +00:00
Jonathan Naylor d49c679b46 Merge branch 'master' into pocsag 2018-07-04 19:01:24 +01:00
Jonathan Naylor bb9db2ce93 Clean up the merged code. 2018-07-04 19:00:51 +01:00
Shawn Chain 1ab0610543 patch stdlib header 2018-07-03 10:04:44 +08:00
Shawn Chain 0ee26a5a98 patch to keep root permision for openwrt 2018-07-03 10:01:19 +08:00
Jonathan Naylor 93917ef9b4 Add a timer to refresh the DAPNET Gateways status every 30 seconds. 2018-06-28 07:08:04 +01:00
Jonathan Naylor 5cf86578fc Merge branch 'master' into pocsag 2018-06-18 18:18:36 +01:00
Jonathan Naylor 34ceb912c9 Move log initialisation. 2018-06-18 18:18:09 +01:00
Jonathan Naylor 413a44e088 Add the POCSAG frequency to the modem protocol (for hotspots). 2018-06-12 19:40:49 +01:00
Jonathan Naylor 2a0364a6d4 nitial commit of POCSAG files. 2018-06-07 18:46:03 +01:00
Jonathan Naylor 31beeee604 Add the YSF TX hang parameter. 2018-05-21 21:32:33 +01:00
KD4Z e790ea3f71 OLED Display - missing ref
forgot to include the hook to pass the slot enables down into the driver
2018-04-09 12:53:57 -04:00
Jonathan Naylor 48300c0aa8 Merge branch 'master' into icom 2018-03-22 07:14:09 +00:00
Jonathan Naylor 52ec2f205c Add modem transparent modem data mode. Not used on the MMDVM currently. 2018-03-22 07:13:13 +00:00
Jonathan Naylor 98a31e8d20 Allow more control over NXDN networking. 2018-03-12 20:55:53 +00:00
Jonathan Naylor 12cfaec1f6 Align the networking with NXCore. 2018-03-01 20:28:43 +00:00
Jonathan Naylor d17ca9b4ba Begin handling Icom format network frames. Work in progress. 2018-02-15 20:20:07 +00:00
Jonathan Naylor 635a774c83 Merge branch 'master' into nxdn 2018-02-08 20:50:18 +00:00
Jonathan Naylor e6ed2e17a1 Roll back the jitter buffer changes. 2018-02-08 20:25:03 +00:00
Andy CA6JAU c83b01df45 Enabling NXDN network receiving 2018-02-07 21:19:51 -03:00
Jonathan Naylor 3858cf4aec Merge branch 'master' into nxdn 2018-02-01 06:59:46 +00:00
Jonathan Naylor 43fdb770a9 Make the jitter buffer switchable. 2018-02-01 06:59:11 +00:00
Jonathan Naylor 5291a6427c Add more NXDN support files. 2018-01-17 21:21:25 +00:00
Jonathan Naylor 8fa4779ca9 Merge branch 'master' into nxdn 2018-01-16 20:14:57 +00:00
Jonathan Naylor e0a5ae7fb3 Add the NXDN LICH processing. 2018-01-16 20:10:35 +00:00
Jonathan Naylor 323179d525 Add more DMR beacon parameters. 2018-01-16 18:35:29 +00:00
Jonathan Naylor 10b0d3c14c Merge branch 'master' into nxdn 2018-01-15 21:12:56 +00:00
Jonathan Naylor 712cfc89c6 Add basic NXDN networking. 2018-01-15 21:03:34 +00:00
Jonathan Naylor d3395278c6 Add locally timed DMR roaming beacons. 2018-01-15 19:22:01 +00:00
Jonathan Naylor b2586654a2 Initial commit of NXDN scaffolding. 2018-01-11 19:35:33 +00:00
Jonathan Naylor 526e2c436d Add the jitter buffer for DMR. 2018-01-10 19:05:59 +00:00
Jonathan Naylor d83c17dccc
Merge pull request #364 from on7lds/dev
New Nextion Display Layouts
2018-01-08 18:27:40 +00:00
Andy CA6JAU 1805a98f72 RF power level control for MMDVM_HS compatible devices 2017-12-30 12:05:11 -03:00
ON7LDS 59c4ce47f0 New Nextion display layouts (3 and 4) which let you do all layout processing in the display itsself. 2017-12-05 20:50:56 +01:00
Jonathan Naylor 71bd38f9e9 Revert "Revert "Simplify the logic by removing the ring buffer.""
This reverts commit d4d26fc05f.
2017-11-28 10:19:13 +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 e1800c0fe0 Full integration of the jitter buffer into DMR. 2017-11-23 13:18:37 +00:00
Jonathan Naylor ce891019d3 Basic jitter buffer for DMR, unfinished work. 2017-11-23 11:54:45 +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
phl0 ecb4ea1a38
Rename config file values (acc. to #ee93e4ce) 2017-11-09 23:17:25 +01:00
Jonathan Naylor 85e90610d7 Add remote gateway modes to D-Star and P25. 2017-11-09 09:21:22 +00:00
Jonathan Naylor 066e5f0270 Add the optional RX DC Offset parameter. 2017-10-28 12:37:32 +01:00
Jonathan Naylor 31828da9d2 Allow for per mode RF and Network mode hang times. 2017-09-01 09:25:54 +01:00
Jonathan Naylor 9a7828566d Add an optional transmi DC offset value. 2017-08-20 12:07:57 +01:00
Jonathan Naylor fda4049928 Move the Id into the General section. 2017-08-19 16:23:37 +01:00
Jonathan Naylor 23ce9c7b46 Merge branch 'YSFRefactor' 2017-08-19 12:12:05 +01:00
Jonathan Naylor cf0c70087d Add SelfOnly to P25 based on the DMR Id. 2017-08-15 10:30:05 +01:00
Jonathan Naylor 8b2544ba85 Add SelfOnly to YSF. 2017-08-15 10:11:05 +01:00
Jonathan Naylor 3749b8d9f4 Add configurable scrolling to the OLED display. 2017-08-13 10:57:02 +01:00
Jonathan Naylor 8d9cfb0f46 Add YSF DSQ support. 2017-08-13 10:30:02 +01:00
Jonathan Naylor 194b543b32 Merge pull request #313 from phl0/makeAckTimeAdjustable
Make AckTime adjustable
2017-06-16 08:27:18 +01:00
g0wfv 5e91c1159f Add Tx and Rx frequency offsets
Enables specification of independant Tx and Rx offsets in Hz for Tx and Rx frequencies on DVMega and MMDVM_HS hardware.

Tx and Rx frequencies no longer have to be offset for frequency errors in ADF7021 devices and dashboards (BM/DMR+) will now display intended frequencies.
2017-06-14 16:46:00 +01:00
phl0 f0fc7c7ec9
Make AckTime adjustable 2017-06-14 12:54:44 +02:00
Jonathan Naylor 043ffe96d9 Make the D-Star ack optional. 2017-06-10 13:18:18 +01:00
g0wfv bd3d3d68ab Correct grammar in a couple of error messages!
You wouldn't believe English is my first language sometimes!
2017-06-08 11:44:01 +01:00
g0wfv d51ba994c9 Add SIGINT handling and alter termination signal logging 2017-06-08 10:19:28 +01:00
Jonathan Naylor c1521ee445 Allow the MMDVM levels to be specified as floating point values. 2017-06-02 16:34:55 +01:00
phl0 ef05fcb62b
Re-add log notification about root privileges 2017-05-04 10:37:45 +02:00
phl0 aeff127015
Restore accidentially? deleted line (See Issue #298) 2017-05-03 23:39:11 +02:00
Jonathan Naylor e9e8745aa7 Cleaning up indenting. 2017-05-03 14:53:48 +01:00
Jonathan Naylor 9ac4919a4c Move modem tracing to Trace and add a new modem Debug function. 2017-04-14 14:05:30 +01:00
Jonathan Naylor 0fe100b01c Fix some indentation. 2017-04-11 19:26:44 +01:00
Jonathan Naylor 99d57bf102 Allow for optional seperate (and longer) CW Ids. 2017-04-10 17:55:53 +01:00