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
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
Jonathan Naylor
d0fa27bfd1
Merge pull request #610 from F4FXL/AX25_FM
...
Fix KISS
2020-06-30 22:23:56 +01:00
Geoffrey Merck
5f0ee739e1
Use correct file
2020-06-30 23:19:26 +02:00
Geoffrey Merck
4ae141f594
Fix KISS
2020-06-30 23:11:00 +02:00
Geoffrey Merck
22427cd348
Merge remote-tracking branch 'upstream/AX25_FM' into AX25_FM
2020-06-30 20:57:50 +02:00
Jonathan Naylor
aa8b78a311
Refactor the Modem class hierarchy.
2020-06-30 12:35:03 +01:00
Jonathan Naylor
14413963d9
Merge branch 'AX25' into AX25_FM
2020-06-30 11:45:58 +01: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
8383c7d320
Clean up the Makefiles.
2020-06-29 12:11:01 +01:00
Jonathan Naylor
5dbf916db0
Fix Windows compilation.
2020-06-29 11:53:54 +01:00
Jonathan Naylor
be8c29da3e
Fix Windows compilation.
2020-06-29 11:50:33 +01:00
Jonathan Naylor
4ee32a506f
Fix the NullModem.
2020-06-29 11:46:30 +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
fab4dc227e
Fix NullModem.h
2020-06-28 15:41:41 +01:00
Jonathan Naylor
30098a5d38
Fix SerialController being used by PseudoTTYController.
2020-06-28 15:23:56 +01:00
Geoffrey Merck
d4c7f20696
Fix assertion in PseudoTTY
2020-06-28 11:22:54 +02:00
Jonathan Naylor
93a0b9793b
Update the other Makefiles.
2020-06-27 23:01:00 +01:00
Jonathan Naylor
648426f44c
Allow Windows compilation.
2020-06-27 22:58:37 +01:00
Jonathan Naylor
97f1ebb25f
Convert TXTwist to TXDelay.
2020-06-27 22:47:54 +01:00
Jonathan Naylor
d1a809808b
Rationalise the pseudo tty handling.
2020-06-27 22:33:24 +01:00
Jonathan Naylor
bdb1c49bae
Merge pull request #608 from F4FXL/AX25_FM
...
Make pty work
2020-06-26 20:25:06 +01:00