w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-09 17:32:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk:

Browse Source 
------------------------------------------------------------------------
r8006 | k1jt | 2017-08-05 14:35:10 +0100 (Sat, 05 Aug 2017) | 1 line

Minor edits to docs: TNX to IW3RAB!
------------------------------------------------------------------------
r8008 | k1jt | 2017-08-05 14:45:16 +0100 (Sat, 05 Aug 2017) | 1 line

Minor tweak to a table size in User Guide.
------------------------------------------------------------------------
r8009 | k9an | 2017-08-06 18:14:04 +0100 (Sun, 06 Aug 2017) | 1 line

Edits to end-of-line notations table in docs.
------------------------------------------------------------------------
r8010 | bsomervi | 2017-08-06 22:51:29 +0100 (Sun, 06 Aug 2017) | 1 line

Don't let the Fortran/C/C++ interop test fail silently
------------------------------------------------------------------------



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@8011 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-08-06 21:54:14 +00:00
parent 4a416175d2
commit d687d42918
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -972,7 +972,7 @@ endif (NOT APPLE)
# #
include (FortranCInterface) include (FortranCInterface)
FortranCInterface_VERIFY (CXX QUIET) FortranCInterface_VERIFY (CXX)
FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_" FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_"
SYMBOLS SYMBOLS
grayline grayline

11
doc/user_guide/en/decoder_notes.adoc
View File

@ -40,7 +40,7 @@ successful decode used MyCall as hypothetically known information.
[[AP_INFO_TABLE]] [[AP_INFO_TABLE]]
.AP information types .AP information types
[width="25%",cols="h10,<m20",frame=topbot,options="header"] [width="35%",cols="h10,<m20",frame=topbot,options="header"]
|=============================================== |===============================================
|P | Message components |P | Message components
|1 | CQ &#160; &#160; ? &#160; &#160; ? |1 | CQ &#160; &#160; ? &#160; &#160; ?
@ -67,24 +67,27 @@ summarized in the following Table:
[width="50%",cols="h,3*^",frame=topbot,options="header"] [width="50%",cols="h,3*^",frame=topbot,options="header"]
|=========================================== |===========================================
|Mode |Mode character|Sync character|End of line information |Mode |Mode character|Sync character|End of line information
|FT8 | ~ | | aP |FT8 | ~ | | ? &#160; aP
|JT4 | $ | *, # | f, fN, dNC |JT4 | $ | *, # | f, fN, dNC
|JT9 | @ | | |JT9 | @ | |
|JT65 | # | | |JT65 | # | |
|JT65 VHF| # | *, # | f, fN, dNC |JT65 VHF| # | *, # | f, fN, dNC
|QRA64 | : | * | R |QRA64 | : | * | R
|ISCAT | | * | M N C T |ISCAT | | * | M N C T
|MSK144 | & | | N |MSK144 | & | | N H E
|=========================================== |===========================================
Sync character:: Sync character::
`*` - Normal sync + `*` - Normal sync +
`#` - Alternate sync `#` - Alternate sync
End of line information:: End of line information::
`a` - Decoded with aid of some a priori (AP) information `?` - Decoded with lower confidence +
`a` - Decoded with aid of some a priori (AP) information +
`C` - Confidence indicator [ISCAT and Deep Search; (0-9,*)] + `C` - Confidence indicator [ISCAT and Deep Search; (0-9,*)] +
`d` - Deep Search algorithm + `d` - Deep Search algorithm +
`E` - Size of MSK eye diagram opening - if negative, the eye is closed +
`f` - Franke-Taylor or Fano algorithm + `f` - Franke-Taylor or Fano algorithm +
`H` - Number of bit errors corrected +
`M` - Message length (characters) + `M` - Message length (characters) +
`N` - Number of Rx intervals or frames averaged + `N` - Number of Rx intervals or frames averaged +
`P` - Number indicating type of AP information (Table 1, above) + `P` - Number indicating type of AP information (Table 1, above) +