Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2781 commits 33 branches 0 tags 24 MiB
Commit graph

272 commits

Author SHA1 Message Date
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 c40291dcc2 Merge remote-tracking branch 'upstream/master' into ipv6 2020-07-04 18:48:13 +09:00
SASANO Takayoshi 1ded19c5b2 permit inline comment (2) 
To implement this feature, using strtok() is not enough.

This cannot handle this case:

	Key=#value#comment

it will be #value is the contents of Key. And,

	Key=value 	#comment
	(there is a space and a tab between value and #comment)

this will be value<space><tab>. Sometimes these trailing spaces and
tabs makes thing wrong.

Whether in-line comment is used or not, delete trailing space/tab after
value.
 2020-07-04 17:58:00 +09: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 ba1b6a8751 Merge branch 'AX25' into AX25_FM 2020-07-02 16:38:53 +01:00
Jonathan Naylor 8c52246be8 Merge branch 'master' into AX25 2020-07-02 13:21:18 +01:00
SASANO Takayoshi 15a8e87c3e permit inline comment and ScreenLayout of Nextion 
two minor improvements

- ScreenLayout in Nextion section can use hexadecimal (0xXXXXX),
  octal (0XXXX) and decimal value
- in-line comment enabled

	example:
	# conventional comment, the line starts with #
	[Section]
	Key=value # this is new style comment
	Key="quoted value # this is not comment"
	Key="quoted value" # this is prohibited (not comment)
 2020-07-02 18:47:33 +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 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
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
SASANO Takayoshi 816f8ea0a1 Merge remote-tracking branch 'origin' into ipv6 2020-06-12 20:24:17 +09:00
Jonathan Naylor dbe04c3c2f Initial code for AX.25 support. 2020-06-08 16:33:20 +01:00
Jonathan Naylor 924baeacd1 More work on integrating the Kenwood NXDN protocol. 2020-05-27 12:07: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 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 29b36a66f8 Use more conventional handling of FM mode timing. 2020-05-11 12:59:28 +01:00
Jonathan Naylor 7ae77a01a9 Add the data packing and unpacking code. 2020-05-08 13:12:37 +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 1a142e36cb Host support for the CallsignAtLatch option. 2020-05-04 22:30:16 +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 ac344cec69 Allow for a global callsign. 2020-04-24 15:37:26 +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
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 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
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 c381f2ceac Convert the callsign and ack to upper case. 2020-04-10 13:52:49 +01:00
Jonathan Naylor 535ddba1a0 Beginnings of FM support. 2020-04-09 22:02:47 +01: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
Jonathan Naylor b38ba239a8 Merge branch 'master' into dmr_beacons 2019-11-13 08:41:11 +00:00
Patrick Maier 6caffb2bc0 Separate the config if OVCM should be supported in sending and receiving direction 2019-11-09 17:22:39 +01:00
Jonathan Naylor bc5a1d24c4 Make the default for OVCM to be off. 2019-11-05 15:49:00 +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
sp5lg bd5117b9e4 Introducing LogoScreensaver=1 or 0 parameter for blanking OLED diplays in idle 2019-09-27 22:28:57 +02:00
GuusvanDooren 6d83bfb8bc QSO info removed from OLED. QSO info add via CASTInfo. 2019-05-10 20:44:01 +02:00
Jonathan Naylor 72fe13780f Remove the old System Fusion SQL config option and processing. 2019-02-12 11:29:05 +00:00
Jonathan Naylor 42a48209d4 Add remote control interface. 2019-01-07 11:03:37 +00:00
Jonathan Naylor e847711d17 Add MobileGPS support for DMR. 2018-11-06 12:14:57 +00:00
Jonathan Naylor 4bf15438d5 Integrate the new messages into the OLED display driver. 2018-10-31 16:54:57 +00:00
Michael Eckhoff f3c8f73ad9 Add Support for OLED Rotate 2018-10-30 09:30:41 -05:00
Jonathan Naylor 17a158e804 More cleanups of the new lock file. 2018-10-11 12:14:47 +01:00
Jonathan Naylor edaf37101a Add MMDVM lock file based on an idea by DB1OFH. 2018-10-10 20:05:24 +01:00
phl0 ecc97aaab7
Minor code beauty 2018-09-14 23:15:50 +02: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
KD4Z ca35121b44 Add more dynamic variables and fix command manging 
Add variables for TX Freq (t30), RX Freq (t32), CPU Temp (t20), and
Location (t31) to Base MMDVM page.   These variables are available with
Layout ON7LDS L3 or higher.  This allows more dynamic info to be
displayed without having to use the optional NextionDriver.  Note, this
doesn't add touch support. For that, use the NextionDriver.
Fixed command mangling occuring during serial writes to Nextion due to
no ready-state monitoring of display readiness.   Added simple thread
sleep to pace the commands as they are sent.  Allows the display a
chance to process the command before another one is blasted in.
Prevents mangling of commands sent before display is ready to accept
them.   Hardwired to 10 msec--let's see if that's enough.
Added setting in mmdvm conf file, Section: [Nextion]  Setting:
DisplayTempInFahrenheit   Value= 0 (default) for C.  1=Fahrenheit  This
controls the value sent to t20.
 2018-09-05 16:12:12 -04: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
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
Andy CA6JAU 7bf82085c2 Fix DMR jitter default var value 2018-07-03 13:28:54 -04: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
Jonathan Naylor a50854d67a Make DGID an alias of DSQ for YSF. 2018-03-29 07:50:57 +01: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 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
Jonathan Naylor 0e804b7390 Merge branch 'master' into nxdn 2018-02-08 18:31:05 +00:00
Jonathan Naylor e82a6d8bb7 Bring DMR into line by default with the other modes. 2018-02-08 18:30:16 +00:00
Stefan Saraev a2b5804ff4 [dmr] make jitterbuffer disabled by default 2018-02-07 21:27:58 +02: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 5a494b5536 Merge branch 'master' into nxdn 2018-01-29 23:09:21 +00:00
Jonathan Naylor b694f85461 Remove quotes from config values if found. 2018-01-29 23:08:48 +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 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 daa42e266a Make 1 the default NXDN RAN. 2018-01-11 21:59:31 +00:00