Skip to content

Fix * displaying instead of @ #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfsmp3 merged 1 commit into from
Mar 18, 2016
Merged

Fix * displaying instead of @ #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/lib_ccx/telxcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ typedef struct {
uint64_t show_timestamp; // show at timestamp (in ms)
uint64_t hide_timestamp; // hide at timestamp (in ms)
uint16_t text[25][40]; // 25 lines x 40 cols (1 screen/page) of wide chars
uint8_t g2_char_present[25][40]; // 0- Supplementary G2 character set NOT used at this position 1-Supplementary G2 character set NOT used at this position
uint8_t g2_char_present[25][40]; // 0- Supplementary G2 character set NOT used at this position 1-Supplementary G2 character set used at this position
uint8_t tainted; // 1 = text variable contains any data
} teletext_page_t;

Expand Down Expand Up @@ -1081,6 +1081,18 @@ void process_telx_packet(struct TeletextCtx *ctx, data_unit_t data_unit_id, tele
}
}

// ETS 300 706 v1.2.1, chapter 12.3.4, Table 29: G0 character without diacritical mark (display '@' instead of '*')
if ((mode == 0x10) && (row_address_group == NO))
{
x26_col = address;
if (data == 64) // check for @ symbol
{
remap_g0_charset(0);
ctx->page_buffer.text[x26_row][x26_col] = 0x40;
}

}

// ETS 300 706, chapter 12.3.1, table 27: G0 character with diacritical mark
if ((mode >= 0x11) && (mode <= 0x1f) && (row_address_group == NO))
{
Expand Down