Commit graph

2596 commits

Author SHA1 Message Date
Geoffrey Merck
5703758116 Merge remote-tracking branch 'upstream/AX25_FM' into AX25_FM 2020-07-27 11:58:54 +02:00
Jonathan Naylor
15c21de416 Fix complilation on Linux. 2020-07-27 10:58:32 +01:00
Jonathan Naylor
da077c73f8 Allow the FM network sample rate to be specified. 2020-07-27 10:38:07 +01:00
Geoffrey Merck
801ba04e0d Correct typo 2020-07-20 09:08:58 +02:00
Geoffrey Merck
fa7be67d9c Add install service to othe rmakefiles 2020-07-20 08:36:22 +02:00
Geoffrey Merck
49a4e2ad0d fix typo in executable path 2020-07-20 08:13:27 +02:00
Geoffrey Merck
bb1a542fe1 delete unit file on uninstall 2020-07-20 08:06:29 +02:00
Geoffrey Merck
ba9c97289f add install targets 2020-07-18 18:07:21 +02:00
Geoffrey Merck
76033dd301 Add systemd unit 2020-07-18 18:07:10 +02:00
Geoffrey Merck
87b7a7c48a Moved existing scripts to pi-star folder 2020-07-18 17:36:54 +02:00
Jonathan Naylor
c80894ddaa Fix the configuration source file. 2020-07-15 12:31:48 +01:00
Jonathan Naylor
9c4d2f46bb Merge branch 'master' into AX25_FM 2020-07-15 12:15:07 +01:00
Jonathan Naylor
34db212360
Merge pull request #617 from jg1uaa/ipv6
IPv6: catch up current source
2020-07-14 14:15:16 +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
Jonathan Naylor
e9a128ebdc
Merge pull request #618 from F4FXL/AX25_FM
Fix FM buffer underrun
2020-07-06 19:01:58 +01:00
Geoffrey Merck
009f50a913 Write FM_EOT as uint 2020-07-06 19:52:16 +02:00
Geoffrey Merck
4d6f64a51e Write FM control length as integer, since we always read it as int 2020-07-06 19:44:55 +02:00
Geoffrey Merck
b8f0525dcb Merge branch 'AX25_FM' of https://github.com/F4FXL/MMDVMHost into AX25_FM 2020-07-06 19:15:55 +02:00
Geoffrey Merck
40a974d7cb Revert "Fix buffer underrun in FM"
This reverts commit 192e8e2435.
2020-07-06 19:14:12 +02:00
Geoffrey Merck
41dc96affe Fix buffer underrun in FM 2020-07-06 19:14:12 +02:00
Jonathan Naylor
954231ccbc Bump the version date. 2020-07-06 10:22:00 +01:00
Jonathan Naylor
3cc77c5c57 Fix bug in bug. 2020-07-06 10:20:40 +01:00
Jonathan Naylor
f42f6f07c4 Fix bug. 2020-07-06 10:16:06 +01:00
Geoffrey Merck
183430593f Revert "Fix buffer underrun in FM"
This reverts commit 192e8e2435.
2020-07-04 14:21:11 +02:00
Geoffrey Merck
192e8e2435 Fix buffer underrun in FM 2020-07-04 13:04:24 +02:00
SASANO Takayoshi
c40291dcc2 Merge remote-tracking branch 'upstream/master' into ipv6 2020-07-04 18:48:13 +09:00
Jonathan Naylor
16fac0b41c
Merge pull request #616 from jg1uaa/master
permit inline comment (2)
2020-07-04 10:45:25 +01: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
9137399ea9 NXDNKenwoodNetwork: IPv6 support 2020-07-03 06:56:36 +09:00
SASANO Takayoshi
8a0db8cb8b NXDNIcomNetwork: IPv6 support 2020-07-03 04:40:41 +09:00
SASANO Takayoshi
6de0bdb536 add match_addr()
match() compares IP address and port
match_addr() compares IP address only
2020-07-03 04:35:22 +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
Jonathan Naylor
5dcdfd8159
Merge pull request #615 from jg1uaa/master
permit inline comment and hex-value to ScreenLayout of Nextion
2020-07-02 13:20:20 +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
SASANO Takayoshi
c8e31ce657 Merge remote-tracking branch 'upstream/master' 2020-07-02 18:23:10 +09:00
SASANO Takayoshi
4217ccebc4 remove getLocalAddress()
It was used for NXDNKenwoodNetwork.cpp to creates SSRC.
currently SSRC uses random value, this function is no longer used.
2020-07-02 06:59:51 +09:00
Jonathan Naylor
ee2e997cfd
Merge pull request #613 from jg1uaa/master
replace rand() -> MT19937 random number generator
2020-07-01 22:55:27 +01:00
SASANO Takayoshi
dfaedb450b replace rand() -> MT19937 random number generator
sometimes rand() makes problem so replace it to MT19937 in C++11 <random>.
2020-07-02 06:40:26 +09:00
Jonathan Naylor
2bc6dd6ca9 Merge branch 'AX25' into AX25_FM 2020-07-01 13:40:35 +01:00
Jonathan Naylor
fb6fb70ffb Merge branch 'master' into AX25 2020-07-01 13:40:15 +01:00
Jonathan Naylor
4dd39696b4 Remove unused UDPSocket code. 2020-07-01 13:38:23 +01:00
Jonathan Naylor
4d3869172d Merge branch 'AX25' into AX25_FM 2020-07-01 13:17:44 +01:00
Jonathan Naylor
e106df3cdf Merge branch 'master' into AX25 2020-07-01 13:17:22 +01:00
Jonathan Naylor
8edfc62049
Merge pull request #612 from jg1uaa/master
m_ssrc use random value
2020-07-01 13:16:52 +01:00
SASANO Takayoshi
0892aaaaae eliminate SSRC range 0x00000001 - 0xfffffffe 2020-07-01 20:39:22 +09:00
SASANO Takayoshi
79b3eaa57a replace SSRC source from IPv4 address to random number
Previous implementation uses SSRC as IPv4 address that is same behaviour
of Kenwood's NXDN repeater.

RFC 3350 RTP protocol recommends SSRC uses random number.
So I use MT19937 random number generator instead of IP address.

And if this is no problem, I will do two changes.

- replace rand() in DMRNetwork.cpp and DStarNetwork.cpp to MT19937
- remove getLocalAddress() in UDPSocket.cpp
2020-07-01 19:48:07 +09:00
Jonathan Naylor
d2be920254 Add AX25 SlotTime and P-Persist parameters. 2020-07-01 10:59:46 +01:00