Skip to content

Support for lowercase string constants #33

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

Open
miska wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for lowercase string constants #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454d97e
Support for lowercase input
miska Sep 29, 2011
fc192c2
Lowercase font support
miska Sep 29, 2011
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
13 changes: 11 additions & 2 deletions driver/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,18 @@ void display_char(u8 segment, u8 chr, u8 mode)

// Get bitmask for character from table
bitmask = segments_bitmask[segment];


#ifdef CONFIG_ALL_LETTERS
// Get bits from font set
if ((chr >= 0x30) && (chr <= 0x5A))
if ((chr >= 0x30) && (chr <= 0x7D))
#else
// Support lowercase input
if ((chr >= 0x61) && (chr <= 0x7A))
chr-=0x20;

// Get bits from font set
if ((chr >= 0x30) && (chr <= 0x5A))
#endif
{
// Use font set
bits = lcd_font[chr-0x30];
Expand Down
70 changes: 67 additions & 3 deletions driver/display1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,72 @@ const u8 lcd_font[] =
0 , // Displays " " (;)
SEG_A+ SEG_F+SEG_G, // Displays "<" as high c
SEG_D+ SEG_G, // Displays "="
0 , // Displays " " (>)
SEG_A+ SEG_F+SEG_G, // Displays ">"
SEG_A+SEG_B+ SEG_E+ SEG_G, // Displays "?"
0 , // Displays " " (@)
SEG_A+SEG_B+ SEG_D+SEG_E+SEG_F+SEG_G, // Displays "@"
#ifdef CONFIG_ALL_LETTERS
SEG_A+SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "A"
SEG_A+SEG_B+SEG_C+SEG_D+SEG_E+SEG_F+SEG_G, // Displays "B"
SEG_A+ SEG_D+SEG_E+SEG_F , // Displays "C"
SEG_A+SEG_B+SEG_C+SEG_D+SEG_E+SEG_F , // Displays "D" same as O
SEG_A+ +SEG_D+SEG_E+SEG_F+SEG_G, // Displays "E"
SEG_A+ + SEG_E+SEG_F+SEG_G, // Displays "F"
SEG_A+ SEG_C+SEG_D+SEG_E+SEG_F+SEG_G, // Displays "G" same as 6
SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "H"
SEG_B+SEG_C , // Displays "I"
SEG_B+SEG_C+SEG_D , // Displays "J"
SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "K" same as H
SEG_D+SEG_E+SEG_F , // Displays "L"
SEG_A+SEG_B+SEG_C+ SEG_E+SEG_F , // Displays "M"
SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "N" same as H
SEG_A+SEG_B+SEG_C+SEG_D+SEG_E+SEG_F , // Displays "O"
SEG_A+SEG_B+ SEG_E+SEG_F+SEG_G, // Displays "P"
SEG_A+SEG_B+SEG_C+SEG_D+SEG_E+SEG_F , // Displays "Q" same as O
SEG_A+SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "R" same as A
SEG_A+ SEG_C+SEG_D+ SEG_F+SEG_G, // Displays "S" same as 5
SEG_A+SEG_B+SEG_C , // Displays "T"
SEG_B+SEG_C+SEG_D+SEG_E+SEG_F , // Displays "U"
SEG_B+SEG_C+SEG_D+SEG_E+SEG_F , // Displays "V" same as U
SEG_B+SEG_C+SEG_D+SEG_E+SEG_F+SEG_G, // Displays "W"
SEG_B+SEG_C+ +SEG_E+SEG_F+SEG_G, // Displays "X" as H
SEG_B+SEG_C+ SEG_F+SEG_G, // Displays "Y"
SEG_A+SEG_B+ SEG_D+SEG_E+ SEG_G, // Displays "Z" same as 2
SEG_A+ SEG_D+SEG_E+SEG_F , // Displays "[" same as C
SEG_C+ SEG_F+SEG_G, // Displays "\"
SEG_A+SEG_B+SEG_C+SEG_D , // Displays "]"
SEG_A+SEG_B+ SEG_G, // Displays "^"
SEG_D , // Displays "_"
SEG_F , // Displays "`"
SEG_C+SEG_D+SEG_E+ SEG_G, // Displays "a" same as o
SEG_C+SEG_D+SEG_E+SEG_F+SEG_G, // Displays "b"
SEG_D+SEG_E+ SEG_G, // Displays "c"
SEG_B+SEG_C+SEG_D+SEG_E+ SEG_G, // Displays "d"
SEG_D+SEG_E+ SEG_G, // Displays "e" same as c
SEG_D+SEG_E+ SEG_G, // Displays "f" same as c
SEG_A+SEG_B+SEG_C+SEG_D+ SEG_F+SEG_G, // Displays "g" same as 9
SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "h"
SEG_E , // Displays "i"
SEG_C+SEG_D , // Displays "j"
SEG_D+SEG_E+SEG_F+SEG_G, // Displays "k"
SEG_E+SEG_F , // Displays "l"
SEG_C+ SEG_E+ SEG_G, // Displays "m" same as n
SEG_C+ SEG_E+ SEG_G, // Displays "n"
SEG_C+SEG_D+SEG_E+ SEG_G, // Displays "o"
SEG_C+SEG_D+SEG_E+ SEG_G, // Displays "p" same as o
SEG_C+SEG_D+SEG_E+ SEG_G, // Displays "q" same as o
SEG_E+ SEG_G, // Displays "r"
SEG_D+SEG_E+ SEG_G, // Displays "s" same as c
SEG_D+SEG_E+SEG_F+SEG_G, // Displays "t"
SEG_C+SEG_D+SEG_E , // Displays "u"
SEG_C+SEG_D+SEG_E , // Displays "v" same as u
SEG_C+SEG_D+SEG_E , // Displays "w" same as u
SEG_C+ +SEG_E , // Displays "x" literally ||
SEG_C+SEG_D+SEG_E , // Displays "y" same as u
SEG_C+SEG_D+ SEG_G, // Displays "z" same as t
SEG_B+SEG_C+ SEG_G, // Displays "{"
SEG_E+SEG_F , // Displays "|"
SEG_E+SEG_F+SEG_G, // Displays "}"
#else
SEG_A+SEG_B+SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "A"
SEG_C+SEG_D+SEG_E+SEG_F+SEG_G, // Displays "b"
SEG_D+SEG_E+ SEG_G, // Displays "c"
Expand All @@ -93,7 +156,7 @@ const u8 lcd_font[] =
SEG_C+ SEG_E+SEG_F+SEG_G, // Displays "h"
SEG_E , // Displays "i"
SEG_A+SEG_B+SEG_C+SEG_D , // Displays "J"
SEG_D+ SEG_F+SEG_G, // Displays "k"
SEG_D+ SEG_F+SEG_G, // Displays "k"
SEG_D+SEG_E+SEG_F , // Displays "L"
SEG_A+SEG_B+SEG_C+ SEG_E+SEG_F , // Displays "M"
SEG_C+ SEG_E+ SEG_G, // Displays "n"
Expand All @@ -109,6 +172,7 @@ const u8 lcd_font[] =
SEG_B+SEG_C+ +SEG_E+SEG_F+SEG_G, // Displays "X" as H
SEG_B+SEG_C+SEG_D+ SEG_F+SEG_G, // Displays "Y"
SEG_A+SEG_B+ SEG_D+SEG_E+ SEG_G, // Displays "Z" same as 2
#endif
};


Expand Down
7 changes: 7 additions & 0 deletions tools/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ def rand_hw():
# "help": "Automaticly sync clock after reboot",
# }

DATA["CONFIG_ALL_LETTERS"] = {
"name": "Include all letters (40 bytes)",
"depends": [],
"default": False,
"help": "Includes support for small and capitalized letters (pretier but less readable output from some modules).",
}


DATA["DEBUG"] = {
"name": "Debug",
Expand Down