Commit graph

487 commits

Author SHA1 Message Date
Jonathan Naylor c2bd065b2d Remove the file based logging, only go via MQTT from now on. 2023-06-29 11:03:06 +01:00
Jonathan Naylor 3c48b8f61b Add support for passthrough of serial data from MQTT to the spare serial port on an MMDVM modem/hotspot. 2023-06-20 16:33:33 +01:00
Jonathan Naylor 1afe34f514 Use MQTT for the remote command handling. 2023-06-20 15:27:56 +01:00
Jonathan Naylor 0615a4218d Add MQTT subscriptions for display and remote commands. 2023-06-19 17:16:14 +01:00
Jonathan Naylor ff004211b9 Rename MQTTPublisher to MQTTConnection. 2023-06-19 14:57:30 +01:00
Jonathan Naylor d01520bea1 Remove all of the display processing from the code. 2023-06-16 17:18:43 +01:00
Jonathan Naylor f5e82b6019 Merge branch 'mqtt' into mqtt_plus 2023-06-16 15:45:17 +01:00
Jonathan Naylor da147031c9 Add host startup and closedown messages to JSON/MQTT. 2023-06-07 12:27:44 +01:00
Jonathan Naylor 2ac5b1bcfe Merge branch 'master' into mqtt 2023-06-07 11:38:23 +01:00
Jonathan Naylor 9085112b4d Add extra logging when starting and stopping the MMDVM. 2023-06-07 11:28:41 +01:00
Jonathan Naylor e10454c2d5 Fix the signal handling. 2023-06-06 19:41:17 +01:00
Jonathan Naylor 391e382a7b Remove the direct network access to DMR Masters. 2023-06-05 17:30:39 +01:00
Jonathan Naylor 17c194c466 Add P25 to JSON/MQTT. 2023-01-17 15:11:40 +00:00
Jonathan Naylor b7761a4e8a Add MMDVM status JSON messages. 2023-01-15 16:18:31 +00:00
Jonathan Naylor f216ee4e04 Merge branch 'master' into mqtt 2023-01-04 16:29:00 +00:00
Chipster adb67ff698 Suppress DMR Roaming Beacon debug messages in simplex mode; refinement to PR #753 merge. 2022-12-05 08:38:57 -06:00
Chipster 14fcbd9c1a Enable Debug Log Messages when DMR Roaming Beacons are being sent. 2022-11-30 08:51:06 -06:00
Jonathan Naylor 2f761603bc Filter the log data sent to MQTT based on the MQTTLevel setting. 2022-11-29 18:04:03 +00:00
Jonathan Naylor 53b73c6558 Clean up the MQTT interface. 2022-11-29 17:18:34 +00:00
Jonathan Naylor 96364136d9 Publish the log data via MQTT topics $NAME/log/$LEVEL. 2022-11-27 20:27:44 +00:00
Max Lapan 55ba1233a8 Page alert commands 2022-11-26 11:04:01 +01:00
Max Lapan 8f5ff4ca05 Add command page_bcd to send bcd message with pocsag 2022-11-25 20:58:26 +01:00
Max Lapan f3fb072238 Sending test bcd message after every page command - need this for testing 2022-11-25 17:52:45 +01:00
Daniel Caujolle-Bert a30ae3af4d Add new remote command:
- hosts: display connected hosts, or NONE if disconnected (surrounded with double quotes).
Increase buffer size, for reply string, from 100 to 1024.
2022-01-21 10:51:41 +00:00
Daniel Caujolle-Bert 20b1367848 Add M17 network status to Remote command "status" output.
YSFNetwork: fix ::IsConnected(), it should not take m_enabled in account.
2022-01-07 11:47:19 +00:00
Jonathan Naylor cb89b34a39 Rename SimpleMode to LinkMode. 2021-09-06 21:47:23 +01:00
Jonathan Naylor ded46ebb60 Add a new simple FM mode for gatewaying. 2021-09-05 19:07:50 +01:00
Jonathan Naylor 4ec4b3dafe Update the copyright header. 2021-08-17 12:15:54 +01:00
Jonathan Naylor e344fc5b56 Alter the mode timer reset behaviour when already in that mode. 2021-06-18 08:56:29 +01:00
Jonathan Naylor 5727acceb8 Restore the FM lockout parameter. 2021-05-25 20:33:28 +01:00
Jonathan Naylor 0448a315e9 Merge branch 'M17_AX25_FM' of https://github.com/g4klx/MMDVMHost into M17_AX25_FM 2021-05-25 19:05:01 +01:00
Jonathan Naylor 347fc4bedb Add an FM lockout to add to the other modes. 2021-05-25 19:04:09 +01:00
Jonathan Naylor 8d6da34b79 Fix M17 and FM mode switching. 2021-05-18 20:24:26 +01:00
Jonathan Naylor 8363a72f6a Merge branch 'master' into M17_AX25_FM 2021-05-18 20:05:40 +01:00
Geoffrey f5e3427cd8 Add SMeter to DStar ack and error 2021-05-15 06:51:12 +02:00
Jonathan Naylor c0e3fd0a5b Remove unneeded warning message. 2021-05-08 19:57:28 +01:00
Jonathan Naylor e6fc679502 Add modem capabilities to stop misconfiguration. 2021-05-08 19:34:44 +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
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 cfe9e0fba4 Remove the FM networking sample rate conversion. 2021-04-11 19:15:23 +01:00
Jonathan Naylor e6d5ef9055 Merge branch 'master' into M17_AX25_FM 2021-04-08 18:44:51 +01:00
Jonathan Naylor dad34bea98 Don't send RPTCL on DMR under error conditions. 2021-04-08 18:36:27 +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 69a4fdd23c Merge branch 'master' into M17_AX25_FM 2021-03-22 22:14:54 +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 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 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 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 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 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 18c8b95829 Convert M17 to use the new M17 Gateway. 2020-11-01 16:07:36 +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 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