Commit graph

2196 commits

Author SHA1 Message Date
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 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 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
SASANO Takayoshi 974251485d Merge remote-tracking branch 'upstream/master' 2020-06-30 19:41:27 +09:00
Jonathan Naylor e339de8fee Merge branch 'master' into AX25 2020-06-30 11:40:55 +01:00
SASANO Takayoshi 236d467c1a change ScreenLayout definition for Nextion
to add new feature easily, the definition of ScreenLayout in [Nextion]
has changed like this.

ScreenLayout < 8: compatibile setting for old config file

	0: G4KLX @ 9600bps
	1: (reserved)
	2: ON7LDS @ 9600bps
	3: ON7LDS-DIY @ 9600bps
	4: ON7LDS-DIY @ 115200bps

ScreenLayout >= 8: new world, set the bit to enable each feature

	bit3 (8)	use 115200bps
	bit4 (16)	Display DMR Talker Alias
	bit5 (32)	Colour change when displaying TA
	bit6 (64)	Font size change when displaying long TA text
	bit7 (128)	Display DIY status when MMDVM IDLE

old settings are same as:

	0 -> 0
	2 -> 112 (16+32+64)
	3 -> 144 (16+128)
	4 -> 152 (8+16+128)
2020-06-30 19:40:34 +09:00
Jonathan Naylor df47466aa2 Use USE_GPSD instead of USE_GPS. 2020-06-30 11:38:25 +01:00
Jonathan Naylor be8c29da3e Fix Windows compilation. 2020-06-29 11:50:33 +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 1c6a48a8e1 Merge branch 'master' into AX25 2020-06-25 09:56:31 +01:00
Jonathan Naylor 1dc91b9a64 Add the install target to the other makefiles. 2020-06-25 09:55:28 +01:00
Jonathan Naylor 28d64e7c3d Merge branch 'master' into AX25 2020-06-25 09:44:55 +01:00
Jonathan Naylor c174c10caf
Merge pull request #604 from jcyfkimi/master
Add install rule into Makefile
2020-06-25 09:35:24 +01:00
Jonathan Naylor 96a8ec0e35 Change the maximum packet length. 2020-06-24 13:22:55 +01:00
Jonathan Naylor d8716adc43 Change the free space handling for AX25. 2020-06-24 11:18:12 +01:00
Kimi Jin 325b30d30b Add install rules into Makefile. This will insatll MMDVMHost and RemoteCommand to /usr/local/bin/ path, so need exec with command 'sudo make install'. 2020-06-24 13:33:23 +08:00
jcyfkimi e8c21493c1
Merge pull request #1 from g4klx/master
Update to newest version
2020-06-24 13:28:59 +08:00
Jonathan Naylor 92ceba052a Add AX.25 transmit functionality to the modem handler. 2020-06-21 21:16:31 +01:00
Jonathan Naylor c026471aec Start the AX.25 transmit path development. 2020-06-21 18:53:38 +01:00
Jonathan Naylor 27c9ad43ec Add KISS receive. 2020-06-21 17:22:27 +01:00
Jonathan Naylor 38f59236ae Add the KISS encoding. 2020-06-21 14:28:40 +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 d0878bbf7e Add new AX.25 parameters. 2020-06-20 20:06:48 +01:00
Jonathan Naylor e0f800ba98 Handle the new larger frame type. 2020-06-19 15:09:21 +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 50888777e6
Merge pull request #602 from AndyTaylorTweet/master
Update OLED.cpp
2020-06-15 18:13:23 +01:00
Andy Taylor 3313fe8ec3
Update OLED.cpp
Modify the OLED code to only allow scroll commands when scrolling is enabled
2020-06-15 17:00:37 +01:00
Jonathan Naylor 7c95e231e2
Merge pull request #601 from jg1uaa/master
change ScreenLayout definition for Nextion
2020-06-14 08:30:26 +01:00
SASANO Takayoshi 36a852b38b change ScreenLayout definition for Nextion
to add new feature easily, the definition of ScreenLayout in [Nextion]
has changed like this.

ScreenLayout < 8: compatibile setting for old config file

	0: G4KLX @ 9600bps
	1: (reserved)
	2: ON7LDS @ 9600bps
	3: ON7LDS-DIY @ 9600bps
	4: ON7LDS-DIY @ 115200bps

ScreenLayout >= 8: new world, set the bit to enable each feature

	bit3 (8)	use 115200bps
	bit4 (16)	Display DMR Talker Alias
	bit5 (32)	Colour change when displaying TA
	bit6 (64)	Font size change when displaying long TA text
	bit7 (128)	Display DIY status when MMDVM IDLE

old settings are same as:

	0 -> 0
	2 -> 112 (16+32+64)
	3 -> 144 (16+128)
	4 -> 152 (8+16+128)
2020-06-14 16:00:20 +09:00
Jonathan Naylor 1ab09e21fe Merge branch 'master' into Kenwood 2020-06-13 17:48:03 +01: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 4c7a2526e5 Merge branch 'master' into Kenwood 2020-05-28 11:50:44 +01:00
Jonathan Naylor 7bfe2f2b2f Fix Linux compile. 2020-05-27 12:52:15 +01:00
Jonathan Naylor 0b7efee2a7 Upgrade the Kenwood protocol to pass data calls. 2020-05-27 12:47:21 +01:00
Jonathan Naylor 924baeacd1 More work on integrating the Kenwood NXDN protocol. 2020-05-27 12:07:21 +01:00