Jonathan Naylor
37c298c885
Merge branch 'master' into M17_AX25_FM
2020-12-16 13:06:50 +00:00
Jonathan Naylor
02141f55ff
Merge pull request #669 from jg1uaa/master
...
revise POCSAG layout for decoded ROT1 message
2020-12-16 13:02:04 +00:00
SASANO Takayoshi
d76d4b063c
revise POCSAG layout for decoded ROT1 message
...
POCSAGControl.cpp has ROT1 decoder now and it sends
(rublic index) "message" format.
To display whole message, parse text to fit OLED.
- rublic index is after RIC
- discard leading/trailing double quote character
2020-12-16 20:39:00 +09:00
Jonathan Naylor
e086b70526
Merge branch 'M17_AX25_FM' of https://github.com/g4klx/MMDVMHost into M17_AX25_FM
2020-12-15 16:30:39 +00:00
Jonathan Naylor
d77e2a00ce
Restore the branch
2020-12-15 16:21:07 +00:00
Jonathan Naylor
ffc369c3a5
Revert "Merge branch 'M17_AX25_FM'"
...
This reverts commit e1427e3e37
, reversing
changes made to bcdba292eb
.
2020-12-15 16:02:59 +00:00
Jonathan Naylor
a95389242b
Revert "Revert "Merge branch 'M17_AX25_FM'""
...
This reverts commit 135fd04e0d
.
2020-12-15 16:02:11 +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
e1427e3e37
Merge branch 'M17_AX25_FM'
2020-12-15 15:50:45 +00:00
Jonathan Naylor
bcdba292eb
Display the rubric of the encrypted messages.
2020-12-15 14:27:47 +00:00
Jonathan Naylor
2ad4a2abfc
Merge branch 'master' into M17_AX25_FM
2020-12-15 10:20:12 +00:00
Jonathan Naylor
b22d9084c8
Add more POCSAG display information.
2020-12-15 10:19:37 +00:00
Jonathan Naylor
9811bb7d4d
Merge branch 'master' into M17_AX25_FM
2020-12-14 12:49:36 +00:00
Jonathan Naylor
a027b1f3bd
Display the decrypted text on the external displays.
2020-12-14 12:48:56 +00:00
Jonathan Naylor
f5449ffc83
Merge branch 'master' into M17_AX25_FM
2020-12-14 12:23:42 +00:00
Jonathan Naylor
77daf86723
Decode encrypted POCSAG messages (thanks to JG1UAA for the code).
2020-12-14 12:22:43 +00:00
Jonathan Naylor
99a4d37082
Merge branch 'master' into M17_AX25_FM
2020-12-14 10:14:53 +00:00
Jonathan Naylor
56f361b3e4
Bump the version date.
2020-12-14 10:05:12 +00:00
Jonathan Naylor
4897313fc0
Merge pull request #667 from timclassic/dstar-fast-data-again
...
Detect D-Star DV Fast Data on a per-frame basis
2020-12-14 09:59:39 +00:00
Tim Stewart
bf5651b7a0
Remove DV Fast Data debugging statements
2020-12-13 19:27:38 -05:00
Tim Stewart
b2844bc0a6
Avoid FEC regeneration and DTMF blanking for null AMBE data
...
FEC recalculation always reports errors for null AMBE frames, and
there is no DTMF present by definition.
In practice, null AMBE data is often (always?) sent by the Kenwood
TH-D74 in the first 21 voice frames, and I've also seen it at the end
of a fast data transmission.
2020-12-13 19:25:09 -05:00
Jonathan Naylor
0a7df1758b
Merge branch 'master' into M17_AX25_FM
2020-12-13 15:10:35 +00:00
Jonathan Naylor
787393e4c2
Merge pull request #666 from jg1uaa/oled-userdb
...
adjust message layout to display whole POCSAG message
2020-12-13 10:41:02 +00:00
SASANO Takayoshi
9dbe634f08
adjust message layout to display whole POCSAG message
2020-12-13 16:39:23 +09: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
38f6292e71
Merge branch 'master' into M17_AX25_FM
2020-12-08 16:43:06 +00:00
Jonathan Naylor
99a4257d12
Fixed the configuration message prefix.
2020-12-08 16:42:15 +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
Tim Stewart
efe9b3d459
Process FEC and DTMF on Voice frames followed by Sync frame
...
Rather than skipping FEC recalculation and DTMF blanking on Voice
frames that do not have a corresponding mini-header (i.e. Voice frames
followed by a Sync frame), set aside the frame's data. The data is
processed and submitted to the modem/network during the next
iteration, once the presence of DV Fast Data can be determined.
2020-11-29 16:26:32 -05:00
Tim Stewart
8874d1262b
Detect DV Fast Data on a per-frame basis
...
This commit adds a maybeFixupVoiceFrame() function that is used by
both the RF and Net code to manage FEC regeneration and DTMF blanking
in voice frames.
The presence of Fast Data is discovered by reading the mini-header in
every second data frame. If found, FEC regeneration and DTMF blanking
are disabled for the current and next voice frames.
An exception is voice frames that have a sync frame instead of a data
frame. This commit always disables FEC regeneration and DTMF blanking
for these frames. A later commit will add support for these frames by
setting aside the voice frame until the next data frame can be read.
This commit also includes a number of debugging statements that will
be removed in a later commit.
2020-11-29 16:12:58 -05:00
Tim Stewart
8656aaedaa
Add back desired changes that were reverted
2020-11-27 18:36:39 -05:00
Tim Stewart
1fd1a4f6d1
Revert "First attempt at detecting D-Star data frames, Kenwood and Icom."
...
This reverts commit 3362e29b62
.
2020-11-27 18:01:02 -05:00
Tim Stewart
7aabb96351
Revert "Fix a bug and add a second Icom D-Star fast data mode identifier."
...
This reverts commit 18398efe97
.
2020-11-27 17:51:22 -05:00
Tim Stewart
821db7910a
Revert "Regenerate the data mode markers."
...
This reverts commit 54fbacb487
.
2020-11-27 17:51:06 -05:00
Tim Stewart
4f0f0fea66
Revert "Don't insert silence on lost D-Star fast data."
...
This reverts commit 1bd814a079
.
2020-11-27 17:50:47 -05:00
Tim Stewart
b8ae0febb0
Revert "New way to detect D-Star fast data mode."
...
This reverts commit a9b7179d13
.
2020-11-27 17:47:51 -05:00
Tim Stewart
2d2b736c54
Revert "Don't forget to descramble the byte first."
...
This reverts commit 16bf9d5745
.
2020-11-27 17:47:24 -05:00
Tim Stewart
449ca905ee
Revert "Place the scrambled null data regeneration into the right place."
...
This reverts commit 59cb07329d
.
2020-11-27 17:47:04 -05:00
Tim Stewart
fcad5ee0d2
Revert "Only test the slow data type in the correct place."
...
This reverts commit ff0082b18b
.
2020-11-27 17:46:19 -05:00
Tim Stewart
bbbfbbbfad
Revert "Simplify the D-Star sequence number processing."
...
This reverts commit 99d4a9bc51
.
2020-11-27 17:45:19 -05:00
Tim Stewart
7ea37fc5e9
Revert "Fix the silence insertion for D-Star."
...
This reverts commit 9cc2bfaaec
.
2020-11-27 17:44:33 -05:00
Tim Stewart
c94f4f5d4a
Revert "Check the guard byte on fast data as well as the mini header."
...
This reverts commit 317bda0177
.
2020-11-27 17:14:31 -05:00
Tim Stewart
a87449bf51
Revert "Loosen fast data admission criteria."
...
This reverts commit 6d719353c6
.
2020-11-27 17:14:10 -05:00
Tim Stewart
59b8b5d623
Revert "Remove redundant code."
...
This reverts commit f88c9826a7
.
2020-11-27 17:13:57 -05:00
Tim Stewart
da92771afa
Revert "Remove more redundant code."
...
This reverts commit c3c5fe1a5a
.
2020-11-27 17:13:37 -05:00
Jonathan Naylor
ef9fedcc01
Fix the logging messages for late entry.
2020-11-26 14:25:45 +00:00
Jonathan Naylor
ec80e9553a
Fully implement the latest M17 specification.
2020-11-26 13:47:47 +00:00
Jonathan Naylor
67b93d6310
Partial work supporting the latest M17 specification.
2020-11-26 11:30:16 +00:00